From f1c5b36d7eeb93b28a346101142e80d8035b072b Mon Sep 17 00:00:00 2001 From: dos-reis Date: Sun, 12 Dec 2010 19:07:23 +0000 Subject: * boot/ast.boot (bfIS1): Tidy. --- src/boot/ast.boot | 2 +- src/boot/strap/ast.clisp | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'src/boot') diff --git a/src/boot/ast.boot b/src/boot/ast.boot index 9e1882dd..d703475b 100644 --- a/src/boot/ast.boot +++ b/src/boot/ast.boot @@ -639,7 +639,7 @@ bfISReverse(x,a) == bfIS1(lhs,rhs) == rhs = nil => ['NULL,lhs] - string? rhs => ['EQ,lhs,['QUOTE,INTERN rhs]] + string? rhs => bfAND [['STRINGP,lhs],["STRING=",lhs,rhs]] integer? rhs => ['EQL,lhs,rhs] atom rhs => ['PROGN,bfLetForm(rhs,lhs),'T] rhs is ['QUOTE,a] => diff --git a/src/boot/strap/ast.clisp b/src/boot/strap/ast.clisp index 023496b2..a022f053 100644 --- a/src/boot/strap/ast.clisp +++ b/src/boot/strap/ast.clisp @@ -956,7 +956,9 @@ (RETURN (COND ((NULL |rhs|) (LIST 'NULL |lhs|)) - ((STRINGP |rhs|) (LIST 'EQ |lhs| (LIST 'QUOTE (INTERN |rhs|)))) + ((STRINGP |rhs|) + (|bfAND| (LIST (LIST 'STRINGP |lhs|) + (LIST 'STRING= |lhs| |rhs|)))) ((INTEGERP |rhs|) (LIST 'EQL |lhs| |rhs|)) ((ATOM |rhs|) (LIST 'PROGN (|bfLetForm| |rhs| |lhs|) 'T)) ((AND (CONSP |rhs|) (EQ (CAR |rhs|) 'QUOTE) -- cgit v1.2.3