* boot/translator.boot (translateToplevelExpression): New.

	(bpOutItem): Use it.
	* boot/ast.boot (needsPROG): New.
	(shoeCompTran): Use it. Tidy.
	(bfMain): Define cache variables before functions manipulating them.
	* boot/strap/: Update cached Lisp translations.
	* interp/g-timer.boot: Use assignment instead of SETANDFILEQ at
	toplevel.
	* interp/i-syscmd.boot: Likewise.
	* interp/pf2atree.boot: Likewise.
	* interp/trace.boot: Likewise.

4 files changed, 24 insertions, 24 deletions

diff --git a/src/interp/g-timer.boot b/src/interp/g-timer.boot
index da55ccc1..ef08a060 100644
--- a/src/interp/g-timer.boot
+++ b/src/interp/g-timer.boot
@@ -146,17 +146,17 @@ stopTimingProcess name ==
   popTimedName()
  
 --% Instrumentation specific to the interpreter
-SETANDFILEQ($oldElapsedSpace, 0)
-SETANDFILEQ($oldElapsedGCTime,0.0)
-SETANDFILEQ($oldElapsedTime,0.0)
-SETANDFILEQ($gcTimeTotal,0.0)
+$oldElapsedSpace := 0
+$oldElapsedGCTime := 0.0
+$oldElapsedTime := 0.0
+$gcTimeTotal := 0.0
  
 -- $timedNameStack is used to hold the names of sections of the
 -- code being timed.
  
-SETANDFILEQ($timedNameStack,'(other))
+$timedNameStack := '(other)
  
-SETANDFILEQ($interpreterTimedNames,'(
+$interpreterTimedNames == '(
 -- name         class abbrev
   (algebra        2 .   B) _
   (analysis       1 .   A) _
@@ -175,15 +175,15 @@ SETANDFILEQ($interpreterTimedNames,'(
   (diskread       3 .   K) _
   (print          3 .   P) _
   (resolve        1 .   R) _
-  ))
+  )
  
-SETANDFILEQ($interpreterTimedClasses, '(
+$interpreterTimedClasses == '(
 -- number class name    short name
   ( 1    interpreter     .  IN) _
   ( 2    evaluation      .  EV) _
   ( 3    other           .  OT) _
   ( 4    reclaim         .  GC) _
-  ))
+  )
  
 initializeTimedNames(listofnames,listofclasses) ==
   for [name,:.] in listofnames repeat
diff --git a/src/interp/i-syscmd.boot b/src/interp/i-syscmd.boot
index c74612b9..07e58001 100644
--- a/src/interp/i-syscmd.boot
+++ b/src/interp/i-syscmd.boot
@@ -1399,14 +1399,14 @@ importFromFrame args ==
 --% )history
 
 ++ vm/370 filename type component
-SETANDFILEQ($historyFileType,'axh)
+$historyFileType := 'axh
 
 ++ vm/370 filename name component
-SETANDFILEQ($oldHistoryFileName,'last)
-SETANDFILEQ($internalHistoryTable,NIL)
+$oldHistoryFileName := 'last
+$internalHistoryTable := NIL
 
 ++ t means keep history in core
-SETANDFILEQ($useInternalHistoryTable, true)
+$useInternalHistoryTable := true
 
 history l ==
   l or null $options => sayKeyedMsg("S2IH0006",NIL) 
diff --git a/src/interp/pf2atree.boot b/src/interp/pf2atree.boot
index 3d09ea46..15c76d23 100644
--- a/src/interp/pf2atree.boot
+++ b/src/interp/pf2atree.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
@@ -39,8 +39,8 @@
 -- technology to the interpreter.  The input is a parseTree and the
 -- output is an interpreter attributed tree.
 
-SETANDFILEQ($useParserSrcPos, true)
-SETANDFILEQ($transferParserSrcPos, true)
+$useParserSrcPos := true
+$transferParserSrcPos := true
 
 pf2Sexpr pf == packageTran (pf2Sex1)(pf)
 
diff --git a/src/interp/trace.boot b/src/interp/trace.boot
index 93999d4f..6289d4ef 100644
--- a/src/interp/trace.boot
+++ b/src/interp/trace.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
@@ -40,15 +40,15 @@ import '"debug"
 -- This code supports the )trace system command and allows the
 -- tracing of LISP, BOOT and SPAD functions and interpreter maps.
 
-SETANDFILEQ($traceNoisely,NIL)  -- give trace and untrace messages
+$traceNoisely := NIL  -- give trace and untrace messages
 
-SETANDFILEQ($reportSpadTrace,NIL)  -- reports traced funs
+$reportSpadTrace := NIL  -- reports traced funs
 
-SETANDFILEQ($optionAlist,NIL)
+$optionAlist := NIL
 
-SETANDFILEQ($tracedMapSignatures, NIL)
+$tracedMapSignatures := NIL
 
-SETANDFILEQ($traceOptionList,'(
+$traceOptionList == '(
     after _
     before _
     break_
@@ -67,10 +67,10 @@ SETANDFILEQ($traceOptionList,'(
     varbreak _
     vars_
     within _
-    ))
+    )
 
 
-SETANDFILEQ($lastUntraced,NIL)
+$lastUntraced := NIL
 
 trace l == traceSpad2Cmd l