28 files changed, 277 insertions, 194 deletions

diff --git a/src/interp/ChangeLog b/src/interp/ChangeLog
index 391d9dfd..16c1f943 100644
--- a/src/interp/ChangeLog
+++ b/src/interp/ChangeLog
@@ -1,3 +1,62 @@
+2007-12-08  Gabriel Dos Reis  <gdr@cs.tamu.edu>
+
+	* bc-util.boot ($newConstructorList): Move from setq.lisp to here.
+	($createLocalLibDb): Likewise.
+	* clam.boot ($hashNode): Likewise.
+	* comp.lisp (|$compileDontDefineFunctions|): Likewise.
+	* compiler.boot ($compileOnlyCertainItems): Likewise.
+	* database.boot ($globalExposureGroupAlist): Likewise.
+	* define.boot ($newCompCompare): Likewise.
+	* format.boot ($permitWhere): Likewise.
+	* g-boot.boot ($inDefLET): Likewise.
+	($inDefIS): Likewise.
+	($letGenVarCounter): Likewise.
+	($isGenVarCounter): Likewise.
+	* g-error.boot ($ReadingFile): Likewise.
+	(handleLispBreakLoop): Remove special case on $cclSystem.
+	* g-timer.boot (computeElapsedTime): Likewise.
+	* g-util.boot ($interpOnly): Move from setq.lisp to here.
+	* i-funsel.boot ($domPvar): Likewise.
+	* i-object.boot ($immediateDataSymbol): Likewise.
+	* i-output.boot ($algebraOutputStream): Likewise.
+	(ERROROUTSTREAM): Likewise.
+	(ERRORINSTREAM): Likewise.
+	* i-spec2.boot ($InterpreterMacroAlist): Likewise.
+	* i-syscmd.boot ($NonNullStream): Likewise.
+	($NullStream): Likewise.
+	($localExposureDataDefault): Likewise.
+	($localExposureData): Likewise.
+	* lisplib.boot ($functionLocations): Likewise.
+	* msgdb.boot ($testingSystem): Likewise.
+	* nlib.lisp (get-directory-list): Tidy.
+	* nruncomp.boot ($devaluateList): Move from setq.lisp to here.
+	($functorLocalParameters): Likewise.
+	($insideCategoryPackageIfTrue): Likewise.
+	($profileCompiler): Likewise.
+	* nrunfast.boot ($doNotCompressHashTableIfTrue): Likewise.
+	* nrungo.boot ($insideCompileBodyIfTrue): Likewise.
+	* setvars.boot ($InitialCommandSynonymAlist): Likewise.
+	($CommandSynonymAlist): Likewise.
+	(setOutputLibrary): Simplify.
+	* spad.lisp (|$newCompCompare|): Don't set here.
+	(|$compileOnlyCertainItems|): Likewise.
+	* sys-constants.boot ($BasicPredicates): Include SYMBOLP.
+	($TriangleVariableList): Move from setq.lisp to here.
+	($Any): Likewise.
+	($Boolean): Likewise.
+	($SingleInteger): Likewise.
+	($QuotientField): Likewise.
+	($ComplexInteger): Likewise.
+	($OutputForm): Likewise.
+	($FunctionalExpression): Likewise.
+	($Expression): Likewise.
+	($AnonymousFunction): Likewise.
+	* sys-globals.boot (INPUT_-LIBRARIES): Likewise.
+	(OUTPUT_-LIBRARY): Likewise.
+	($newConlist): Likewise.
+	($compilingInputFile): Likewise.
+	($minivectorNames): Likewise.
+
 2007-12-06  Gabriel Dos Reis  <gdr@cs.tamu.edu>
 
 	* lisplib.boot (getSlotFromDomain): Use pointer to function Undef
diff --git a/src/interp/bc-util.boot b/src/interp/bc-util.boot
index 70b8df52..bdd73c3d 100644
--- a/src/interp/bc-util.boot
+++ b/src/interp/bc-util.boot
@@ -35,6 +35,14 @@
 import '"ht-util"
 )package "BOOT"
 
+++
+$newConstructorList := nil
+
+++ true if we should rebuild local databases.
+$createLocalLibDb := true
+
+
+
 bcFinish(name,arg,:args) == bcGen bcMkFunction(name,arg,args)
 
 bcMkFunction(name,arg,args) ==
diff --git a/src/interp/clam.boot b/src/interp/clam.boot
index cde11ef3..f2e7583a 100644
--- a/src/interp/clam.boot
+++ b/src/interp/clam.boot
@@ -66,6 +66,9 @@ import '"g-timer"
 --     to 0 on garbage collection; those with 0 use count at garbage collection
 --     are cleared
 -- see definition of COMP,2 in COMP LISP which calls clamComp below
+
+++
+$hashNode := [[]]
  
 -- see SETQ LISP for initial def of $hashNode
  
diff --git a/src/interp/comp.lisp b/src/interp/comp.lisp
index 2c88d43f..23bb75ba 100644
--- a/src/interp/comp.lisp
+++ b/src/interp/comp.lisp
@@ -56,6 +56,8 @@
 
 (export '(Comp FluidVars LocVars OptionList SLAM SPADSLAM ILAM FLUID))
 
+(defparameter |$compileDontDefineFunctions| 'T)
+
 ;;; Common Block section
 
 (defparameter FluidVars nil)
diff --git a/src/interp/compiler.boot b/src/interp/compiler.boot
index 9834418a..81108797 100644
--- a/src/interp/compiler.boot
+++ b/src/interp/compiler.boot
@@ -45,6 +45,10 @@ import '"iterator"
 $coreDiagnosticFunctions == 
   '(error userError systemError)
 
+++ list of functions to compile
+$compileOnlyCertainItems := []
+
+
 compTopLevel(x,m,e) ==
 --+ signals that target is derived from lhs-- see NRTmakeSlot1Info
   $NRTderivedTargetIfTrue: local := false
diff --git a/src/interp/database.boot b/src/interp/database.boot
index f58cad28..24ef8c3d 100644
--- a/src/interp/database.boot
+++ b/src/interp/database.boot
@@ -40,6 +40,7 @@ import '"compat"
 )package "BOOT"
 
 $getUnexposedOperations := true
+$globalExposureGroupAlist := []
 
 --% Functions for manipulating MODEMAP DATABASE
 
diff --git a/src/interp/define.boot b/src/interp/define.boot
index e7986442..43405cc3 100644
--- a/src/interp/define.boot
+++ b/src/interp/define.boot
@@ -38,6 +38,8 @@ import '"category"
 )package "BOOT"
 
 NRTPARSE := false
+$newCompCompare := false
+
 
 --% FUNCTIONS WHICH MUNCH ON == STATEMENTS
  
diff --git a/src/interp/format.boot b/src/interp/format.boot
index 3c7b75e3..3dffd32a 100644
--- a/src/interp/format.boot
+++ b/src/interp/format.boot
@@ -39,6 +39,8 @@ import '"macros"
 
 -- some of these are redundant and should be compacted
 $formatSigAsTeX := 1
+$permitWhere := false
+
 
 --% Formatting modemaps
 
diff --git a/src/interp/g-boot.boot b/src/interp/g-boot.boot
index 793a7f06..c9cd955f 100644
--- a/src/interp/g-boot.boot
+++ b/src/interp/g-boot.boot
@@ -43,7 +43,11 @@ import '"g-util"
 -- these supplement those in DEF and MACRO LISP
  
 --% Utilities
- 
+
+$inDefLET := false
+$inDefIS := false
+$letGenVarCounter := 1
+$isGenVarCounter := 1 
  
 $LET := 'SPADLET    -- LET is a standard macro in Common Lisp
  
diff --git a/src/interp/g-error.boot b/src/interp/g-error.boot
index fe81ea1c..2d1fb837 100644
--- a/src/interp/g-error.boot
+++ b/src/interp/g-error.boot
@@ -51,6 +51,9 @@ $SystemError == 'SystemError
 $UserError == 'UserError
 $AlgebraError =='AlgebraError
 
+$ReadingFile := false
+
+
 -- REDERR is used in BFLOAT LISP, should be a macro
 -- REDERR msg == error msg
 
@@ -76,8 +79,6 @@ errorSupervisor(errorType,errorMsg) ==
   errorSupervisor1(errorType,errorMsg,$BreakMode)
 
 errorSupervisor1(errorType,errorMsg,$BreakMode) ==
-  $cclSystem and $BreakMode = 'trapNumerics => 
-    THROW('trapNumerics,$numericFailure)
   BUMPERRORCOUNT "semantic"
   errorLabel :=
       errorType = $SystemError  => '"System error"
@@ -111,32 +112,23 @@ handleLispBreakLoop($BreakMode) ==
     while not gotIt repeat
       gotIt := true
       msgQ := 
-       $cclSystem =>
-         ['%l,'"   You have two options. Enter:",'%l,_
-          '"    ",:bright '"top     ",'"  to return to top level, or",'%l,_
-          '"    ",:bright '"break   ",'"  to enter a LISP break loop.",'%l,_
-          '%l,'"   Please enter your choice now:"]
        ['%l,'"   You have three options. Enter:",'%l,_
         '"    ",:bright '"continue",'"  to continue processing,",'%l,_
         '"    ",:bright '"top     ",'"  to return to top level, or",'%l,_
         '"    ",:bright '"break   ",'"  to enter a LISP break loop.",'%l,_
         '%l,'"   Please enter your choice now:"]
       x := STRING2ID_-N(queryUser msgQ,1)
-      x := 
-        $cclSystem =>
-          selectOptionLC(x,'(top break),NIL)
-        selectOptionLC(x,'(top break continue),NIL)
+      x := selectOptionLC(x,'(top break continue),NIL)
       null x =>
         sayBrightly bright '"  That was not one of your choices!"
         gotIt := NIL
       x = 'top => returnToTopLevel()
       x = 'break =>
         $BreakMode := 'break
-        if not $cclSystem then
-          sayBrightly ['"   Enter",:bright '":C",
-            '"when you are ready to continue processing where you ",'%l,_
-            '"   interrupted the system, enter",:bright '"(TOP)",_
-            '"when you wish to return",'%l,'"   to top level.",'%l,'%l]
+	sayBrightly ['"   Enter",:bright '":C",
+	  '"when you are ready to continue processing where you ",'%l,_
+	  '"   interrupted the system, enter",:bright '"(TOP)",_
+	  '"when you wish to return",'%l,'"   to top level.",'%l,'%l]
         BREAK()
       sayBrightly
         '"   Processing will continue where it was interrupted."
diff --git a/src/interp/g-timer.boot b/src/interp/g-timer.boot
index 30fbfeac..94bee59f 100644
--- a/src/interp/g-timer.boot
+++ b/src/interp/g-timer.boot
@@ -223,8 +223,6 @@ computeElapsedTime() ==
   currentGCTime:= elapsedGcTime()
   gcDelta := currentGCTime - $oldElapsedGCTime
   elapsedSeconds:=
-     -- In CCL total time does not include GC time.
-     $cclSystem => 1.*(currentTime-$oldElapsedTime)/$timerTicksPerSecond
      1.*(currentTime-$oldElapsedTime-gcDelta)/$timerTicksPerSecond
   PUT('gc, 'TimeTotal,GETL('gc,'TimeTotal) +
                    1.*gcDelta/$timerTicksPerSecond)
diff --git a/src/interp/g-util.boot b/src/interp/g-util.boot
index 117e8552..20feccf0 100644
--- a/src/interp/g-util.boot
+++ b/src/interp/g-util.boot
@@ -35,6 +35,10 @@
 import '"macros"
 )package "BOOT"
 
+++
+$interpOnly := false
+
+
 --% Utility Functions of General Use
 
 ELEMN(x, n, d) ==
diff --git a/src/interp/i-funsel.boot b/src/interp/i-funsel.boot
index 63301045..378ce268 100644
--- a/src/interp/i-funsel.boot
+++ b/src/interp/i-funsel.boot
@@ -34,6 +34,9 @@ import '"i-coerfn"
 )package "BOOT"
 
 $constructorExposureList := '(Boolean Integer String)
+$domPvar := nil
+
+
 
 sayFunctionSelection(op,args,target,dc,func) ==
   $abbreviateTypes : local := true
diff --git a/src/interp/i-object.boot b/src/interp/i-object.boot
index 954d71e4..2ac8ae61 100644
--- a/src/interp/i-object.boot
+++ b/src/interp/i-object.boot
@@ -110,6 +110,10 @@ asTupleAsList(at) == VEC2LIST asTupleAsVector at
 
 --% Basic Object Type Identification
 
+++ The VAT class for literals values.
+$immediateDataSymbol ==
+  "--immediateData--"
+
 ++ If x is a literal of the basic types (Integer String DoubleFloat) then
 ++ this function returns its type, and nil otherwise.
 getBasicMode x ==  getBasicMode0(x,$useIntegerSubdomain)
diff --git a/src/interp/i-output.boot b/src/interp/i-output.boot
index bff7f613..b9f6e3d4 100644
--- a/src/interp/i-output.boot
+++ b/src/interp/i-output.boot
@@ -210,6 +210,18 @@ $specialCharacterAlist == '(
 
 $collectOutput := nil
 
+$algebraOutputStream :=
+  DEFIOSTREAM([["DEVICE", :"CONSOLE"], ["MODE", :"OUTPUT"]], 255, 0)
+
+ERROROUTSTREAM :=
+  DEFIOSTREAM([["DEVICE", :"CONSOLE"], ["MODE", :"OUTPUT"]], 80, 0)
+
+ERRORINSTREAM := 
+  DEFIOSTREAM([["DEVICE", :"CONSOLE"], ["MODE", :"INPUT"], 
+    ["QUAL", :"T"]], 133, 1)
+
+
+
 specialChar(symbol) ==
   -- looks up symbol in $specialCharacterAlist, gets the index
   -- into the EBCDIC table, and returns the appropriate character
diff --git a/src/interp/i-spec2.boot b/src/interp/i-spec2.boot
index a1134c44..94c7309f 100644
--- a/src/interp/i-spec2.boot
+++ b/src/interp/i-spec2.boot
@@ -33,6 +33,17 @@
 import '"i-spec1"
 )package "BOOT"
 
+++ Interpreter macros
+$InterpreterMacroAlist ==
+  '((%i . (complex 0 1))
+    (%e . (exp 1))
+    (%pi . (pi))
+    (SF . (DoubleFloat))
+    (%infinity . (infinity))
+    (%plusInfinity . (plusInfinity))
+    (%minusInfinity . (minusInfinity)))
+
+
 -- Functions which require special handlers (also see end of file)
 
 --% Handlers for map definitions
diff --git a/src/interp/i-syscmd.boot b/src/interp/i-syscmd.boot
index df0e8312..21a1387f 100644
--- a/src/interp/i-syscmd.boot
+++ b/src/interp/i-syscmd.boot
@@ -44,6 +44,11 @@ $SYSCOMMANDS := [CAR x for x in $systemCommands]
 
 UNDERBAR == '"__"
 
+$NonNullStream ==
+  '"NonNullStream"
+
+$NullStream ==
+  '"NullStream"
 
 $whatOptions := '( _
     operations _
@@ -77,6 +82,13 @@ $displayOptions := '( _
 
 $countAssoc := '( (cache countCache) )
 
+$localExposureDataDefault :=
+  VECTOR(["basic", "categories"], [], [])
+
+$localExposureData := 
+  COPY_-SEQ $localExposureDataDefault
+
+
 --% Top level system command
 
 initializeSystemCommands() ==
diff --git a/src/interp/lisplib.boot b/src/interp/lisplib.boot
index be1bd700..fa7b3fa7 100644
--- a/src/interp/lisplib.boot
+++ b/src/interp/lisplib.boot
@@ -34,6 +34,9 @@ import '"nlib"
 import '"c-util"
 )package "BOOT"
 
+++
+$functionLocations := []
+
 --% Standard Library Creation Functions
  
 readLib(fn,ft) == readLib1(fn,ft,"*")
diff --git a/src/interp/msgdb.boot b/src/interp/msgdb.boot
index 0630ae35..63f9683d 100644
--- a/src/interp/msgdb.boot
+++ b/src/interp/msgdb.boot
@@ -86,6 +86,8 @@ $cacheMessages := 'T  -- for debugging purposes
 $msgAlist := NIL
 $msgDatabaseName := NIL
 $testingErrorPrefix :=  '"Daly Bug"
+$testingSystem := false
+
 
 $texFormatting := false
 
diff --git a/src/interp/nlib.lisp b/src/interp/nlib.lisp
index e462977e..2d070775 100644
--- a/src/interp/nlib.lisp
+++ b/src/interp/nlib.lisp
@@ -369,15 +369,17 @@
 (defun probe-name (file)
   (if (probe-file file) (namestring file) nil))
 
-(defun get-directory-list (ft &aux (cd (namestring (get-current-directory))))
-  (cond ((member ft '("NRLIB" "DAASE" "EXPOSED") :test #'string=)
+(defun get-directory-list (ft)
+  (let ((cd (namestring (truename "./"))))
+    (cond ((member ft '("NRLIB" "DAASE" "EXPOSED") :test #'string=)
            (if (eq |$UserLevel| '|development|)
                (cons cd $library-directory-list)
-               $library-directory-list))
-        (t (adjoin cd 
-              (adjoin (namestring (user-homedir-pathname)) $directory-list 
-                      :test #'string=) 
-              :test #'string=))))
+	     $library-directory-list))
+	  (t (adjoin cd 
+		     (adjoin (namestring (user-homedir-pathname)) 
+			     $directory-list 
+			     :test #'string=) 
+		     :test #'string=)))))
 
 (defun make-input-filename (filearg &optional (filetype nil))
    (let*
diff --git a/src/interp/nruncomp.boot b/src/interp/nruncomp.boot
index 308c862f..15468369 100644
--- a/src/interp/nruncomp.boot
+++ b/src/interp/nruncomp.boot
@@ -36,6 +36,16 @@ import '"c-util"
 import '"simpbool"
 )package "BOOT"
 
+++
+$devaluateList := []
+$functorLocalParameters := []
+$insideCategoryPackageIfTrue := false
+
+++ By default, don't generate info files
+$profileCompiler := false
+
+
+
 -----------------------------NEW buildFunctor CODE-----------------------------
 NRTaddDeltaCode() ==
 --NOTES: This function is called from NRTbuildFunctor to initially
diff --git a/src/interp/nrunfast.boot b/src/interp/nrunfast.boot
index 36da8cc4..770c956c 100644
--- a/src/interp/nrunfast.boot
+++ b/src/interp/nrunfast.boot
@@ -35,6 +35,9 @@
 import '"c-util"
 )package "BOOT"
 
+++
+$doNotCompressHashTableIfTrue := false
+
 --=======================================================================
 --                     Basic Functions
 --=======================================================================
diff --git a/src/interp/nrungo.boot b/src/interp/nrungo.boot
index 16470b1e..968f4c09 100644
--- a/src/interp/nrungo.boot
+++ b/src/interp/nrungo.boot
@@ -35,6 +35,9 @@
 import '"c-util"
 )package "BOOT"
 
+++
+$insideCompileBodyIfTrue := false
+
 --=======================================================
 --             Lookup From Interpreter
 --=======================================================
diff --git a/src/interp/setq.lisp b/src/interp/setq.lisp
index c496c5ff..9eeda885 100644
--- a/src/interp/setq.lisp
+++ b/src/interp/setq.lisp
@@ -44,53 +44,12 @@
 
 (SETQ /RELEASE 0)
 
-(defconstant |$cclSystem|
-#+:CCL 't
-#-:CCL nil
-)
-
-;; These two variables are referred to in setvars.boot.
-#+:kcl (setq input-libraries nil)
-#+:kcl (setq output-library nil)
-
-;; For the browser, used for building local databases when a user compiles
-;; their own code.
-(SETQ |$newConstructorList| nil)
-(SETQ |$newConlist| nil)
-(SETQ |$createLocalLibDb| 't)
-
-
 ;; These were originally in SPAD LISP
 
-(SETQ $BOOT NIL)
-(setq |$interpOnly| nil)
-(SETQ |$testingSystem| NIL)
-(SETQ |$publicSystem| NIL)
-(SETQ |$newCompCompare| NIL)
-(SETQ |$permitWhere| NIL)
-(SETQ |$newSystem| T)
-(SETQ |$compileDontDefineFunctions| 'T)
-(SETQ |$compileOnlyCertainItems| NIL)
-(SETQ |$devaluateList| NIL)
-(SETQ |$doNotCompressHashTableIfTrue| NIL)
 (SETQ |$mutableChecking| NIL)    ; used in DEFINE BOOT
 (SETQ |$mutableDomains| NIL)     ; checked in DEFINE BOOT
-(SETQ |$functionLocations| NIL)
-(SETQ |$functorLocalParameters| NIL) ; used in compSymbol
-(SETQ /RELEASE '"UNKNOWN")
-(SETQ |$insideCategoryPackageIfTrue| NIL)
-(SETQ |$insideCompileBodyIfTrue| NIL)
-(SETQ |$globalExposureGroupAlist| NIL)
-(SETQ |$localExposureDataDefault|
-  (VECTOR (LIST '|basic| '|categories|) NIL NIL))
-(SETQ |$localExposureData|
-  (VECTOR (LIST '|basic| '|categories|) NIL NIL))
-(SETQ |$compilingInputFile| NIL)
-(SETQ |$minivectorNames| NIL)
-(setq |$ReadingFile| NIL)
-(setq |$NonNullStream| "NonNullStream")
-(setq |$NullStream| "NullStream")
-(setq |$domPvar| nil)
+
+
 (defvar $dalymode nil "if true then leading paren implies lisp cmd")
 (setq |$Newline| #\Newline)
 
@@ -136,33 +95,16 @@
 
 (SETQ |$abbreviateJoin| NIL)
 
-(SETQ |$InterpreterMacroAlist|
-      '((|%i| . (|complex| 0 1))
-        (|%e| . (|exp| 1))
-        (|%pi| . (|pi|))
-        (|SF| . (|DoubleFloat|))
-        (|%infinity| . (|infinity|))
-        (|%plusInfinity| . (|plusInfinity|))
-        (|%minusInfinity| . (|minusInfinity|))))
-
 ;; variables controlling companion pages (see copage.boot)
 (SETQ |$HTCompanionWindowID| nil)
 (SETQ |$HTPreviousDomain| nil)
 (SETQ |$HTOperationError| nil)
 
-;; Common lisp control variables
-;;(setq *load-verbose* nil)
-(setq *print-array* nil)
-(setq *print-pretty* nil)
-(setq *print-circle* nil)
-
 (SETQ |S:SPADTOK| 'SPADSYSTOK)
 (SETQ APLMODE NIL)
 (SETQ RLGENSYMFG NIL)
 (SETQ RLGENSYMLST NIL)
 (SETQ XTOKENREADER 'SPADTOK)
-(SETQ |$delimiterTokenList|
-  '(| |  |)| |(| |{| |}| |[| |]| ENDOFLINECHR EOI EOL |END_LINE|))
 (SETQ |$generalTokenIfTrue| NIL)
 (SETQ OPASSOC NIL)
 (SETQ SPADSYSKEY '(EOI EOL))
@@ -192,62 +134,9 @@
 (SETQ |$userModemaps| NIL)
 (SETQ |$functorForm| NIL)
 
-(SETQ |$InitialCommandSynonymAlist| '(
-       (|?|          . "what commands")
-       (|ap|         . "what things")
-       (|apr|        . "what things")
-       (|apropos|    . "what things")
-       (|cache|      . "set functions cache")
-       (|cl|         . "clear")
-       (|cls|        . "zsystemdevelopment )cls")
-       (|cms|        . "system")
-       (|co|         . "compiler")
-       (|d|          . "display")
-       (|dep|        . "display dependents")
-       (|dependents| . "display dependents")
-       (|e|          . "edit")
-       (|expose|     . "set expose add constructor")
-       (|fc|         . "zsystemdevelopment )c")
-       (|fd|         . "zsystemdevelopment )d")
-       (|fdt|        . "zsystemdevelopment )dt")
-       (|fct|        . "zsystemdevelopment )ct")
-       (|fctl|       . "zsystemdevelopment )ctl")
-       (|fe|         . "zsystemdevelopment )e")
-       (|fec|        . "zsystemdevelopment )ec")
-       (|fect|       . "zsystemdevelopment )ect")
-       (|fns|        . "exec spadfn")
-       (|fortran|    . "set output fortran")
-       (|h|          . "help")
-       (|hd|         . "system hypertex &")
-       (|kclam|      . "boot clearClams ( )")
-       (|killcaches| . "boot clearConstructorAndLisplibCaches ( )")
-       (|patch|      . "zsystemdevelopment )patch")
-       (|pause|      . "zsystemdevelopment )pause")
-       (|prompt|     . "set message prompt")
-       (|recurrence| . "set functions recurrence")
-       (|restore|    . "history )restore")
-       (|save|       . "history )save")
-       (|startGraphics|    .  "system $AXIOM/lib/viewman &")
-       (|stopGraphics|     .  "lisp (|sockSendSignal| 2 15)")
-       (|time|       . "set message time")
-       (|type|       . "set message type")
-       (|unexpose|   . "set expose drop constructor")
-       (|up|         . "zsystemdevelopment )update")
-       (|version|    . "lisp *yearweek*")
-       (|w|          . "what")
-       (|wc|         . "what categories")
-       (|wd|         . "what domains")
-       (|who|        . "lisp (pprint credits)")
-       (|wp|         . "what packages")
-       (|ws|         . "what synonyms")
-))
-
-(SETQ |$CommandSynonymAlist| (COPY |$InitialCommandSynonymAlist|))
-
 (SETQ |$existingFiles| (MAKE-HASHTABLE 'UEQUAL))
 
 (SETQ |$instantRecord| (MAKE-HASHTABLE 'ID))
-(SETQ |$immediateDataSymbol| '|--immediateData--|)
 
 (SETQ |$useIntegerSubdomain| 'T)
 (SETQ |$useNewFloat| 'T)
@@ -277,30 +166,13 @@
 
 (SETQ |$printStorageIfTrue| NIL) ;; storage info disabled in common lisp
 
-(SETQ |$AnonymousFunction| '(|AnonymousFunction|))
-(SETQ |$Any|   '(|Any|))
-
-(SETQ |$OutputForm| '(|OutputForm|))
-
-(SETQ |$ComplexInteger| (LIST '|Complex| |$Integer|))
-(SETQ |$QuotientField| '|Fraction|)
-(SETQ |$FunctionalExpression| '|Expression|)
 (SETQ |$defaultFunctionTargets| '(()))
 
-;; New Names
-(SETQ |$SingleInteger| '(|SingleInteger|))
-
 (SETQ $NE (LIST (LIST NIL)))
 (SETQ |$suffix| NIL)
 (SETQ |$coerceIntByMapCounter| 0)
 (SETQ |$prefix| NIL)
 (SETQ |$formalArgList| ())
-(SETQ |$TriangleVariableList|
-   '(|t#1| |t#2| |t#3| |t#4| |t#5| |t#6| |t#7| |t#8| |t#9| |t#10|
-     |t#11| |t#12| |t#13| |t#14| |t#15| |t#16| |t#17| |t#18| |t#19| |t#20|
-     |t#21| |t#22| |t#23| |t#24| |t#25| |t#26| |t#27| |t#28| |t#29| |t#30|
-     |t#31| |t#32| |t#33| |t#34| |t#35| |t#36| |t#37| |t#38| |t#39| |t#40|
-     |t#41| |t#42| |t#43| |t#44| |t#45| |t#46| |t#47| |t#48| |t#49| |t#50|))
 
 (SETQ |$NRTflag| T)
 (SETQ |$NRTaddForm| NIL)
@@ -333,10 +205,6 @@
 (SETQ |$focus|  NIL)
 (SETQ |$focusAccessPath|  NIL)
 (SETQ |$minimumSeparation|  3)
-(SETQ |$origMaxColumn|  80)
-(SETQ |$origMaxRow|  20)
-(SETQ |$origMinColumn|  1)
-(SETQ |$origMinRow|  1)
 
 ;; ---- start of initial settings for variables used in test.boot
 
@@ -358,30 +226,3 @@
                                    ;; (see maPrin)
 
 ;; ---- end of initial settings for variables used in test.boot
-
-
-;; Next are initial values for fluid variables in G-BOOT BOOT
-
-(SETQ |$inDefLET| NIL)
-(SETQ |$inDefIS|  NIL)
-(SETQ |$letGenVarCounter| 1)
-(SETQ |$isGenVarCounter|  1)
-
-;; Next 2 lines originally from CLAM BOOT
-
-;; this node is used in looking up values
-(SETQ |$hashNode| (LIST NIL))
-
-(SETQ ERRORINSTREAM (DEFIOSTREAM
-    '((DEVICE . CONSOLE) (MODE . INPUT) (QUAL . T)) 133 1))
-
-(SETQ ERROROUTSTREAM
-  (DEFIOSTREAM '((DEVICE . CONSOLE)(MODE . OUTPUT)) 80 0) )
-
-(SETQ |$algebraOutputStream|
-  (DEFIOSTREAM '((DEVICE . CONSOLE)(MODE . OUTPUT)) 255 0) )
-
-;; By default, don't generate info files with old compiler.
-(setq |$profileCompiler| nil)
-
-
diff --git a/src/interp/setvars.boot b/src/interp/setvars.boot
index cc1f362c..c1523218 100644
--- a/src/interp/setvars.boot
+++ b/src/interp/setvars.boot
@@ -57,6 +57,60 @@ import '"macros"
 import '"debug"
 )package "BOOT"
 
+
+$InitialCommandSynonymAlist == '(
+   (?          . "what commands")
+   (ap         . "what things")
+   (apr        . "what things")
+   (apropos    . "what things")
+   (cache      . "set functions cache")
+   (cl         . "clear")
+   (cls        . "zsystemdevelopment )cls")
+   (cms        . "system")
+   (co         . "compiler")
+   (d          . "display")
+   (dep        . "display dependents")
+   (dependents . "display dependents")
+   (e          . "edit")
+   (expose     . "set expose add constructor")
+   (fc         . "zsystemdevelopment )c")
+   (fd         . "zsystemdevelopment )d")
+   (fdt        . "zsystemdevelopment )dt")
+   (fct        . "zsystemdevelopment )ct")
+   (fctl       . "zsystemdevelopment )ctl")
+   (fe         . "zsystemdevelopment )e")
+   (fec        . "zsystemdevelopment )ec")
+   (fect       . "zsystemdevelopment )ect")
+   (fns        . "exec spadfn")
+   (fortran    . "set output fortran")
+   (h          . "help")
+   (hd         . "system hypertex &")
+   (kclam      . "boot clearClams ( )")
+   (killcaches . "boot clearConstructorAndLisplibCaches ( )")
+   (patch      . "zsystemdevelopment )patch")
+   (pause      . "zsystemdevelopment )pause")
+   (prompt     . "set message prompt")
+   (recurrence . "set functions recurrence")
+   (restore    . "history )restore")
+   (save       . "history )save")
+   (startGraphics    .  "system $AXIOM/lib/viewman &")
+   (stopGraphics     .  "lisp (|sockSendSignal| 2 15)")
+   (time       . "set message time")
+   (type       . "set message type")
+   (unexpose   . "set expose drop constructor")
+   (up         . "zsystemdevelopment )update")
+   (version    . "lisp *yearweek*")
+   (w          . "what")
+   (wc         . "what categories")
+   (wd         . "what domains")
+   (who        . "lisp (pprint credits)")
+   (wp         . "what packages")
+   (ws         . "what synonyms")
+ )
+
+$CommandSynonymAlist := 
+  COPY $InitialCommandSynonymAlist
+
 -- The `set' function in this file handles the top level `)set'
 -- command line functions.
 
@@ -346,7 +400,7 @@ setInputLibrary arg ==
 
 setOutputLibrary arg ==
   -- Hack to avoid initialising libraries in KCL:
-  not $cclSystem => false
+  true => false
   arg = "%initialize%" =>
     $outputLibraryName := nil
   arg = "%display%" =>
diff --git a/src/interp/spad.lisp b/src/interp/spad.lisp
index e759cd67..cde66cdc 100644
--- a/src/interp/spad.lisp
+++ b/src/interp/spad.lisp
@@ -49,8 +49,6 @@
 (defvar |$compForModeIfTrue| nil "checked in compSymbol")
 (defvar |$functorForm| nil "checked in addModemap0")
 (defvar |$formalArgList| nil "checked in compSymbol")
-(defvar |$newCompCompare| nil "compare new compiler with old")
-(defvar |$compileOnlyCertainItems| nil "list of functions to compile")
 (defvar |$newCompAtTopLevel| nil "if t uses new compiler")
 (defvar |$doNotCompileJustPrint| nil "switch for compile")
 (defvar |$PrintCompilerMessageIfTrue| t)
diff --git a/src/interp/sys-constants.boot b/src/interp/sys-constants.boot
index 46330e78..345e665c 100644
--- a/src/interp/sys-constants.boot
+++ b/src/interp/sys-constants.boot
@@ -51,7 +51,6 @@ $timerTicksPerSecond ==
 _/MAJOR_-VERSION ==
   2
 
-
 --
 -- Text formatting
 --
@@ -239,11 +238,17 @@ $DomainVariableList ==
   '(_$1 _$2 _$3 _$4 _$5 _$6 _$7 _$8 _$9 _$10 _$11 _
     _$12 _$13 _$14 _$15 _$16 _$17 _$18 _$19 _$20)
 
+$TriangleVariableList ==
+  '(t_#1 t_#2 t_#3 t_#4 t_#5 t_#6 t_#7 t_#8 t_#9 t_#10
+    t_#11 t_#12 t_#13 t_#14 t_#15 t_#16 t_#17 t_#18 t_#19 t_#20
+    t_#21 t_#22 t_#23 t_#24 t_#25 t_#26 t_#27 t_#28 t_#29 t_#30
+    t_#31 t_#32 t_#33 t_#34 t_#35 t_#36 t_#37 t_#38 t_#39 t_#40
+    t_#41 t_#42 t_#43 t_#44 t_#45 t_#46 t_#47 t_#48 t_#49 t_#50)
 
 ++ List of basic predicates the system has a built-in optimization
 ++ support for.
 $BasicPredicates ==
-  '(INTEGERP STRINGP FLOATP)
+  '(INTEGERP STRINGP FLOATP SYMBOLP)
 
 
 
@@ -282,6 +287,10 @@ $SideEffectFreeFunctionList ==
 $Void ==
   '(Void)
 
+++ The Any domain constructor form
+$Any ==
+  '(Any)
+
 ++ Boolean domain constructor form
 $Boolean ==
   '(Boolean)
@@ -290,6 +299,9 @@ $Boolean ==
 $SmallInteger ==
   '(SingleInteger)
 
+$SingleInteger ==
+  '(SingleInteger)
+
 ++ The Integer domain constructor form.
 $Integer ==
   '(Integer)
@@ -311,10 +323,18 @@ $NonPositiveInteger ==
 $PositiveInteger ==
   '(PositiveInteger)
 
+++ The fraction field constructor
+$QuotientField ==
+  'Fraction
+
 ++ The RationalNumber domain constructor form
 $RationalNumber ==
   '(Fraction (Integer))
 
+++ The domain constructor for Gaussian integers
+$ComplexInteger ==
+  ["Complex", $Integer]
+
 
 ++ SingleFloat domain constructor form
 $SingleFloat ==
@@ -349,10 +369,22 @@ $Symbol ==
 $EmptyMode ==
   "$EmptyMode"
 
+++ The OutputForm domain constructor form
+$OutputForm ==
+  '(OutputForm)
+
+++ The domain constructor for functional expression
+$FunctionalExpression ==
+  'Expression
+
 ++ Expression domain constructor form
 $Expression ==
   '(OutputForm)
 
+++ The constructor form for unnamed functions.
+$AnonymousFunction ==
+  '(AnonymousFunction)
+
 ++ Exit domain constructor form
 $Exit ==
   '(Exit)
diff --git a/src/interp/sys-globals.boot b/src/interp/sys-globals.boot
index afa4f685..1cd31a55 100644
--- a/src/interp/sys-globals.boot
+++ b/src/interp/sys-globals.boot
@@ -427,5 +427,19 @@ _/TRACENAMES := nil
 $highlightAllowed := true
 
 ++
-_*PRINT_-CIRCLE_* := true
-_*PRINT_-ARRAY_* := false
+SETQ(_*PRINT_-CIRCLE_*, true)
+SETQ(_*PRINT_-ARRAY_*, false)
+SETQ(_*PRINT_-PRETTY_*, true)
+
+++
+INPUT_-LIBRARIES := nil
+OUTPUT_-LIBRARY := nil
+
+++
+$newConlist := nil
+
+++
+$compilingInputFile := false
+
+++
+$minivectorNames := []