* interp/spad.lisp (S-PROCESS): Remove Old Boot specific codes.

* interp/server.boot (parseAndInterpret): Don't set $BOOT. * interp/setvars.boot (resetWorkspaceVariables): Likewise. * interp/spad-parser.boot (parseSpadFile): Likewise. * interp/postpar.boot: Disable Old Boot handling codes. * interp/metalex.lisp (quote-if-string): Don't test for $BOOT. * interp/parsing.lisp (IOStat): Likewise. (IOClear): Likewise. * interp/ht-util.boot (parseAndEval): Don't set $BOOT. * interp/int-top.boot (ncTopLevel): Likewise. * interp/fnewmeta.lisp: Remove Old Boot specific productions. * interp/sys-macros.lisp (-REDUCE): Don't test for $BOOT. (SPADDO): Likewise. * interp/comp.lisp (COMP-TRAN-1): Likewise. * interp/util.lisp (|string2SpadTree|): Likewise. * interp/bootlex.lisp (READBOOT): Remove. (READ-BOOT): Likewise. (spad): Don't initialize $BOOT. * interp/debug.lisp (/D-2): Likewise.
author: dos-reis <gdr@axiomatics.org> 2008-07-07 20:20:31 +0000
committer: dos-reis <gdr@axiomatics.org> 2008-07-07 20:20:31 +0000
commit: 95ef8592f2efacf43bc943a1df9a9007a46decea (patch)
tree: 13d75cae2b038af6095e25087c1e400fc7e06162 /src
parent: 3d2601972bcc0cb08da6190d771dcb75544bfe5d (diff)
download: open-axiom-95ef8592f2efacf43bc943a1df9a9007a46decea.tar.gz
17 files changed, 61 insertions, 96 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 07a1bd75..91eab7a6 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,25 @@
+2008-07-07  Gabriel Dos Reis  <gdr@cs.tamu.edu>
+
+	* interp/spad.lisp (S-PROCESS): Remove Old Boot specific codes.
+	* interp/server.boot (parseAndInterpret): Don't set $BOOT.
+	* interp/setvars.boot (resetWorkspaceVariables): Likewise.
+	* interp/spad-parser.boot (parseSpadFile): Likewise.
+	* interp/postpar.boot: Disable Old Boot handling codes.
+	* interp/metalex.lisp (quote-if-string): Don't test for $BOOT.
+	* interp/parsing.lisp (IOStat): Likewise.
+	(IOClear): Likewise.
+	* interp/ht-util.boot (parseAndEval): Don't set $BOOT.
+	* interp/int-top.boot (ncTopLevel): Likewise.
+	* interp/fnewmeta.lisp: Remove Old Boot specific productions.
+	* interp/sys-macros.lisp (-REDUCE): Don't test for $BOOT.
+	(SPADDO): Likewise.
+	* interp/comp.lisp (COMP-TRAN-1): Likewise.
+	* interp/util.lisp (|string2SpadTree|): Likewise.
+	* interp/bootlex.lisp (READBOOT): Remove.
+	(READ-BOOT): Likewise.
+	(spad): Don't initialize $BOOT.
+	* interp/debug.lisp (/D-2): Likewise.
+
 2008-07-06  Gabriel Dos Reis  <gdr@cs.tamu.edu>
 
 	* boot/initial-env.lisp: Export $InteractiveMode and
diff --git a/src/interp/bootlex.lisp b/src/interp/bootlex.lisp
index 718c3058..1afad6e7 100644
--- a/src/interp/bootlex.lisp
+++ b/src/interp/bootlex.lisp
@@ -89,7 +89,6 @@
            (*comp370-apply* (function print-defun))
            (*fileactq-apply* (function print-defun))
            ($SPAD T)
-           ($BOOT nil)
            (XCape #\_)
            (OPTIONLIST nil)
            (*EOF* NIL)
@@ -141,9 +140,6 @@
     (if *spad-output-file* (shut out-stream)))
   T))
 
-(defun READ-BOOT (FN FM TO)
-  (let (($boot t)) (READ-SPAD1 FN 'BOOT FM TO)))
-
 (defun READ-SPAD1 (FN FT FM TO)
     (LET ((STRM IN-STREAM))
       (SETQ $MAXLINENUMBER 0)
@@ -162,17 +158,6 @@
       (+ (ELT $SPAD_ERRORS 0) (ELT $SPAD_ERRORS 1) (ELT $SPAD_ERRORS 2))))
 
 
-(defun READBOOT ()
-  (let (form expr ($BOOT 'T))
-    (declare (special $BOOT))
-    (ADVANCE-TOKEN)
-    (|PARSE-Expression|)
-   ;; (|pp| (setq form (|postTransform| (FIRST STACK))))
-    (|pp| (setq form (|postTransform| (pop-STACK-1))))
-    (setq EXPR (DEF-RENAME form))
-    (DEF-PROCESS EXPR)
-    (TERSYSCOMMAND)))
-
 ;  *** 2. BOOT Line Handling ***
 
 ; See the file PREPARSE.LISP for the hard parts of BOOT line processing.
diff --git a/src/interp/comp.lisp b/src/interp/comp.lisp
index b60cd837..307750ac 100644
--- a/src/interp/comp.lisp
+++ b/src/interp/comp.lisp
@@ -278,7 +278,7 @@
            ; temporarily make TRACELET cause MAKEPROPs to be reported
           ((MEMQ U '(DCQ RELET PRELET SPADLET SETQ LET) )
            (COND ((NOT (eq U 'DCQ))
-                  (COND ((OR (AND (eq $NEWSPAD T) (NOT $BOOT))
+                  (COND ((OR (AND (eq $NEWSPAD T))
                              (MEMQ $FUNNAME |$traceletFunctions|))
                          (NCONC X $FUNNAME_TAIL)
                          (RPLACA X 'LETT))
diff --git a/src/interp/debug.lisp b/src/interp/debug.lisp
index 79bb979b..78160568 100644
--- a/src/interp/debug.lisp
+++ b/src/interp/debug.lisp
@@ -132,13 +132,13 @@
          ECHO-META SINGLINEMODE XCAPE XTOKENREADER INPUTSTREAM SPADERRORSTREAM
          ISID NBLNK COMMENTCHR $TOKSTACK (/SOURCEFILES |$sourceFiles|)
          METAKEYLST DEFINITION_NAME (|$sourceFileTypes| '(|spad| |boot| |lisp| |lsp| |meta|))
-         ($FUNCTION FN) $BOOT $NEWSPAD $LINESTACK $LINENUMBER STACK STACKX BACK OK
+         ($FUNCTION FN) $NEWSPAD $LINESTACK $LINENUMBER STACK STACKX BACK OK
          TRAPFLAG |$InteractiveMode| TOK ERRCOL COLUMN *QUERY CHR LINE
          (*COMP370-APPLY* (if (eq op 'define) #'eval-defun #'compile-defun)))
         (declare (special ECHO-META SINGLINEMODE XCAPE XTOKENREADER INPUTSTREAM
                      SPADERRORSTREAM ISID NBLNK COMMENTCHR $TOKSTACK /SOURCEFILES
                      METAKEYLST DEFINITION_NAME |$sourceFileTypes|
-                     $FUNCTION $BOOT $NEWSPAD $LINESTACK $LINENUMBER STACK STACKX BACK OK
+                     $FUNCTION $NEWSPAD $LINESTACK $LINENUMBER STACK STACKX BACK OK
                      TRAPFLAG |$InteractiveMode| TOK ERRCOL COLUMN *QUERY CHR LINE))
         (if (PAIRP FN) (SETQ FN (QCAR FN)))
         (SETQ INFILE (OR INFILE (|getFunctionSourceFile| FN)))
@@ -230,8 +230,7 @@
         (|sayBrightly|
          (LIST  "   Reading file" '|%b| (|namestring| INFILE) '|%d|))
         (TERPRI)
-        (SETQ $BOOT (EQ oft 'BOOT))
-        (SETQ $NEWSPAD (OR $BOOT (EQ oft 'SPAD)))
+        (SETQ $NEWSPAD (EQ oft 'SPAD))
         (SETQ DEF
               (COND
                ( SFN
diff --git a/src/interp/fnewmeta.lisp b/src/interp/fnewmeta.lisp
index 56420a92..49fe82c8 100644
--- a/src/interp/fnewmeta.lisp
+++ b/src/interp/fnewmeta.lisp
@@ -99,7 +99,7 @@
 
 ;; Suffix:         +=(CURRENT-SYMBOL) .(ADVANCE-TOKEN) <TokTail> +(#1 #1) ;
 
-;; TokTail:        ?(AND (NULL \$BOOT) (EQ (CURRENT-SYMBOL) "\$)
+;; TokTail:        ?(AND (EQ (CURRENT-SYMBOL) "\$)
 ;;                       (OR (ALPHA-CHAR-P (CURRENT-CHAR))
 ;;                           (CHAR-EQ (CURRENT-CHAR) '$')
 ;;                           (CHAR-EQ (CURRENT-CHAR) '\%')
@@ -178,8 +178,8 @@
 ;; Application: Primary <Selector>* <Application +(#2 #1)>;
 
 ;; Selector: ?NONBLANK ?(EQ (CURRENT-SYMBOL) "\.) ?(CHAR-NE (CURRENT-CHAR) "\ )
-;;                  '.' PrimaryNoFloat (=\$BOOT +(ELT #2 #1)/ +(#2 #1))
-;;           / (Float /'.' Primary) (=\$BOOT +(ELT #2 #1)/ +(#2 #1));
+;;                  '.' PrimaryNoFloat +(#2 #1)
+;;           / (Float /'.' Primary) +(#2 #1);
 
 ;; PrimaryNoFloat: Primary1 <TokTail> ;
 
@@ -190,7 +190,7 @@
 ;;         /String
 ;;         /IntegerTok
 ;;         /FormalParameter
-;;         /='\'' (?\$BOOT Data / '\'' Expr{999} +(QUOTE #1))
+;;         /='\'' ('\'' Expr{999} +(QUOTE #1))
 ;;         /Sequence
 ;;         /Enclosure ;
 
@@ -221,13 +221,13 @@
 
 ;; IntegerTok:     NUMBER ;
 
-;; FloatTok:       NUMBER +=(IF \$BOOT #1 (BFP- #1)) ;
+;; FloatTok:       NUMBER +=(BFP- #1) ;
 
 ;; FormalParameter: FormalParameterTok ;
 
 ;; FormalParameterTok: ARGUMENT-DESIGNATOR ;
 
-;; Quad:           '$' +\$ / ?\$BOOT GliphTok{"\.} +\. ;
+;; Quad:           '$' +\$ ;
 
 ;; String:         SPADSTRING ;
 
@@ -482,7 +482,7 @@
 (DEFUN |PARSE-TokTail| ()
   (PROG (G1)
     (RETURN
-      (AND (NULL $BOOT) (EQ (CURRENT-SYMBOL) '$)
+      (AND (EQ (CURRENT-SYMBOL) '$)
            (OR (ALPHA-CHAR-P (CURRENT-CHAR))
                (CHAR-EQ (CURRENT-CHAR) "$")
                (CHAR-EQ (CURRENT-CHAR) "%")
@@ -699,23 +699,13 @@
   (OR (AND NONBLANK (EQ (CURRENT-SYMBOL) '|.|)
            (CHAR-NE (CURRENT-CHAR) '| |) (MATCH-ADVANCE-STRING ".")
            (MUST (|PARSE-PrimaryNoFloat|))
-           (MUST (OR (AND $BOOT
-                          (PUSH-REDUCTION '|PARSE-Selector|
-                              (CONS 'ELT
-                                    (CONS (POP-STACK-2)
-                                     (CONS (POP-STACK-1) NIL)))))
-                     (PUSH-REDUCTION '|PARSE-Selector|
-                         (CONS (POP-STACK-2) (CONS (POP-STACK-1) NIL))))))
+           (MUST (PUSH-REDUCTION '|PARSE-Selector|
+                     (CONS (POP-STACK-2) (CONS (POP-STACK-1) NIL)))))
       (AND (OR (|PARSE-Float|)
                (AND (MATCH-ADVANCE-STRING ".")
                     (MUST (|PARSE-Primary|))))
-           (MUST (OR (AND $BOOT
-                          (PUSH-REDUCTION '|PARSE-Selector|
-                              (CONS 'ELT
-                                    (CONS (POP-STACK-2)
-                                     (CONS (POP-STACK-1) NIL)))))
-                     (PUSH-REDUCTION '|PARSE-Selector|
-                         (CONS (POP-STACK-2) (CONS (POP-STACK-1) NIL)))))))) 
+           (MUST (PUSH-REDUCTION '|PARSE-Selector|
+                     (CONS (POP-STACK-2) (CONS (POP-STACK-1) NIL))))))) 
 
 
 (DEFUN |PARSE-PrimaryNoFloat| ()
@@ -736,11 +726,10 @@
       (|PARSE-Quad|) (|PARSE-String|) (|PARSE-IntegerTok|)
       (|PARSE-FormalParameter|)
       (AND (MATCH-STRING "'")
-           (MUST (OR (AND $BOOT (|PARSE-Data|))
-                     (AND (MATCH-ADVANCE-STRING "'")
-                          (MUST (|PARSE-Expr| 999))
-                          (PUSH-REDUCTION '|PARSE-Primary1|
-                              (CONS 'QUOTE (CONS (POP-STACK-1) NIL)))))))
+           (MUST (AND (MATCH-ADVANCE-STRING "'")
+                      (MUST (|PARSE-Expr| 999))
+                      (PUSH-REDUCTION '|PARSE-Primary1|
+                          (CONS 'QUOTE (CONS (POP-STACK-1) NIL))))))
       (|PARSE-Sequence|) (|PARSE-Enclosure|))) 
 
 
@@ -829,8 +818,7 @@
 
 (DEFUN |PARSE-FloatTok| ()
   (AND (PARSE-NUMBER)
-       (PUSH-REDUCTION '|PARSE-FloatTok|
-           (IF $BOOT (POP-STACK-1) (BFP- (POP-STACK-1)))))) 
+       (PUSH-REDUCTION '|PARSE-FloatTok| (POP-STACK-1))))) 
 
 
 (DEFUN |PARSE-FormalParameter| () (|PARSE-FormalParameterTok|)) 
@@ -840,10 +828,8 @@
 
 
 (DEFUN |PARSE-Quad| ()
-  (OR (AND (MATCH-ADVANCE-STRING "$")
-           (PUSH-REDUCTION '|PARSE-Quad| '$))
-      (AND $BOOT (|PARSE-GliphTok| '|.|)
-           (PUSH-REDUCTION '|PARSE-Quad| '|.|)))) 
+  (AND (MATCH-ADVANCE-STRING "$")
+       (PUSH-REDUCTION '|PARSE-Quad| '$)))
 
 
 (DEFUN |PARSE-String| () (PARSE-SPADSTRING)) 
diff --git a/src/interp/ht-util.boot b/src/interp/ht-util.boot
index 612131bc..9f32e448 100644
--- a/src/interp/ht-util.boot
+++ b/src/interp/ht-util.boot
@@ -524,7 +524,6 @@ condErrorMsg type ==
 
 parseAndEval string ==
   $InteractiveMode :fluid := true
-  $BOOT: fluid := NIL
   $SPAD: fluid := true
   $e:fluid := $InteractiveFrame
   $QuietCommand:local := true
diff --git a/src/interp/int-top.boot b/src/interp/int-top.boot
index d1386a70..5c4664bc 100644
--- a/src/interp/int-top.boot
+++ b/src/interp/int-top.boot
@@ -93,7 +93,6 @@ ncTopLevel() ==
   IN_-STREAM: fluid := $InputStream
   _*EOF_*: fluid := NIL
   $InteractiveMode :fluid := true
-  $BOOT: fluid := NIL
   $NEWSPAD: fluid := true
   $SPAD: fluid := true
   $e:fluid := $InteractiveFrame
diff --git a/src/interp/metalex.lisp b/src/interp/metalex.lisp
index 0d5c6e6b..65563cd7 100644
--- a/src/interp/metalex.lisp
+++ b/src/interp/metalex.lisp
@@ -558,7 +558,7 @@ empty (if File-Closed (return nil))
     (identifier         (let ((id (symbol-name (token-symbol token)))
                               (pack (package-name (symbol-package
                                                    (token-symbol token)))))
-                          (if (or $BOOT $SPAD)
+                          (if $SPAD
                               (if (equal pack "BOOT")
                                   (escape-keywords (underscore id) (token-symbol token))
                                 (concatenate 'string
diff --git a/src/interp/parsing.lisp b/src/interp/parsing.lisp
index 21ec9745..7a45c658 100644
--- a/src/interp/parsing.lisp
+++ b/src/interp/parsing.lisp
@@ -518,7 +518,7 @@ the stack, then stack a NIL. Return the value of prod."
   "Tell me what the current state of the parsing world is."
   ;(IOStreams-show)
   (current-line-show)
-  (if (or $BOOT $SPAD) (next-lines-show))
+  (if $SPAD (next-lines-show))
   (token-stack-show)
   ;(reduce-stack-show)
   nil)
@@ -529,7 +529,7 @@ the stack, then stack a NIL. Return the value of prod."
   (current-line-clear)
   (token-stack-clear)
   (reduce-stack-clear)
-  (if (or $BOOT $SPAD) (next-lines-clear))
+  (if $SPAD (next-lines-clear))
   nil)
 
 ;; auxiliary functions needed by the parser
diff --git a/src/interp/postpar.boot b/src/interp/postpar.boot
index 607fbfcf..02ca813c 100644
--- a/src/interp/postpar.boot
+++ b/src/interp/postpar.boot
@@ -97,7 +97,6 @@ postTranList x ==
 postBigFloat: %ParseTree -> %ParseTree
 postBigFloat x ==
   [.,mant,:expon] := x
-  $BOOT => INT2RNUM(mant) * INT2RNUM(10) ** expon
   eltword := if $InteractiveMode then "$elt" else "elt"
   postTran [[eltword,'(Float),"float"],[",",[",",mant,expon],10]]
 
@@ -132,14 +131,6 @@ postColon u ==
   u is [":",x] => [":",postTran x]
   u is [":",x,y] => [":",postTran x,:postType y]
 
-postColonColon: %ParseTree -> %ParseForm
-postColonColon u ==
-  -- for Lisp package calling
-  -- boot syntax is package::fun but probably need to parenthesize it
-  $BOOT and u is ["::",package,fun] =>
-    INTERN(STRINGIMAGE fun, package)
-  postForm u
-
 postAtSign: %ParseTree -> %ParseForm
 postAtSign t == 
   t isnt ["@",x,y] => systemErrorHere "postAtSign"
@@ -181,7 +172,6 @@ postMakeCons l ==
 
 postAtom: %Atom -> %ParseForm
 postAtom x ==
-  $BOOT => x
   x=0 => $Zero
   x=1 => $One
   EQ(x,'T) => "T$" -- rename T in spad code to T$
@@ -227,7 +217,7 @@ postDef t ==
 --+
   lhs is ["macro",name] => postMDef ["==>",name,rhs]
 
-  if not($BOOT) then recordHeaderDocumentation nil
+  recordHeaderDocumentation nil
   if $maxSignatureLineNumber ^= 0 then
     $docList := [["constructor",:$headerDocumentation],:$docList]
     $maxSignatureLineNumber := 0
@@ -263,7 +253,7 @@ postDefArgs argl ==
 postMDef: %ParseTree -> %ParseForm
 postMDef(t) ==
   [.,lhs,rhs] := t
-  $InteractiveMode and not $BOOT =>
+  $InteractiveMode =>
     lhs := postTran lhs
     not IDENTP lhs => throwKeyedMsg("S2IP0001",NIL)
     ["MDEF",lhs,nil,nil,postTran rhs]
@@ -305,7 +295,6 @@ postForm u ==
       argl':= postTranList argl
       op':=
         true=> op
-        $BOOT => op
         GETL(op,'Led) or GETL(op,'Nud) or op = 'IN => op
         numOfArgs:= (argl' is [["%Comma",:l]] => #l; 1)
         INTERNL("*",STRINGIMAGE numOfArgs,PNAME op)
@@ -364,7 +353,7 @@ decodeScripts a ==
 postIf: %ParseTree -> %ParseForm
 postIf t ==
   t isnt ["if",:l] => t
-  ["IF",:[(null (x:= postTran x) and not $BOOT => "%noBranch"; x)
+  ["IF",:[(null (x:= postTran x) => "%noBranch"; x)
     for x in l]]
 
 postJoin: %ParseTree -> %ParseForm
@@ -385,9 +374,7 @@ postMapping u  ==
 
 postOp: %ParseTree -> %ParseForm
 postOp x ==
-  x=":=" =>
-    $BOOT => "SPADLET"
-    "LET"
+  x=":=" => "LET"
   x=":-" => "LETD"
   x="%Attribute" => "ATTRIBUTE"
   x
@@ -462,7 +449,7 @@ tuple2List l ==
     u:= tuple2List l'
     a is ["SEGMENT",p,q] =>
       null u => ["construct",postTranSegment(p,q)]
-      $InteractiveMode and not $BOOT =>
+      $InteractiveMode =>
         ["append",["construct",postTranSegment(p,q)],tuple2List l']
       ["nconc",["construct",postTranSegment(p,q)],tuple2List l']
     null u => ["construct",postTran a]
@@ -596,7 +583,6 @@ unComma x ==
 ++ check that `^=' is not used in Spad code to mean `not equal'.
 postBootNotEqual: %ParseTree -> %ParseForm
 postBootNotEqual u ==
-  $BOOT => [first u, :postTran rest u]
   checkWarning ['"Operator ", :bright '"^=", 
    '"is not valid Spad.  Please use",:bright '"~=",'"instead."]
   ["~=",:postTran rest u]
@@ -620,7 +606,6 @@ for x in [["with", :"postWith"],_
 	  [",", :"postComma"],_
 	  [";", :"postSemiColon"],_
 	  ["where", :"postWhere"],_
-	  ["::", :"postColonColon"],_
 	  [":", :"postColon"],_
 	  ["@", :"postAtSign"],_
 	  ["pretend", :"postPretend"],_
diff --git a/src/interp/server.boot b/src/interp/server.boot
index 48818fe7..5f7652d8 100644
--- a/src/interp/server.boot
+++ b/src/interp/server.boot
@@ -102,7 +102,6 @@ serverReadLine(stream) ==
 
 parseAndInterpret str ==
   $InteractiveMode :fluid := true
-  $BOOT: fluid := NIL
   $SPAD: fluid := true
   $e:fluid := $InteractiveFrame
   ncParseAndInterpretString str
@@ -198,7 +197,6 @@ parseAndInterpToString str ==
 
 parseAndEvalStr string ==
   $InteractiveMode :fluid := true
-  $BOOT: fluid := NIL
   $SPAD: fluid := true
   $e:fluid := $InteractiveFrame
   parseAndEvalStr1 string
diff --git a/src/interp/setvars.boot b/src/interp/setvars.boot
index db8ad53d..c131154c 100644
--- a/src/interp/setvars.boot
+++ b/src/interp/setvars.boot
@@ -147,7 +147,6 @@ resetWorkspaceVariables() ==
   SETQ(_/TIMERLIST                  , NIL)
   SETQ($existingFiles               , MAKE_-HASHTABLE 'UEQUAL)
   SETQ($functionTable               , NIL)
-  SETQ($BOOT                        , NIL)
   SETQ($echoLineStack               , NIL)
   SETQ($slamFlag                    , NIL)
   SETQ($CommandSynonymAlist         , COPY($InitialCommandSynonymAlist))
diff --git a/src/interp/spad-parser.boot b/src/interp/spad-parser.boot
index cf45b619..68190dfc 100644
--- a/src/interp/spad-parser.boot
+++ b/src/interp/spad-parser.boot
@@ -54,7 +54,6 @@ namespace BOOT
 ++ ??? finally use the new parser everwhere.
 parseSpadFile sourceFile ==
   $SPAD := true                          -- we are parsing Spad, 
-  $BOOT := false                         --   not Boot.
   SETQ(_*EOF_*, false)                   -- end of current input?
   FILE_-CLOSED : local := false          -- current stream closed?
 
diff --git a/src/interp/spad.lisp b/src/interp/spad.lisp
index ffc41c90..dcc42f3c 100644
--- a/src/interp/spad.lisp
+++ b/src/interp/spad.lisp
@@ -315,20 +315,17 @@
           (SETQ |$postStack| nil)
           (SETQ |$TraceFlag| T)
           (if (NOT X) (RETURN NIL))
-          (setq X (if $BOOT (DEF-RENAME (|new2OldLisp| X))
-                    (|parseTransform| (|postTransform| X))))
+          (setq X (|parseTransform| (|postTransform| X)))
           ;; (if |$TranslateOnly| (RETURN (SETQ |$Translation| X)))
           (when |$postStack| (|displayPreCompilationErrors|) (RETURN NIL))
           (COND (|$PrintOnly|
                  (format t "~S   =====>~%" |$currentLine|)
                  (RETURN (PRETTYPRINT X))))
-          (if (NOT $BOOT)
-              (if |$InteractiveMode|
-                  (|processInteractive| X NIL)
-                (if (setq U (|compTopLevel|      X |$EmptyMode|
-                             |$InteractiveFrame|))
-                    (SETQ |$InteractiveFrame| (third U))))
-            (DEF-PROCESS X))
+	  (if |$InteractiveMode|
+	      (|processInteractive| X NIL)
+	    (if (setq U (|compTopLevel|      X |$EmptyMode|
+			 |$InteractiveFrame|))
+		(SETQ |$InteractiveFrame| (third U))))
           (if |$semanticErrorStack| (|displaySemanticErrors|))
           (TERPRI))))
 
diff --git a/src/interp/sys-driver.boot b/src/interp/sys-driver.boot
index 697928e5..238042d1 100644
--- a/src/interp/sys-driver.boot
+++ b/src/interp/sys-driver.boot
@@ -186,7 +186,6 @@ executeSpadScript(progname,options,file) ==
   initializeInterpreterFrameRing()
   $currentLine := nil
   RESTART0()
-  $BOOT := NIL
   $NEWSPAD := true
   $SPAD := true
   if getOption(Option '"verbose",%systemOptions()) then
@@ -215,7 +214,6 @@ compileSpadLibrary(progname,options,file) ==
   initializeInterpreterFrameRing()
   $currentLine := nil
   RESTART0()
-  $BOOT := NIL
   $NEWSPAD := true
   $SPAD := true
   $EchoLines := false
diff --git a/src/interp/sys-macros.lisp b/src/interp/sys-macros.lisp
index 8d620a5b..120d91a7 100644
--- a/src/interp/sys-macros.lisp
+++ b/src/interp/sys-macros.lisp
@@ -996,7 +996,7 @@
 			     ((EQ OP 'OR)
 			      (LIST (LIST 'UNTIL G)))
 			     (NIL) )))
-	   (RETURN (COND ((AND $NEWSPAD (NULL $BOOT))
+	   (RETURN (COND ((AND $NEWSPAD)
 			  (LIST 'PROGN 
 				PRESET
 				(CONS 'REPEAT 
@@ -1121,7 +1121,7 @@
 	(SETQ U-VARS VL)
 	XT  
 	(RETURN (COND
-		 ((AND $NEWSPAD (NULL $BOOT))
+		 ((AND $NEWSPAD)
 		  (CONS 'SEQ
 			(NCONC (DO_LET VARS INITS)
 			       (LIST 'G190 
diff --git a/src/interp/util.lisp b/src/interp/util.lisp
index 995050f8..18bc4788 100644
--- a/src/interp/util.lisp
+++ b/src/interp/util.lisp
@@ -530,12 +530,11 @@
     (|processSynonyms|))
   (ioclear)
   (LET* ((BOOT-LINE-STACK (LIST (CONS 1 LINE)))
-     ($BOOT NIL)
      ($SPAD T)
      (XTOKENREADER 'GET-BOOT-TOKEN)
      (LINE-HANDLER 'NEXT-BOOT-LINE)
      (PARSEOUT (PROG2 (|PARSE-NewExpr|) (POP-STACK-1))))
-    (DECLARE (SPECIAL BOOT-LINE-STACK $BOOT $SPAD XTOKENREADER LINE-HANDLER))
+    (DECLARE (SPECIAL BOOT-LINE-STACK $SPAD XTOKENREADER LINE-HANDLER))
     PARSEOUT))
author	dos-reis <gdr@axiomatics.org>	2008-07-07 20:20:31 +0000
committer	dos-reis <gdr@axiomatics.org>	2008-07-07 20:20:31 +0000
commit	95ef8592f2efacf43bc943a1df9a9007a46decea (patch)
tree	13d75cae2b038af6095e25087c1e400fc7e06162 /src
parent	3d2601972bcc0cb08da6190d771dcb75544bfe5d (diff)
download	open-axiom-95ef8592f2efacf43bc943a1df9a9007a46decea.tar.gz