diff options
| author | dos-reis <gdr@axiomatics.org> | 2009-06-15 05:13:27 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2009-06-15 05:13:27 +0000 |
| commit | e8129483c25d61df0ccb18afd29b93844c814709 (patch) | |
| tree | dfbf1da0bf211a3468eda773423d18d937e5b5f5 /src/interp | |
| parent | 372cd9bfe6aa41bacd17b25579a10a69b3933e2a (diff) | |
| download | open-axiom-e8129483c25d61df0ccb18afd29b93844c814709.tar.gz | |
* interp/fnewmeta.lisp (PARSE-Scheme): Tidy.
* interp/format.boot (dollarPercentTran): Translate T$ too.
(application2String): Handle quasiquotations.
* interp/postpar.boot (killColons): Don't remove quantified variables.
Diffstat (limited to 'src/interp')
| -rw-r--r-- | src/interp/fnewmeta.lisp | 2 | ||||
| -rw-r--r-- | src/interp/format.boot | 2 | ||||
| -rw-r--r-- | src/interp/postpar.boot | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/src/interp/fnewmeta.lisp b/src/interp/fnewmeta.lisp index e6af7e4c..b4b3b789 100644 --- a/src/interp/fnewmeta.lisp +++ b/src/interp/fnewmeta.lisp @@ -481,7 +481,7 @@ (OR (AND (|PARSE-Quantifier|) (MUST (|PARSE-QuantifiedVariableList|)) (MUST (MATCH-ADVANCE-STRING ".")) - (MUST (|PARSE-Application|)) + (MUST (|PARSE-Expr| 200)) (MUST (PUSH-REDUCTION '|PARSE-Forall| (CONS (POP-STACK-3) (CONS (POP-STACK-2) diff --git a/src/interp/format.boot b/src/interp/format.boot index d3d6fbc9..9e2c9416 100644 --- a/src/interp/format.boot +++ b/src/interp/format.boot @@ -291,6 +291,7 @@ dollarPercentTran x == EQ(y, y1) and EQ(z, z1) => x [y1, :z1] x = "$" or x = '"$" => "%%" + x = "T$" or x = '"T$" => "T" x formatSignatureAsTeX sig == @@ -632,6 +633,7 @@ application2String(op,argl, linkInfo) == null argl => (op' := isInternalFunctionName(op)) => op' app2StringWrap(formWrapId op, linkInfo) + op = "[||]" => concat("[|",concat(prefix2String0 argl,"|]")) 1=#argl => arg := first argl arg is ["<",:.] or arg is ["(",:.] => concat(op,arg) diff --git a/src/interp/postpar.boot b/src/interp/postpar.boot index e54d24fd..af5ec656 100644 --- a/src/interp/postpar.boot +++ b/src/interp/postpar.boot @@ -501,8 +501,7 @@ postSignature t == killColons: %ParseTree -> %ParseForm killColons x == atom x => x - x is ["Record",:.] => x - x is ["Union",:.] => x + x is [op,:.] and MEMQ(op, '(Record Union %Forall %Exist)) => x x is [":",.,y] => killColons y [killColons first x,:killColons rest x] |