From 05f1dbf1e8564c316a4e0ed7146b4991162f8875 Mon Sep 17 00:00:00 2001 From: dos-reis Date: Sun, 29 May 2011 00:58:58 +0000 Subject: * lisp/core.lisp.in (readExpr): New. * interp/as.boot: Replace READLINE with readLine. * interp/br-data.boot: Likewise. * interp/br-saturn.boot: Likewise. * interp/br-search.boot: Likewise. * interp/c-doc.boot: Likewise. * interp/cstream.boot: Likewise. * interp/g-error.boot: Likewise. * interp/ht-root.boot: Likewise. * interp/htcheck.boot: Likewise. * interp/i-syscmd.boot: Likewise. * interp/msgdb.boot: Likewise. * interp/server.boot: Likewise. * interp/topics.boot: Likewise. * interp/compat.boot (READLINE): Remove. * interp/sys-macros.lisp (shoeConsole): Remove. (shoeInputFile): Likewise. (shoeread-line): Likewise. * boot/ast.boot (bfQ): %nothing only needs EQ. * algebra/files.spad.pamphlet (File) [read!, readIfCan!]: Use readExpr instead of VMREAD. Avoid PLACEP (TextFile) [readLine!, readLineIfCan!]: Likewise. --- src/boot/strap/ast.clisp | 1 + src/boot/strap/includer.clisp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'src/boot/strap') diff --git a/src/boot/strap/ast.clisp b/src/boot/strap/ast.clisp index 90ce113f..ca008b4b 100644 --- a/src/boot/strap/ast.clisp +++ b/src/boot/strap/ast.clisp @@ -1430,6 +1430,7 @@ ((NULL |r|) (LIST 'NULL |l|)) ((OR (EQ |l| T) (EQ |r| T)) (LIST 'EQ |l| |r|)) ((OR (|bfString?| |l|) (|bfString?| |r|)) (LIST 'STRING= |l| |r|)) + ((OR (EQ |l| '|%nothing|) (EQ |r| '|%nothing|)) (LIST 'EQ |l| |r|)) (T (LIST 'EQUAL |l| |r|)))) (DEFUN |bfLessp| (|l| |r|) diff --git a/src/boot/strap/includer.clisp b/src/boot/strap/includer.clisp index e74c7ea1..531e84ed 100644 --- a/src/boot/strap/includer.clisp +++ b/src/boot/strap/includer.clisp @@ -136,7 +136,7 @@ (PROGN (SETQ |a| (|readLine| |s|)) (COND - ((NOT (EQUAL |a| |%nothing|)) (CONS |a| (|bRgen| |s|))) + ((NOT (EQ |a| |%nothing|)) (CONS |a| (|bRgen| |s|))) (T (LIST '|nullstream|))))))) (DEFUN |bIgen| (|n|) (|bDelay| #'|bIgen1| (LIST |n|))) -- cgit v1.2.3