aboutsummaryrefslogtreecommitdiff
path: root/src/boot
diff options
context:
space:
mode:
authordos-reis <gdr@axiomatics.org>2010-12-12 19:07:23 +0000
committerdos-reis <gdr@axiomatics.org>2010-12-12 19:07:23 +0000
commitf1c5b36d7eeb93b28a346101142e80d8035b072b (patch)
treecba5adb024120ffdce33ba43a5c855afc86782d9 /src/boot
parent9b1dd86f0bcb9aa41ca3fded5e79a7581d127391 (diff)
downloadopen-axiom-f1c5b36d7eeb93b28a346101142e80d8035b072b.tar.gz
* boot/ast.boot (bfIS1): Tidy.
Diffstat (limited to 'src/boot')
-rw-r--r--src/boot/ast.boot2
-rw-r--r--src/boot/strap/ast.clisp4
2 files changed, 4 insertions, 2 deletions
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)