diff options
| author | dos-reis <gdr@axiomatics.org> | 2009-01-15 02:01:28 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2009-01-15 02:01:28 +0000 |
| commit | 7b3a06b249e272857c858c6ab7ab37c8f1e128e1 (patch) | |
| tree | 3ac06b7857e9283fb9d62950121b4818f931544a /src/interp/metalex.lisp | |
| parent | 839f230416f2e0c5d8efcf778edeee3a31ac8f7b (diff) | |
| download | open-axiom-7b3a06b249e272857c858c6ab7ab37c8f1e128e1.tar.gz | |
* algebra/riccati.spad.pamphlet (innerlb$PrimitiveRatRicDE): Fix
thinko.
* interp/bootlex.lisp (get-decimal-number-token): New.
(get-integer-in-radix): Likewise.
(is-radix-char): Likewise.
(get-spad-integer-token): Likewise. Use them.
(get-BOOT-token): Use it.
* interp/metalex.lisp: Tidy.
Diffstat (limited to 'src/interp/metalex.lisp')
| -rw-r--r-- | src/interp/metalex.lisp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/interp/metalex.lisp b/src/interp/metalex.lisp index cc8189c6..5a4d718d 100644 --- a/src/interp/metalex.lisp +++ b/src/interp/metalex.lisp @@ -1,6 +1,6 @@ ;; Copyright (c) 1991-2002, The Numerical Algorithms Group Ltd. ;; All rights reserved. -;; Copyright (C) 2007-2008, Gabriel Dos Reis. +;; Copyright (C) 2007-2009, Gabriel Dos Reis. ;; All rights reserved. ;; ;; Redistribution and use in source and binary forms, with or without @@ -305,7 +305,8 @@ NonBlank is true if the token is not preceded by a blank." (defparameter Valid-Tokens 0 "Number of tokens in buffer (0, 1 or 2)") (defun Token-Install (symbol type token &optional (nonblank t)) - (setf (token-symbol token) symbol (token-type token) type + (setf (token-symbol token) symbol + (token-type token) type (token-nonblank token) nonblank) token) @@ -752,17 +753,17 @@ special character be the atom whose print name is the character itself." (defun get-number-token (token) "Take a number off the input stream." (prog ((buf (make-adjustable-string 0))) - nu1 (suffix (current-char) buf) ; Integer part + nu1 + (suffix (current-char) buf) ; Integer part (let ((next-chr (next-char))) (cond ((digitp next-chr) (advance-char) (go nu1)))) (advance-char) - formint(return (token-install - (read-from-string buf) - 'number token - (size buf) ;used to keep track of digit count - )))) + (return (token-install (read-from-string buf) + 'number token + (size buf) ;used to keep track of digit count + )))) ; *** 4. META Auxiliary Parsing Actions |