diff options
Diffstat (limited to 'src/boot')
| -rw-r--r-- | src/boot/ast.boot | 1 | ||||
| -rw-r--r-- | src/boot/strap/ast.clisp | 1 | ||||
| -rw-r--r-- | src/boot/strap/includer.clisp | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/src/boot/ast.boot b/src/boot/ast.boot index d8eedae2..6327d8fa 100644 --- a/src/boot/ast.boot +++ b/src/boot/ast.boot @@ -811,6 +811,7 @@ bfQ(l,r)== r = nil => ["NULL",l] l = true or r = true => ["EQ",l,r] bfString? l or bfString? r => ["STRING=",l,r] + l is "%nothing" or r is "%nothing" => ["EQ",l,r] ["EQUAL",l,r] bfLessp(l,r)== 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|))) |