diff options
| author | dos-reis <gdr@axiomatics.org> | 2011-09-07 22:38:03 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2011-09-07 22:38:03 +0000 |
| commit | 6e67d369c25e19452a8a76a3864a63c5860e7cd3 (patch) | |
| tree | a989ebee7f33a1998bd54372ee2a5f5c2bbcdb94 /src/interp/parsing.lisp | |
| parent | 88c6450a9068d951752e06f5ee40d63de1e95fd8 (diff) | |
| download | open-axiom-6e67d369c25e19452a8a76a3864a63c5860e7cd3.tar.gz | |
* interp/lisplib.boot (finalizeLisplib): Finalize documentaion
only if not bootstrapping.
(isFunctor): Tidy.
* interp/g-util.boot (superType): Tidy.
* interp/database.boot (getDualSignature): Rename from
getDualSignatureFromDB. Adjust callers.
* interp/c-util.boot (isKnownCategory): Remove.
(diagnoseUnknownType): Use isCategoryForm.
* interp/bootlex.lisp (GET-INTEGER-IN-RADIX): Use SPAD_SYNTAX_ERROR.
* interp/metalex.lisp (GET-STRING-TOKEN): Likewise.
* interp/parsing.lisp (MUST): Likewise.
* algebra/boolean.spad.pamphlet (Refrence) [coerce]: Bypass
conversion to Identifier.
* algebra/domain.spad.pamphlet (ContructorKind): Tidy.
Diffstat (limited to 'src/interp/parsing.lisp')
| -rw-r--r-- | src/interp/parsing.lisp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/interp/parsing.lisp b/src/interp/parsing.lisp index 81d34c83..52374f11 100644 --- a/src/interp/parsing.lisp +++ b/src/interp/parsing.lisp @@ -148,7 +148,7 @@ the stack, then stack a NIL. Return the value of prod." prodvalue))))) (defmacro must (dothis &optional (this-is nil) (in-rule nil)) - `(or ,dothis (meta-syntax-error ,this-is ,in-rule))) + `(or ,dothis (spad_syntax_error ,this-is ,in-rule))) ; Optional means that if it is present in the token stream, that is a good thing, ; otherwise don't worry (like [ foo ] in BNF notation). @@ -250,7 +250,7 @@ the stack, then stack a NIL. Return the value of prod." (or (funcall procfun (pop-stack-1)))) (go top)) ((compfin) (return 't)) ) - (meta-syntax-error) + (spad_syntax_error) (go top))) (defun termchr () "Is CHR a terminating character?" |