diff options
author | dos-reis <gdr@axiomatics.org> | 2011-08-22 23:24:10 +0000 |
---|---|---|
committer | dos-reis <gdr@axiomatics.org> | 2011-08-22 23:24:10 +0000 |
commit | d63ce4731d81c50eb205524d7b7d58681d20fa4a (patch) | |
tree | 4689910112d637852ed884f35c9b6695e6379231 /src/interp/bootlex.lisp | |
parent | d8ce72f6274af4970ca31fc215107bd30467e565 (diff) | |
download | open-axiom-d63ce4731d81c50eb205524d7b7d58681d20fa4a.tar.gz |
* interp/metalex.lisp (LINE-HANDLER, NEXT-LINE, XCAPE): Remove.
(XTOKENREADER, GET-TOKEN, NEXT-META-LINE): Likewise.
(META_ERROR_HANDLER, META-SYNTAX-ERROR, META-META-ERROR-HANLER):
Likewise.
* interp/debug.lisp: Do not set /XCAPE property.
* interp/bootlex.lisp (INIT-BOOT/SPAD-READER): Do not set
XTOKENRADER, LINE-HANDLER, META_ERROR_HANDLER.
Diffstat (limited to 'src/interp/bootlex.lisp')
-rw-r--r-- | src/interp/bootlex.lisp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/interp/bootlex.lisp b/src/interp/bootlex.lisp index 487de0e3..2032c0c8 100644 --- a/src/interp/bootlex.lisp +++ b/src/interp/bootlex.lisp @@ -1,6 +1,6 @@ ;; Copyright (c) 1991-2002, The Numerical Algorithms Group Ltd. ;; All rights reserved. -;; Copyright (C) 2007-2010, Gabriel Dos Reis. +;; Copyright (C) 2007-2011, Gabriel Dos Reis. ;; All rights reserved. ;; ;; Redistribution and use in source and binary forms, with or without @@ -56,9 +56,6 @@ (defun init-boot/spad-reader () (setq $SPAD_ERRORS (VECTOR 0 0 0)) (setq SPADERRORSTREAM |$OutputStream|) - (setq XTokenReader 'get-BOOT-token) - (setq Line-Handler 'next-BOOT-line) - (setq Meta_Error_Handler 'spad_syntax_error) (setq File-Closed nil) (Next-Lines-Clear) (setq Boot-Line-Stack nil) @@ -88,7 +85,6 @@ (*comp370-apply* (function print-defun)) (*fileactq-apply* (function print-defun)) ($SPAD T) - (XCape #\_) (OPTIONLIST nil) (*EOF* NIL) (File-Closed NIL) @@ -238,7 +234,7 @@ or the chracters ?, !, ' or %" (suffix (current-char) buf) (advance-char) id (let ((cur-char (current-char))) - (cond ((char= cur-char XCape) + (cond ((char= cur-char #\_) (if (not (advance-char)) (go bye)) (suffix (current-char) buf) (setq escaped? t) @@ -290,7 +286,7 @@ or the chracters ?, !, ' or %" (if (char/= (current-char) #\") (RETURN NIL) (advance-char)) (loop (if (char= (current-char) #\") (return nil)) - (SUFFIX (if (char= (current-char) XCape) + (SUFFIX (if (char= (current-char) #\_) (advance-char) (current-char)) BUF) |