diff options
| author | dos-reis <gdr@axiomatics.org> | 2009-06-11 19:30:07 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2009-06-11 19:30:07 +0000 |
| commit | fb75980589a0611aee3b8e5e25408725a5c5a531 (patch) | |
| tree | 561a8a25ed1178792b7f1112ac1276dc2684c774 /src/interp/fnewmeta.lisp | |
| parent | 9d0b4c5d09c2d07feb863f500172bcc8f6f17adf (diff) | |
| download | open-axiom-fb75980589a0611aee3b8e5e25408725a5c5a531.tar.gz | |
* interp/newaux.lisp: Remove digraphs '(<' and '>) as alternate
spelling for '{' and '}'.
* interp/fnewmeta.lisp (|PARSE-Primary1|): Use PARSE-Data for
quoted forms.
(|PARSE-Sexpr1|): Tidy.
* interp/parse.boot (washOperatorName): New. Issue deprecation
diagnostics for string syntax for operator names in signatures.
(parseHas): Use it.
(transCategoryItem): Likewise.
* interp/metalex.lisp (advance-token): Likewise.
* algebra/boolean.spad.pamphlet: Tidy.
Diffstat (limited to 'src/interp/fnewmeta.lisp')
| -rw-r--r-- | src/interp/fnewmeta.lisp | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/src/interp/fnewmeta.lisp b/src/interp/fnewmeta.lisp index adf96fe8..60027f80 100644 --- a/src/interp/fnewmeta.lisp +++ b/src/interp/fnewmeta.lisp @@ -754,11 +754,9 @@ (CONS (POP-STACK-2) (CONS (POP-STACK-1) NIL)))))) (|PARSE-Quad|) (|PARSE-String|) (|PARSE-IntegerTok|) (|PARSE-FormalParameter|) - (AND (MATCH-STRING "'") - (MUST (AND (MATCH-ADVANCE-STRING "'") - (MUST (|PARSE-Expr| 999)) - (PUSH-REDUCTION '|PARSE-Primary1| - (CONS 'QUOTE (CONS (POP-STACK-1) NIL)))))) + (AND (MATCH-ADVANCE-STRING "'") + (MUST (AND (MUST (|PARSE-Data|)) + (PUSH-REDUCTION '|PARSE-Primary1| (POP-STACK-1))))) (|PARSE-Sequence|) (|PARSE-Enclosure|))) @@ -909,7 +907,9 @@ (DEFUN |PARSE-Sexpr1| () - (OR (AND (|PARSE-AnyId|) + (OR (|PARSE-IntegerTok|) + (|PARSE-String|) + (AND (|PARSE-AnyId|) (OPTIONAL (AND (|PARSE-NBGliphTok| '=) (MUST (|PARSE-Sexpr1|)) (ACTION (SETQ LABLASOC @@ -919,13 +919,11 @@ (AND (MATCH-ADVANCE-STRING "'") (MUST (|PARSE-Sexpr1|)) (PUSH-REDUCTION '|PARSE-Sexpr1| (CONS 'QUOTE (CONS (POP-STACK-1) NIL)))) - (|PARSE-IntegerTok|) (AND (MATCH-ADVANCE-STRING "-") (MUST (|PARSE-IntegerTok|)) (PUSH-REDUCTION '|PARSE-Sexpr1| (MINUS (POP-STACK-1)))) - (|PARSE-String|) - (AND (MATCH-ADVANCE-STRING "<") + (AND (MATCH-ADVANCE-STRING "[") (BANG FIL_TEST (OPTIONAL (STAR REPEATOR (|PARSE-Sexpr1|)))) - (MUST (MATCH-ADVANCE-STRING ">")) + (MUST (MATCH-ADVANCE-STRING "]")) (PUSH-REDUCTION '|PARSE-Sexpr1| (LIST2VEC (POP-STACK-1)))) (AND (MATCH-ADVANCE-STRING "(") (BANG FIL_TEST |