* interp/sys-globals.boot ($consistencyCheck): Remove.

	($insideCanCoerceFrom): Define.
	* interp/setq.lisp: Remove more unused variables.
	* interp/patches.lisp (/RF-1): Tidy.
	* interp/server.boot (parseAndInterpret): Likewise.
	* interp/packtran.boot ($useNewParser): Remove.
	* interp/ht-util.boot (parseAndEval): Tidy.
	* interp/clam.boot ($failed): Define.
	* interp/g-timer.boot ($printStorageIfTrue): Likewise.
	* interp/hashcode.boot ($DomainsWithoutLisplibs): Likewise.
	* interp/i-coerce.boot ($useCoerceOrCroak): Likewise.
	* interp/i-analy.boot ($univariateDomains): Likewise.
	($multivariateDomains): Likewise.
	* interp/i-object.boot ($useIntegerSubdomain): Likewise.
	* interp/i-syscmd.boot ($existingFiles): Likewise.
	* interp/newfort.boot ($fortranArrayStartingIndex): Likewise.
	* interp/setvars.boot (resetWorkspaceVariables): Don't reset
	$dependeeClosureAlist. 

16 files changed, 53 insertions, 83 deletions

diff --git a/src/interp/clam.boot b/src/interp/clam.boot
index f2e7583a..acbbed21 100644
--- a/src/interp/clam.boot
+++ b/src/interp/clam.boot
@@ -1,6 +1,6 @@
 -- Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd.
 -- All rights reserved.
--- Copyright (C) 2007, Gabriel Dos Reis.
+-- Copyright (C) 2007-2008, Gabriel Dos Reis.
 -- All rights reserved.
 --
 -- Redistribution and use in source and binary forms, with or without
@@ -69,6 +69,9 @@ import '"g-timer"
 
 ++
 $hashNode := [[]]
+
+++
+$failed := '"failed"
  
 -- see SETQ LISP for initial def of $hashNode
  
diff --git a/src/interp/g-timer.boot b/src/interp/g-timer.boot
index 94bee59f..da55ccc1 100644
--- a/src/interp/g-timer.boot
+++ b/src/interp/g-timer.boot
@@ -1,6 +1,6 @@
 -- Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd.
 -- All rights reserved.
--- Copyright (C) 2007, Gabriel Dos Reis.
+-- Copyright (C) 2007-2008, Gabriel Dos Reis.
 -- All rights reserved.
 --
 -- Redistribution and use in source and binary forms, with or without
@@ -42,6 +42,7 @@ import '"g-util"
 --  and with measurement types (property, classproperty).
 
 printTimeIfTrue := false
+$printStorageIfTrue := false
  
 printNamedStatsByProperty(listofnames, property) ==
   total := +/[GETL(name,property) for [name,:.] in listofnames]
diff --git a/src/interp/hashcode.boot b/src/interp/hashcode.boot
index 3492b08a..ba6fb58f 100644
--- a/src/interp/hashcode.boot
+++ b/src/interp/hashcode.boot
@@ -1,6 +1,6 @@
 -- Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd.
 -- All rights reserved.
--- Copyright (C) 2007, Gabriel Dos Reis.
+-- Copyright (C) 2007-2008, Gabriel Dos Reis.
 -- All rights reserved.
 --
 -- Redistribution and use in source and binary forms, with or without
@@ -35,6 +35,10 @@
 import '"g-util"
 )package "BOOT"
 
+$DomainsWithoutLisplibs ==
+  '(CAPSULE Union Record SubDomain Mapping Enumeration Mode)
+
+
 -- Type hasher for old compiler style type names which produces a hash code
 -- compatible with the asharp compiler.  Takes a hard error if the type
 -- is parameterized, but has no constructor modemap.
diff --git a/src/interp/ht-util.boot b/src/interp/ht-util.boot
index 36330ed6..c94815c2 100644
--- a/src/interp/ht-util.boot
+++ b/src/interp/ht-util.boot
@@ -1,6 +1,6 @@
 -- Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd.
 -- All rights reserved.
--- Copyright (C) 2007, Gabriel Dos Reis.
+-- Copyright (C) 2007-2008, Gabriel Dos Reis.
 -- All rights reserved.
 --
 -- Redistribution and use in source and binary forms, with or without
@@ -668,12 +668,10 @@ parseAndEval string ==
 parseAndEval1 string ==
   syntaxError := false
   pform :=
-    $useNewParser =>
-      v := applyWithOutputToString('ncParseFromString, [string])
-      CAR v => CAR v
-      syntaxError := true
-      CDR v
-    oldParseString string
+    v := applyWithOutputToString('ncParseFromString, [string])
+    CAR v => CAR v
+    syntaxError := true
+    CDR v
   syntaxError =>
      '"Syntax Error "
   pform =>
diff --git a/src/interp/i-analy.boot b/src/interp/i-analy.boot
index 41ee4c9d..f984ac11 100644
--- a/src/interp/i-analy.boot
+++ b/src/interp/i-analy.boot
@@ -1,5 +1,7 @@
 -- Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd.
 -- All rights reserved.
+-- Copyright (C) 2007-2008, Gabriel Dos Reis.
+-- All rights reserved.
 --
 -- Redistribution and use in source and binary forms, with or without
 -- modification, are permitted provided that the following conditions are
@@ -33,6 +35,19 @@
 import '"i-object"
 )package "BOOT"
 
+$univariateDomains ==
+  '(UnivariatePolynomial
+    UnivariateTaylorSeries
+    UnivariateLaurentSeries
+    UnivariatePuiseuxSeries)
+
+$multivariateDomains ==
+  '(MultivariatePolynomial
+    DistributedMultivariatePolynomial
+    HomogeneousDistributedMultivariatePolynomial
+    GeneralDistributedMultivariatePolynomial)
+
+
 --% Interpreter Analysis Functions
 
 getMinimalVariableTower(var,t) ==
diff --git a/src/interp/i-coerce.boot b/src/interp/i-coerce.boot
index 9a44c578..92226235 100644
--- a/src/interp/i-coerce.boot
+++ b/src/interp/i-coerce.boot
@@ -1,5 +1,7 @@
 -- Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd.
 -- All rights reserved.
+-- Copyright (C) 2007-2008, Gabriel Dos Reis.
+-- All rights reserved.
 --
 -- Redistribution and use in source and binary forms, with or without
 -- modification, are permitted provided that the following conditions are
@@ -34,6 +36,8 @@ import '"i-analy"
 import '"i-resolv"
 )package "BOOT"
 
+$useCoerceOrCroak := true
+
 --%  Algebraic coercions using interactive code
 
 algCoerceInteractive(p,source,target) ==
diff --git a/src/interp/i-object.boot b/src/interp/i-object.boot
index 55adaf2a..803244cb 100644
--- a/src/interp/i-object.boot
+++ b/src/interp/i-object.boot
@@ -1,6 +1,6 @@
 -- Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd.
 -- All rights reserved.
--- Copyright (C) 2007, Gabriel Dos Reis.
+-- Copyright (C) 2007-2008, Gabriel Dos Reis.
 -- All rights reserved.
 --
 -- Redistribution and use in source and binary forms, with or without
@@ -44,6 +44,9 @@ $localVars := []
 ++ declared mode of the current entity being processed.
 $declaredMode := nil
 
+++
+$useIntegerSubdomain := true
+
 --% Functions on interpreter objects
 
 -- Interpreter objects used to be called triples because they had the
diff --git a/src/interp/i-syscmd.boot b/src/interp/i-syscmd.boot
index 0745613d..c74612b9 100644
--- a/src/interp/i-syscmd.boot
+++ b/src/interp/i-syscmd.boot
@@ -42,6 +42,8 @@ $compileRecurrence := true
 $errorReportLevel := 'warning
 $sourceFileTypes := '(INPUT SPAD BOOT LISP LISP370 META)
 
+$existingFiles := MAKE_-HASHTABLE "UEQUAL"
+
 $SYSCOMMANDS := [CAR x for x in $systemCommands]
 
 UNDERBAR == '"__"
diff --git a/src/interp/newfort.boot b/src/interp/newfort.boot
index 1ab40abe..618f4be0 100644
--- a/src/interp/newfort.boot
+++ b/src/interp/newfort.boot
@@ -1,5 +1,7 @@
 -- Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd.
 -- All rights reserved.
+-- Copyright (C) 2007-2008, Gabriel Dos Reis.
+-- All rights reserved.
 --
 -- Redistribution and use in source and binary forms, with or without
 -- modification, are permitted provided that the following conditions are
@@ -33,6 +35,8 @@
 import '"macros"
 )package "BOOT"
 
+$fortranArrayStartingIndex := 0
+
 --% Translation of Expression to FORTRAN
 assignment2Fortran1(name,e) ==
   $fortError : fluid := nil
diff --git a/src/interp/nrunfast.boot b/src/interp/nrunfast.boot
index d8e6736f..520dda39 100644
--- a/src/interp/nrunfast.boot
+++ b/src/interp/nrunfast.boot
@@ -52,7 +52,6 @@ initNewWorld() ==
   $NRTmakeShortDirect := true
   $newWorld := true
   $monitorNewWorld := false
-  $consistencyCheck := false
   $spadLibFT := 'NRLIB
   $NRTmonitorIfTrue := false
   $updateCatTableIfTrue := false
diff --git a/src/interp/packtran.boot b/src/interp/packtran.boot
index e6499e0f..9bc69888 100644
--- a/src/interp/packtran.boot
+++ b/src/interp/packtran.boot
@@ -1,6 +1,6 @@
 -- Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd.
 -- All rights reserved.
--- Copyright (C) 2007, Gabriel Dos Reis.
+-- Copyright (C) 2007-2008, Gabriel Dos Reis.
 -- All rights reserved.
 --
 -- Redistribution and use in source and binary forms, with or without
@@ -35,10 +35,6 @@
 import '"sys-macros"
 )package "BOOT"
 
--- The $useNewParser flag controls which parser will be used in the interpreter
--- If nil then the old parser is used, otherwise Bill Burge's parser is used
-$useNewParser := true
-
 rePackageTran(sex, package) ==
   _*PACKAGE_* : fluid := FIND_-PACKAGE STRING package
   packageTran sex
diff --git a/src/interp/patches.lisp b/src/interp/patches.lisp
index 19b806ca..822b7b52 100644
--- a/src/interp/patches.lisp
+++ b/src/interp/patches.lisp
@@ -1,6 +1,6 @@
 ;; Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd.
 ;; All rights reserved.
-;; Copyright (C) 2007, Gabriel Dos Reis.
+;; Copyright (C) 2007-2008, Gabriel Dos Reis.
 ;; All rights reserved.
 ;;
 ;; Redistribution and use in source and binary forms, with or without
@@ -120,8 +120,7 @@
       (load lfile))
      ((string= type "lisp") (load input-file))
      ((string= type "bbin") (load input-file))
-     ((and (string= type "input")
-           |$useNewParser|)
+     ((string= type "input")
       (|ncINTERPFILE| input-file Echo-Meta))
      (t (spad input-file)))))
 
@@ -219,9 +218,6 @@
 (define-function '|isLowerCaseLetter| #'LOWER-CASE-P)
 (define-function '|isUpperCaseLetter| #'UPPER-CASE-P)
 (define-function '|isLetter| #'ALPHA-CHAR-P)
-;; reset from /spad/lisp/setq.lisp
-(setq |$consistencyCheck| ()) ;; prevents wasting time checking consistency
-
 
 #+(or :CCL (and :lucid :ibm/370))
 (setq $current-directory (truename "."))
diff --git a/src/interp/server.boot b/src/interp/server.boot
index 9bb1c271..c37f072f 100644
--- a/src/interp/server.boot
+++ b/src/interp/server.boot
@@ -1,6 +1,6 @@
 -- Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd.
 -- All rights reserved.
--- Copyright (C) 2007, Gabriel Dos Reis.
+-- Copyright (C) 2007-2008, Gabriel Dos Reis.
 -- All rights reserved.
 --
 -- Redistribution and use in source and binary forms, with or without
@@ -107,9 +107,7 @@ parseAndInterpret str ==
   $BOOT: fluid := NIL
   $SPAD: fluid := true
   $e:fluid := $InteractiveFrame
-  $useNewParser =>
-    ncParseAndInterpretString str
-  oldParseAndInterpret str
+  ncParseAndInterpretString str
 
 oldParseAndInterpret str ==
   tree := string2SpadTree str
diff --git a/src/interp/setq.lisp b/src/interp/setq.lisp
index db0998ff..eb0202ee 100644
--- a/src/interp/setq.lisp
+++ b/src/interp/setq.lisp
@@ -46,29 +46,14 @@
 (defvar MARG 0)
   ;" Margin for testing by ?OP"
 
-(SETQ |$consistencyCheck| 'T)
-(SETQ |$ruleSetsInitialized| NIL)
-
-;; tell the system not to use the new parser
-(SETQ |$useNewParser| NIL)
-
-(SETQ |$htPrecedenceTable| NIL)
-
 (SETQ |$NRTmakeCompactDirect| NIL)
 (SETQ |$NRTquick| NIL)
 (SETQ |$NRTmakeShortDirect| NIL)
 (SETQ |$newWorld| NIL)
 (SETQ |$returnNowhereFromGoGet| NIL)
 
-(SETQ |$insideCanCoerceFrom| NIL)
-
-(SETQ |$useCoerceOrCroak| T)
-
 (SETQ |$abbreviateJoin| NIL)
 
-;; variables controlling companion pages (see copage.boot)
-(SETQ |$HTCompanionWindowID| nil)
-
 (SETQ |S:SPADTOK| 'SPADSYSTOK)
 (SETQ APLMODE NIL)
 (SETQ RLGENSYMFG NIL)
@@ -94,48 +79,11 @@
 (SETQ RPAR ")")
 (SETQ SLASH "/")
 (SETQ STAR "*")
-(SETQ |$fortranArrayStartingIndex| 0)
 
 ;; These were originally in INIT LISP
 
-(SETQ |$dependeeClosureAlist|       NIL)
-(SETQ |$userModemaps| NIL)
 (SETQ |$functorForm| NIL)
 
-(SETQ |$existingFiles| (MAKE-HASHTABLE 'UEQUAL))
-
-(SETQ |$instantRecord| (MAKE-HASHTABLE 'ID))
-
-(SETQ |$useIntegerSubdomain| 'T)
-(SETQ |$useNewFloat| 'T)
-
-;; the following symbol holds the canonical "failed" value
-(SETQ |$failed| "failed")
-
-(SETQ |$constructorDataTable| NIL)
-
-(SETQ |$univariateDomains| '(
-    |UnivariatePolynomial|
-    |UnivariateTaylorSeries|
-    |UnivariateLaurentSeries|
-    |UnivariatePuiseuxSeries|
-    ))
-(SETQ |$multivariateDomains| '(
-    |MultivariatePolynomial|
-    |DistributedMultivariatePolynomial|
-    |HomogeneousDistributedMultivariatePolynomial|
-    |GeneralDistributedMultivariatePolynomial|
-    ))
-
-(SETQ |$DomainsWithoutLisplibs| '(
-  CAPSULE |Union| |Record| |SubDomain| |Mapping| |Enumeration| |Domain| |Mode|))
-
-(SETQ |$tracedMapSignatures| ())
-
-(SETQ |$printStorageIfTrue| NIL) ;; storage info disabled in common lisp
-
-(SETQ |$defaultFunctionTargets| '(()))
-
 (SETQ $NE (LIST (LIST NIL)))
 (SETQ |$suffix| NIL)
 (SETQ |$coerceIntByMapCounter| 0)
diff --git a/src/interp/setvars.boot b/src/interp/setvars.boot
index eec432a5..d1e8b40a 100644
--- a/src/interp/setvars.boot
+++ b/src/interp/setvars.boot
@@ -155,7 +155,6 @@ resetWorkspaceVariables() ==
   SETQ($msgAlist                    , NIL)
   SETQ($msgDatabase                 , NIL)
   SETQ($msgDatabaseName             , NIL)
-  SETQ($dependeeClosureAlist        , NIL)
   SETQ($IOindex                     , 1  )
   SETQ($coerceIntByMapCounter       , 0  )
   SETQ($e                           , $EmptyEnvironment)
diff --git a/src/interp/sys-globals.boot b/src/interp/sys-globals.boot
index 777b890f..edd5d114 100644
--- a/src/interp/sys-globals.boot
+++ b/src/interp/sys-globals.boot
@@ -80,9 +80,6 @@ $compCount := 0
 $compUniquelyIfTrue := false
 
 ++
-$consistencyCheck := true
-
-++
 $ConstructorCache := MAKE_-HASHTABLE "ID"
 
 ++
@@ -446,3 +443,6 @@ $minivectorNames := []
 ++ This semenatics is in effect only when `Rep' is defined
 ++ through assignment.
 $useRepresentationHack := true
+
+++
+$insideCanCoerceFrom := nil