From b1127318c2fc599f970c3f9cba423eaf46ac0564 Mon Sep 17 00:00:00 2001
From: dos-reis <gdr@axiomatics.org>
Date: Mon, 3 Nov 2008 00:12:14 +0000
Subject: 	* interp/Makefile.pamphlet (template.$(FASLEXT)): Remove. 
 * interp/template.boot: Move non-dead code where appropriate. 	Remove file. 
 * boot/ast.boot (bfQ): Improve.

---
 src/boot/ast.boot | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

(limited to 'src/boot')

diff --git a/src/boot/ast.boot b/src/boot/ast.boot
index f9246218..da023938 100644
--- a/src/boot/ast.boot
+++ b/src/boot/ast.boot
@@ -784,16 +784,12 @@ bfSmintable x==
       first x in '(SIZE LENGTH char)
  
 bfQ(l,r)==
-       if bfSmintable l or bfSmintable r
-       then  ["EQL",l,r]
-       else if defQuoteId l or defQuoteId r
-            then  ["EQ",l,r]
-            else
-              if null l
-              then ["NULL",r]
-              else if null r
-                   then ["NULL",l]
-                   else ["EQUAL",l,r]
+  bfSmintable l or bfSmintable r => ["EQL",l,r]
+  defQuoteId l or defQuoteId r => ["EQ",l,r]
+  null l => ["NULL",r]
+  null r => ["NULL",l]
+  EQ(l,true) or EQ(r,true) => ["EQ",l,r]
+  ["EQUAL",l,r]
  
 bfLessp(l,r)==
       if r=0
-- 
cgit v1.2.3