* Makefile.pamphlet (<<server.clisp>>): Remove.

	(server.$(FASLEXT)): New rule.
	* as.boot.pamphlet (asytran): Use VMREAD.
	* c-util.boot.pamphlet (intersectionContour): Use assoc.
	* g-error.boot.pamphlet (argumentDataError): Use read_-line.
	* g-opt.boot.pamphlet: Use assoc.
	* ht-util.boot.pamphlet: Likewise.
	* htsertvar.boot.pamphlet: Likewise.
	* server.boot.pamphlet: User read_-line.

10 files changed, 35 insertions, 30 deletions

diff --git a/src/interp/ChangeLog b/src/interp/ChangeLog
index 53530f5f..a609d474 100644
--- a/src/interp/ChangeLog
+++ b/src/interp/ChangeLog
@@ -1,3 +1,16 @@
+2007-10-15  Gabriel Dos Reis  <gdr@cs.tamu.edu>
+
+
+	* Makefile.pamphlet (<<server.clisp>>): Remove.
+	(server.$(FASLEXT)): New rule.
+	* as.boot.pamphlet (asytran): Use VMREAD.
+	* c-util.boot.pamphlet (intersectionContour): Use assoc.
+	* g-error.boot.pamphlet (argumentDataError): Use read_-line.
+	* g-opt.boot.pamphlet: Use assoc.
+	* ht-util.boot.pamphlet: Likewise.
+	* htsertvar.boot.pamphlet: Likewise.
+	* server.boot.pamphlet: User read_-line.
+
 2007-10-14  Gabriel Dos Reis  <gdr@cs.tamu.edu>
 
 	* macros.lisp (SETANDFILE): Use defparameter, not setq.
diff --git a/src/interp/Makefile.in b/src/interp/Makefile.in
index fb5347da..68d89f86 100644
--- a/src/interp/Makefile.in
+++ b/src/interp/Makefile.in
@@ -445,6 +445,8 @@ ax.$(FASLEXT): ax.boot as.$(FASLEXT)
 as.$(FASLEXT): as.boot macros.$(FASLEXT)
 	$(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
 
+server.$(FASLEXT): server.boot macros.$(FASLEXT)
+	$(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
 
 ##
 ## OpenAxiom's front-end consists of two parts:
@@ -786,10 +788,6 @@ record.clisp: record.boot
 	@ echo 447 making $@ $<
 	@ echo '(old-boot::boot "record.boot")' | ${DEPSYS}
 
-server.clisp: server.boot
-	@ echo 391 making $@ from $<
-	@ echo '(old-boot::boot "server.boot")' | ${DEPSYS}
-
 setvart.clisp: setvart.boot
 	@ echo 398 making $@ from $<
 	@ echo '(old-boot::boot "setvart.boot")' | ${DEPSYS}
diff --git a/src/interp/Makefile.pamphlet b/src/interp/Makefile.pamphlet
index ccc23091..8abc606d 100644
--- a/src/interp/Makefile.pamphlet
+++ b/src/interp/Makefile.pamphlet
@@ -1402,15 +1402,6 @@ if these two things are done then a DEPSYS image can be bootstrapped
 to a new platform.
 \end{verbatim}
 
-\subsection{server.boot}
-
-<<server.clisp>>=
-server.clisp: server.boot
-	@ echo 391 making $@ from $<
-	@ echo '(old-boot::boot "server.boot")' | ${DEPSYS}
-@
-
-
 \subsection{setvart.boot}
 
 <<setvart.clisp>>=
@@ -1629,6 +1620,8 @@ ax.$(FASLEXT): ax.boot as.$(FASLEXT)
 as.$(FASLEXT): as.boot macros.$(FASLEXT)
 	$(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
 
+server.$(FASLEXT): server.boot macros.$(FASLEXT)
+	$(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
 
 ##
 ## OpenAxiom's front-end consists of two parts:
@@ -1881,8 +1874,6 @@ boot-pkg.$(FASLEXT): boot-pkg.lisp
 
 <<record.clisp>>
 
-<<server.clisp>>
-
 <<setvart.clisp>>
 
 <<warm.data.stanza>>
diff --git a/src/interp/as.boot.pamphlet b/src/interp/as.boot.pamphlet
index d7a4cdc1..1d4849e2 100644
--- a/src/interp/as.boot.pamphlet
+++ b/src/interp/as.boot.pamphlet
@@ -449,7 +449,7 @@ asytran fn ==
 --    <sig pred origin         exposed? comments>
   inStream := OPEN fn
   sayBrightly ['"   Reading ",fn]
-  u := READ inStream
+  u := VMREAD inStream
   $niladics := mkNiladics u
   for x in $niladics repeat PUT(x,'NILADIC,true)
   for d in u repeat
diff --git a/src/interp/c-util.boot.pamphlet b/src/interp/c-util.boot.pamphlet
index 63808037..6bc3f726 100644
--- a/src/interp/c-util.boot.pamphlet
+++ b/src/interp/c-util.boot.pamphlet
@@ -196,7 +196,7 @@ intersectionContour(c,c') ==
       [[x,:mp] for x in varlist | (mp:= modeCompare(LASSOC(x,c),LASSOC(x,c')))]
     compare(pair is [prop,:val],p') ==
       --1. if the property-value pair are identical, accept it immediately
-      pair=(pair':= ASSOC(prop,p')) => pair
+      pair=(pair':= assoc(prop,p')) => pair
       --2. if property="value" and modes are unifiable, give intersection
       --       property="value" but value=genSomeVariable)()
       (val':= KDR pair') and prop="value" and
diff --git a/src/interp/g-error.boot.pamphlet b/src/interp/g-error.boot.pamphlet
index 08ecc434..35cd7ebb 100644
--- a/src/interp/g-error.boot.pamphlet
+++ b/src/interp/g-error.boot.pamphlet
@@ -85,7 +85,7 @@ argumentDataError(argnum, condit, funname) ==
 queryUser msg ==
   -- display message and return reply
   sayBrightly msg
-  READ_-LINE _*TERMINAL_-IO_*
+  read_-line _*TERMINAL_-IO_*
 
 -- errorSupervisor is the old style error message trapper
 
diff --git a/src/interp/g-opt.boot.pamphlet b/src/interp/g-opt.boot.pamphlet
index cb16c275..f45a5378 100644
--- a/src/interp/g-opt.boot.pamphlet
+++ b/src/interp/g-opt.boot.pamphlet
@@ -273,7 +273,7 @@ EqualBarGensym(x,y) ==
     fn(x,y) ==
       x=y => true
       GENSYMP x and GENSYMP y =>
-        z:= ASSOC(x,$GensymAssoc) => (y=rest z => true; false)
+        z:= assoc(x,$GensymAssoc) => (y=rest z => true; false)
         $GensymAssoc:= [[x,:y],:$GensymAssoc]
         true
       null x => y is [g] and GENSYMP g
diff --git a/src/interp/ht-util.boot.pamphlet b/src/interp/ht-util.boot.pamphlet
index 3c7cbf73..4e5de6aa 100644
--- a/src/interp/ht-util.boot.pamphlet
+++ b/src/interp/ht-util.boot.pamphlet
@@ -125,7 +125,7 @@ htpProperty(htPage, propName) ==
   LASSOC(propName, ELT(htPage, 6))
 
 htpSetProperty(htPage, propName, val) ==
-  pair := ASSOC(propName, ELT(htPage, 6))
+  pair := assoc(propName, ELT(htPage, 6))
   pair => RPLACD(pair, val)
   SETELT(htPage, 6, [[propName, :val], :ELT(htPage, 6)])
 
diff --git a/src/interp/htsetvar.boot.pamphlet b/src/interp/htsetvar.boot.pamphlet
index 4cf78735..f1b38f7d 100644
--- a/src/interp/htsetvar.boot.pamphlet
+++ b/src/interp/htsetvar.boot.pamphlet
@@ -115,7 +115,7 @@ listOfStrings2String u ==
 htShowSetPage(htPage, branch) ==
   setTree := htpProperty(htPage, 'setTree)
   $path := [branch,:TAKE(- LASTATOM setTree,$path)]
-  setData := ASSOC(branch, setTree)
+  setData := assoc(branch, setTree)
   null setData =>
     systemError('"No Set Data")
   st := setData.setType
diff --git a/src/interp/server.boot.pamphlet b/src/interp/server.boot.pamphlet
index 3af5ccdb..ae0bfcc1 100644
--- a/src/interp/server.boot.pamphlet
+++ b/src/interp/server.boot.pamphlet
@@ -46,22 +46,25 @@
 <<*>>=
 <<license>>
 
+import '"macros"
+)package "BOOT"
+
 -- Scratchpad-II server
 
 -- Assoc list of interpreter frame names and unique integer identifiers
 
-SETANDFILEQ($frameAlist, nil)
-SETANDFILEQ($frameNumber, 0)
-SETANDFILEQ($currentFrameNum, 0)
-SETANDFILEQ($EndServerSession, false)
-SETANDFILEQ($NeedToSignalSessionManager, false)
-SETANDFILEQ($sockBufferLength, 9217)
+$frameAlist := nil
+$frameNumber := 0
+$currentFrameNum := 0
+$EndServerSession := false
+$NeedToSignalSessionManager := false
+$sockBufferLength := 9217
 
 serverReadLine(stream) ==
 -- used in place of READ-LINE in a scratchpad server system.
   FORCE_-OUTPUT()
   not $SpadServer or not IS_-CONSOLE stream =>
-    READ_-LINE(stream)
+    read_-line(stream)
   IN_-STREAM: fluid := stream
   _*EOF_*: fluid := NIL
   line :=
@@ -71,7 +74,7 @@ serverReadLine(stream) ==
     $NeedToSignalSessionManager := false
     action := serverSwitch()
     action = $CallInterp =>
-      l := READ_-LINE(stream)
+      l := read_-line(stream)
       $NeedToSignalSessionManager := true
       return l
     action = $CreateFrame =>
@@ -144,7 +147,7 @@ serverLoop() ==
     action := serverSwitch()
     action = $CallInterp =>
       CATCH('coerceFailure,CATCH('top__level, CATCH('SPAD__READER,
-        parseAndInterpret READ_-LINE(CURINSTREAM) )))
+        parseAndInterpret read_-line(CURINSTREAM) )))
       PRINC MKPROMPT()
       FINISH_-OUTPUT()
       sockSendInt($SessionManager, $EndOfOutput)