diff options
| author | dos-reis <gdr@axiomatics.org> | 2011-10-07 19:48:11 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2011-10-07 19:48:11 +0000 |
| commit | 16e12e0c3d18a3eb41425be40275236c6df37c40 (patch) | |
| tree | 82d380fb5e2e6d0d48f3b918d5aaafa20115f3f9 /src/interp/fnewmeta.lisp | |
| parent | da334a99fa9e66215133f4cf5fe87a3b78d7084e (diff) | |
| download | open-axiom-16e12e0c3d18a3eb41425be40275236c6df37c40.tar.gz | |
* interp/lexing.boot: Include sys-macros.
Add more tokenizer functions.
* interp/fnewmeta.lisp: Use them.
* interp/parsing.lisp: Likewise.
* interp/bootlex.lisp: Likewise.
* interp/spad.lisp: Likewise.
(NEXT-BOOT-LINE): Remove.
* interp/metalex.lisp: Remove old lexing routines.
* interp/Makefile.in (lexing.$(FASLEXT)): Adjust dependency.
* boot/tokens.boot: newString is no longer builtin library function.
(shoeDictCons): Use makeString not newString.
* lisp/core.lisp.in (listToString): Fix typo.
Diffstat (limited to 'src/interp/fnewmeta.lisp')
| -rw-r--r-- | src/interp/fnewmeta.lisp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/interp/fnewmeta.lisp b/src/interp/fnewmeta.lisp index 658bc9f3..8ea479a7 100644 --- a/src/interp/fnewmeta.lisp +++ b/src/interp/fnewmeta.lisp @@ -174,7 +174,7 @@ (CONS 'CATEGORY (CONS (|popStack2|) (APPEND (|popStack1|) NIL))))) - (AND (ACTION (SETQ G1 (LINE-NUMBER CURRENT-LINE))) + (AND (ACTION (SETQ G1 (|lineNumber| |$spadLine|))) (OR (|PARSE-Application|) (|PARSE-OperatorFunctionName|)) (MUST (OR (AND (MATCH-ADVANCE-STRING ":") @@ -299,10 +299,10 @@ (PROG (G1) (RETURN (AND (EQ (|currentSymbol|) '$) - (OR (ALPHA-CHAR-P (CURRENT-CHAR)) - (CHAR-EQ (CURRENT-CHAR) "$") - (CHAR-EQ (CURRENT-CHAR) "%") - (CHAR-EQ (CURRENT-CHAR) "(")) + (OR (ALPHA-CHAR-P (|currentChar|)) + (CHAR-EQ (|currentChar|) "$") + (CHAR-EQ (|currentChar|) "%") + (CHAR-EQ (|currentChar|) "(")) (ACTION (SETQ G1 (|copyToken| |$priorToken|))) (|PARSE-Qualification|) (ACTION (SETQ |$priorToken| G1)))))) @@ -577,7 +577,7 @@ (DEFUN |PARSE-Selector| () (OR (AND |$nonblank| (EQ (|currentSymbol|) '|.|) - (CHAR-NE (CURRENT-CHAR) '| |) (MATCH-ADVANCE-STRING ".") + (CHAR-NE (|currentChar|) '| |) (MATCH-ADVANCE-STRING ".") (MUST (|PARSE-PrimaryNoFloat|)) (MUST (|pushReduction| '|PARSE-Selector| (CONS (|popStack2|) (CONS (|popStack1|) NIL))))) @@ -621,21 +621,21 @@ (DEFUN |PARSE-FloatBase| () - (OR (AND (INTEGERP (|currentSymbol|)) (CHAR-EQ (CURRENT-CHAR) ".") - (CHAR-NE (NEXT-CHAR) ".") (|PARSE-IntegerTok|) + (OR (AND (INTEGERP (|currentSymbol|)) (CHAR-EQ (|currentChar|) ".") + (CHAR-NE (|nextChar|) ".") (|PARSE-IntegerTok|) (MUST (|PARSE-FloatBasePart|))) (AND (INTEGERP (|currentSymbol|)) - (CHAR-EQ (CHAR-UPCASE (CURRENT-CHAR)) 'E) + (CHAR-EQ (CHAR-UPCASE (|currentChar|)) 'E) (|PARSE-IntegerTok|) (|pushReduction| '|PARSE-FloatBase| 0) (|pushReduction| '|PARSE-FloatBase| 0)) - (AND (DIGITP (CURRENT-CHAR)) (EQ (|currentSymbol|) '|.|) + (AND (DIGITP (|currentChar|)) (EQ (|currentSymbol|) '|.|) (|pushReduction| '|PARSE-FloatBase| 0) (|PARSE-FloatBasePart|)))) (DEFUN |PARSE-FloatBasePart| () (AND (MATCH-ADVANCE-STRING ".") - (MUST (OR (AND (DIGITP (CURRENT-CHAR)) + (MUST (OR (AND (DIGITP (|currentChar|)) (|pushReduction| '|PARSE-FloatBasePart| (|tokenNonblank?| (|currentToken|))) (|PARSE-IntegerTok|)) @@ -647,7 +647,7 @@ (PROG (G1) (RETURN (OR (AND (MEMBER (|currentSymbol|) '(E |e|)) - (FIND (CURRENT-CHAR) "+-") (ACTION (|advanceToken|)) + (FIND (|currentChar|) "+-") (ACTION (|advanceToken|)) (MUST (OR (|PARSE-IntegerTok|) (AND (MATCH-ADVANCE-STRING "+") (MUST (|PARSE-IntegerTok|))) |