diff options
| author | dos-reis <gdr@axiomatics.org> | 2011-10-12 00:08:34 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2011-10-12 00:08:34 +0000 |
| commit | b630bc7d49b335b41b50293952ffc64b65718a7b (patch) | |
| tree | 8278202f762a8413a1ea4db8cb8c241343a86e3f /src/interp/newaux.lisp | |
| parent | 4aa013faa1399b7e31fa4220ae09b039c4a1b0e2 (diff) | |
| download | open-axiom-b630bc7d49b335b41b50293952ffc64b65718a7b.tar.gz | |
* interp/lexing.boot (matchAdvanceKeyword): New.
* interp/spad-parser.boot: New parsing functions.
* interp/fnewmeta.lisp: Use them.
(PARSE-NewExpr): Remove.
(PARSE-Command): Likewise.
(PARSE-SpecialKeyWord): Likewise.
(PARSE-TokenOption): Likewise.
(PARSE-PrimaryOrQM): Likewise.
(PARSE-InfixWith): Likewise.
(PARSE-With): Likewise.
(PARSE-Inline): Likewise.
(PARSE-Quanifier): Likewise.
(PARSE-QuantifiedVariable): Likewise.
(PARSE-Infix): Likewise.
(PARSE-Prefix): Likewise.
(PARSE-Suffix): Likewise.
(PARSE-TokTail): Likewise.
(PARSE-Qualification): Likewise.
(PARSE-Primary): Likewise.
(PARSE-PrimaryNoFloat): Likewise.
(PARSE-Quad): Likewise.
Diffstat (limited to 'src/interp/newaux.lisp')
| -rw-r--r-- | src/interp/newaux.lisp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/interp/newaux.lisp b/src/interp/newaux.lisp index 3a10a738..eb99de79 100644 --- a/src/interp/newaux.lisp +++ b/src/interp/newaux.lisp @@ -115,7 +115,7 @@ (|in| 400 400) (|case| 400 400) (|add| 400 120) - (|with| 2000 400 (|PARSE-InfixWith|)) + (|with| 2000 400 (|parseInfixWith|)) (|has| 400 400) (|where| 121 104) ; must be 121 for SPAD, 126 for boot--> nboot (|when| 112 190) @@ -136,12 +136,12 @@ (|until| 130 190 (|PARSE-Loop|)) (|repeat| 130 190 (|PARSE-Loop|)) (|import| 120 0 (|PARSE-Import|) ) - (|inline| 120 0 (|PARSE-Inline|) ) + (|inline| 120 0 (|parseInline|) ) (|forall| 998 999 (|PARSE-Scheme|)) (|exist| 998 999 (|PARSE-Scheme|)) (|unless|) (|add| 900 120) - (|with| 1000 300 (|PARSE-With|)) + (|with| 1000 300 (|parseWith|)) (|has| 400 400) (- 701 700) ; right-prec. wants to be -1 + left-prec ;; (\+ 701 700) |