* Makefile.pamphlet (i-toplev.$(FASLEXT)): New rule.

	(i-syscmd.$(FASLEXT)): Likewise.
	(i-spec2.$(FASLEXT)): Likewise.
	(i-spec1.$(FASLEXT)): Likewise.
	(i-funsel.$(FASLEXT)): Likewise.
	(i-map.$(FASLEXT)): Likewise.
	(i-eval.$(FASLEXT)): Likewise.
	(i-coerfn.$(FASLEXT)): Likewise.
	(i-coerce.$(FASLEXT)): Likewise.
	(i-resolv.$(FASLEXT)): Likewise.
	(i-analy.$(FASLEXT)): Likewise.
	(i-code.$(FASLEXT)): Likewise.
	(i-intern.$(FASLEXT)): Likewise.
	(<<i-analy.clisp>>): Remove.
	(<<i-code.clisp>>): Likewise.
	(<<i-coerce.clisp>>): Likewise.
	(<<i-coerfn.clisp>>): Likewise.
	(<<i-eval.clisp>>): Likewise.
	(<<i-funsel.clisp>>): Likewise.
	(<<i-intern.clisp>>): Likewise.
	(<<i-map.clisp>>): Likewise.
	(<<i-resolv.clisp>>): Likewise.
	(<<i-spec1.clisp>>): Likewise.
	(<<i-spec2.clisp>>): Likewise.
	(<<i-syscmd.clisp>>): Likewise.
	(<<i-toplev.clisp>>): Likewise.
	(<<i-util.clisp>>): Likewise.
	* apply.boot (compFormWithModemap): Fix syntax.
	* i-analy.boot.pamphlet: Push into package "BOOT".
	* i-code.boot.pamphlet: Likewise.
	* i-coerce.boot.pamphlet: Likewise.
	* i-coerfn.boot.pamphlet: Likewise.
	* i-eval.boot.pamphlet: Likewise.
	* i-funsel.boot.pamphlet: Likewise.
	* i-intern.boot.pamphlet: Likewise.
	* i-map.boot.pamphlet: Likewise.
	* i-resolv.boot.pamphlet: Likewise.
	* i-spec1.boot.pamphlet: Likewise.
	* i-spec2.boot.pamphlet: Likewise.
	* i-syscmd.bot.pamphlet: Likewise.
	* i-toplev.boot.pamphlet: Likewise.
	* i-util.boot.pamphlet: Likewise.

1 files changed, 96 insertions, 19 deletions

diff --git a/src/interp/i-syscmd.boot.pamphlet b/src/interp/i-syscmd.boot.pamphlet
index 8bffe842..37eb1209 100644
--- a/src/interp/i-syscmd.boot.pamphlet
+++ b/src/interp/i-syscmd.boot.pamphlet
@@ -128,17 +128,22 @@ This will have to be pushed down from the top level Makefile.
 <<*>>=
 <<license>>
 
+import '"i-object"
+)package "BOOT"
+
 --% Utility Variable Initializations
 
-SETANDFILEQ($cacheAlist,nil)
-SETANDFILEQ($compileRecurrence,true)
-SETANDFILEQ($errorReportLevel,'warning)
-SETANDFILEQ($sourceFileTypes,'(INPUT SPAD BOOT LISP LISP370 META))
+$cacheAlist := nil
+$compileRecurrence := true
+$errorReportLevel := 'warning
+$sourceFileTypes := '(INPUT SPAD BOOT LISP LISP370 META)
+
+$SYSCOMMANDS := [CAR x for x in $systemCommands]
 
-SETANDFILEQ($SYSCOMMANDS,[CAR x for x in $systemCommands])
+UNDERBAR == '"__"
 
 
-SETANDFILEQ($whatOptions, '( _
+$whatOptions := '( _
     operations _
     categories _
     domains _
@@ -146,17 +151,17 @@ SETANDFILEQ($whatOptions, '( _
     commands _
     synonyms _
     things _
-    ))
+    )
 
-SETANDFILEQ($clearOptions, '( _
+$clearOptions := '( _
   modes _
   operations _
   properties _
   types _
   values  _
-  ))
+  )
 
-SETANDFILEQ($displayOptions, '( _
+$displayOptions := '( _
   abbreviations _
   all _
   macros _
@@ -166,9 +171,9 @@ SETANDFILEQ($displayOptions, '( _
   properties _
   types _
   values _
-  ))
+  )
 
-SETANDFILEQ($countAssoc,'( (cache countCache) ))
+$countAssoc := '( (cache countCache) )
 
 --% Top level system command
 
@@ -431,7 +436,7 @@ clearCmdParts(l is [opt,:vl]) ==
     if option='properties and x in imacs and ^(x in pmacs) then
         sayMessage ['"   You cannot clear the definition of the system-defined macro ",
             fixObjectForPrinting x,"."]
-    p1 := ASSOC(x,CAAR $InteractiveFrame) =>
+    p1 := assoc(x,CAAR $InteractiveFrame) =>
       option='properties =>
         if isMap x then
           (lm := get(x,'localModemap,$InteractiveFrame)) =>
@@ -442,7 +447,7 @@ clearCmdParts(l is [opt,:vl]) ==
           recordOldValue(x,prop,CDR p2)
           recordNewValue(x,prop,NIL)
         SETF(CAAR $InteractiveFrame,deleteAssoc(x,CAAR $InteractiveFrame))
-      p2:= ASSOC(option,CDR p1) =>
+      p2:= assoc(option,CDR p1) =>
         recordOldValue(x,option,CDR p2)
         recordNewValue(x,option,NIL)
         RPLACD(p2,NIL)
@@ -846,6 +851,78 @@ copyright () ==
 
 --% )credits -- display credit list
 
+CREDITS := '(
+  "An alphabetical listing of contributors to AXIOM (to October, 2006):"
+  "Cyril Alberga          Roy Adler              Christian Aistleitner"
+  "Richard Anderson       George Andrews"
+  "Henry Baker            Stephen Balzac         Yurij Baransky"
+  "David R. Barton        Gerald Baumgartner     Gilbert Baumslag"
+  "Fred Blair             Vladimir Bondarenko    Mark Botch"
+  "Alexandre Bouyer       Peter A. Broadbery     Martin Brock"
+  "Manuel Bronstein       Florian Bundschuh      Luanne Burns"
+  "William Burge"
+  "Quentin Carpent        Robert Caviness        Bruce Char"
+  "Cheekai Chin           David V. Chudnovsky    Gregory V. Chudnovsky"
+  "Josh Cohen             Christophe Conil       Don Coppersmith"
+  "George Corliss         Robert Corless         Gary Cornell"
+  "Meino Cramer           Claire Di Crescenzo"
+  "Timothy Daly Sr.       Timothy Daly Jr.       James H. Davenport"
+  "Jean Della Dora        Gabriel Dos Reis       Michael Dewar"
+  "Claire DiCrescendo     Sam Dooley             Lionel Ducos"
+  "Martin Dunstan         Brian Dupee            Dominique Duval"
+  "Robert Edwards         Heow Eide-Goodman      Lars Erickson"
+  "Richard Fateman        Bertfried Fauser       Stuart Feldman"
+  "Brian Ford             Albrecht Fortenbacher  George Frances"
+  "Constantine Frangos    Timothy Freeman        Korrinn Fu"
+  "Marc Gaetano           Rudiger Gebauer        Kathy Gerber"
+  "Patricia Gianni        Holger Gollan          Teresa Gomez-Diaz"
+  "Laureano Gonzalez-Vega Stephen Gortler        Johannes Grabmeier"
+  "Matt Grayson           James Griesmer         Vladimir Grinberg"
+  "Oswald Gschnitzer      Jocelyn Guidry"
+  "Steve Hague            Vilya Harvey           Satoshi Hamaguchi"
+  "Martin Hassner         Waldek Hebisch         Ralf Hemmecke"
+  "Henderson              Antoine Hersen"
+  "Pietro Iglio"
+  "Richard Jenks"
+  "Kai Kaminski           Grant Keady            Tony Kennedy"
+  "Paul Kosinski          Klaus Kusche           Bernhard Kutzler"
+  "Larry Lambe            Frederic Lehobey       Michel Levaud"
+  "Howard Levy            Rudiger Loos           Michael Lucks"
+  "Richard Luczak"
+  "Camm Maguire           Bob McElrath           Michael McGettrick"
+  "Ian Meikle             David Mentre           Victor S. Miller"
+  "Gerard Milmeister      Mohammed Mobarak       H. Michael Moeller"
+  "Michael Monagan        Marc Moreno-Maza       Scott Morrison"
+  "Mark Murray"
+  "William Naylor         C. Andrew Neff         John Nelder"
+  "Godfrey Nolan          Arthur Norman          Jinzhong Niu"
+  "Michael O'Connor       Kostas Oikonomou"
+  "Julian A. Padget       Bill Page              Susan Pelzel"
+  "Michel Petitot         Didier Pinchon         Jose Alfredo Portes"
+  "Claude Quitte"
+  "Norman Ramsey          Michael Richardson     Renaud Rioboo"
+  "Jean Rivlin            Nicolas Robidoux       Simon Robinson"
+  "Michael Rothstein      Martin Rubey"
+  "Philip Santas          Alfred Scheerhorn      William Schelter"
+  "Gerhard Schneider      Martin Schoenert       Marshall Schor"
+  "Frithjof Schulze       Fritz Schwarz          Nick Simicich"
+  "William Sit            Elena Smirnova         Jonathan Steinbach"
+  "Christine Sundaresan   Robert Sutor           Moss E. Sweedler"
+  "Eugene Surowitz"
+  "James Thatcher         Balbir Thomas          Mike Thomas"
+  "Dylan Thurston         Barry Trager           Themos T. Tsikas"
+  "Gregory Vanuxem"
+  "Bernhard Wall          Stephen Watt           Jaap Weel"
+  "Juergen Weiss          M. Weller              Mark Wegman"
+  "James Wen              Thorsten Werther       Michael Wester"
+  "John M. Wiley          Berhard Will           Clifton J. Williamson"
+  "Stephen Wilson         Shmuel Winograd        Robert Wisbauer"
+  "Sandra Wityak          Waldemar Wiwianka      Knut Wolf"
+  "Clifford Yapp          David Yun"
+  "Richard Zippel         Evelyn Zoernack        Bruno Zuercher"
+  "Dan Zwillinger"
+ )
+
 credits() ==
  for i in CREDITS repeat
   PRINC(i)
@@ -929,7 +1006,7 @@ getParserMacroNames() ==
 --------------------> NEW DEFINITION (override in patches.lisp.pamphlet)
 clearParserMacro(macro) ==
   -- first see if it is one
-  not IFCDR ASSOC(macro, ($pfMacros)) => NIL
+  not IFCDR assoc(macro, ($pfMacros)) => NIL
   $pfMacros := REMALIST($pfMacros, macro)
 
 displayMacro name ==
@@ -2040,7 +2117,7 @@ dewritify ob ==
                     HPUT($seen, nob, nob)
                     nob
                 type = 'PLACE =>
-                    nob := READ MAKE_-INSTREAM NIL
+                    nob := VMREAD MAKE_-INSTREAM NIL
                     HPUT($seen, ob, nob)
                     HPUT($seen, nob, nob)
                     nob
@@ -2447,7 +2524,7 @@ spool filename ==
     systemError CONCAT('"file ", STRING car filename, '" already exists")
   DRIBBLE car filename
   TERPRI()
-  clearHighlight
+  clearHighlight()
 
 --% )synonym
 
@@ -2530,7 +2607,7 @@ diffAlist(new,old) ==
         acc := [[name,:[[prop] for [prop,:.] in proplist]],:acc]
       deltas := nil
       for (propval := [prop,:val]) in proplist repeat
-        null (oldPropval := ASSOC(prop,oldProplist)) => --missing property
+        null (oldPropval := assoc(prop,oldProplist)) => --missing property
           deltas := [[prop],:deltas]
         EQ(CDR oldPropval,val) => 'skip
         deltas := [oldPropval,:deltas]
@@ -2632,7 +2709,7 @@ undoSingleStep(changes,env) ==
   env
 
 undoLocalModemapHack changeList ==
-  [newPair for (pair := [name,:value]) in changeList | newPair] where newPair  ==
+  [newPair for (pair := [name,:value]) in changeList | newPair] where newPair()  ==
      name = 'localModemap => [name]
      pair