* boot/utility.boot: Define BOOTTRAN namespace.

	(setUnion): New.
	(setDifference): New.
	* boot/translator.boot (packageBody): New.
	(translateToplevel): Use it.  Translate namespace definition.
	* boot/tokens.boot: Replace bitmask with bitref.
	Do not translate setDifference and setUnion.
	* boot/parser.boot (bpDef): Now include namespace definition.
	(bpComma): Remove namespace rule as subsumed by Where rule.
	* boot/Makefile.in: Remove dependencies on initial-env.lisp.
	(AXIOM_LOCAL_LISP_sources): Remove as unused,
	(boot_sources): Remove as redundant with boot_SOURCES.
	* boot/initial-env.lisp: Remove.

1 files changed, 62 insertions, 4 deletions

diff --git a/src/boot/strap/utility.clisp b/src/boot/strap/utility.clisp
index a4c6aa61..7137a1c6 100644
--- a/src/boot/strap/utility.clisp
+++ b/src/boot/strap/utility.clisp
@@ -1,5 +1,14 @@
 (PROCLAIM '(OPTIMIZE SPEED))
-(IMPORT-MODULE "initial-env")
+(EVAL-WHEN (:COMPILE-TOPLEVEL :LOAD-TOPLEVEL :EXECUTE)
+  (UNLESS (FIND-PACKAGE #1="BOOTTRAN") (MAKE-PACKAGE #1#)))
+
+(EVAL-WHEN (:COMPILE-TOPLEVEL :LOAD-TOPLEVEL :EXECUTE)
+  (PROGN
+   (COND
+    ((|%hasFeature| :COMMON-LISP)
+     (USE-PACKAGE "COMMON-LISP" . #1=(#2="BOOTTRAN")))
+    (T (USE-PACKAGE "LISP" . #1#)))
+   (USE-PACKAGE "AxiomCore" #2#)))
 
 (IN-PACKAGE "BOOTTRAN")
 
@@ -10,9 +19,9 @@
    '(|objectMember?| |symbolMember?| |stringMember?| |charMember?|
                      |scalarMember?| |listMember?| |reverse| |reverse!|
                      |lastNode| |append| |append!| |copyList| |substitute|
-                     |substitute!| |setDifference| |applySubst| |applySubst!|
-                     |applySubstNQ| |remove| |removeSymbol| |atomic?|
-                     |finishLine| |subStringMatch?|)))
+                     |substitute!| |setDifference| |setUnion| |setIntersection|
+                     |applySubst| |applySubst!| |applySubstNQ| |remove|
+                     |removeSymbol| |atomic?| |finishLine|)))
 
 (DECLAIM (FTYPE (FUNCTION (|%Thing| |%Thing| |%Thing|) |%Thing|) |substitute|))
 
@@ -39,6 +48,18 @@
 (DECLAIM
  (FTYPE (FUNCTION ((|%List| |%Thing|) |%Thing|) (|%List| |%Thing|)) |remove|))
 
+(DECLAIM
+ (FTYPE (FUNCTION ((|%List| |%Thing|) (|%List| |%Thing|)) (|%List| |%Thing|))
+  |setDifference|))
+
+(DECLAIM
+ (FTYPE (FUNCTION ((|%List| |%Thing|) (|%List| |%Thing|)) (|%List| |%Thing|))
+  |setUnion|))
+
+(DECLAIM
+ (FTYPE (FUNCTION ((|%List| |%Thing|) (|%List| |%Thing|)) (|%List| |%Thing|))
+  |setIntersection|))
+
 (DECLAIM (FTYPE (FUNCTION (|%Thing|) |%Boolean|) |atomic?|))
 
 (DECLAIM (FTYPE (FUNCTION (|%Thing|) |%Void|) |finishLine|))
@@ -51,6 +72,8 @@
  (FTYPE (FUNCTION (|%String| |%Short|) (|%Maybe| |%Short|))
   |firstBlankPosition|))
 
+(|%defaultReadAndLoadSettings|)
+
 (DEFUN |atomic?| (|x|) (OR (NOT (CONSP |x|)) (EQ (CAR |x|) 'QUOTE)))
 
 (DEFUN |objectMember?| (|x| |l|)
@@ -224,6 +247,41 @@
                (SETQ |bfVar#1| (CDR |bfVar#1|))))
             (CDR |l|))))))
 
+(DEFUN |setUnion| (|x| |y|)
+  (PROG (|z|)
+    (RETURN
+     (PROGN
+      (SETQ |z| NIL)
+      (LET ((|bfVar#1| |x|) (|a| NIL))
+        (LOOP
+         (COND
+          ((OR (NOT (CONSP |bfVar#1|)) (PROGN (SETQ |a| (CAR |bfVar#1|)) NIL))
+           (RETURN NIL))
+          (T (AND (NOT (|objectMember?| |a| |z|)) (SETQ |z| (CONS |a| |z|)))))
+         (SETQ |bfVar#1| (CDR |bfVar#1|))))
+      (LET ((|bfVar#2| |y|) (|a| NIL))
+        (LOOP
+         (COND
+          ((OR (NOT (CONSP |bfVar#2|)) (PROGN (SETQ |a| (CAR |bfVar#2|)) NIL))
+           (RETURN NIL))
+          (T (AND (NOT (|objectMember?| |a| |z|)) (SETQ |z| (CONS |a| |z|)))))
+         (SETQ |bfVar#2| (CDR |bfVar#2|))))
+      (|reverse!| |z|)))))
+
+(DEFUN |setIntersection| (|x| |y|)
+  (LET ((|bfVar#2| NIL) (|bfVar#3| NIL) (|bfVar#1| |x|) (|a| NIL))
+    (LOOP
+     (COND
+      ((OR (NOT (CONSP |bfVar#1|)) (PROGN (SETQ |a| (CAR |bfVar#1|)) NIL))
+       (RETURN |bfVar#2|))
+      (T
+       (AND (|objectMember?| |a| |y|)
+            (COND
+             ((NULL |bfVar#2|) (SETQ |bfVar#2| #1=(CONS |a| NIL))
+              (SETQ |bfVar#3| |bfVar#2|))
+             (T (RPLACD |bfVar#3| #1#) (SETQ |bfVar#3| (CDR |bfVar#3|)))))))
+     (SETQ |bfVar#1| (CDR |bfVar#1|)))))
+
 (DEFUN |removeSymbol| (|l| |x|)
   (PROG (|y| |LETTMP#1| |l'| |before|)
     (RETURN