* Makefile.pamphlet (record.$(FASLEXT)): New rule.

	(newfort.$(FASLEXT)): Likewise.
	(<<record.clisp>>): Remove.
	(<<newfort.clisp>>): Likewise.
	* newfort.boot.pamphlet: Push into package "BOOT".

5 files changed, 54 insertions, 81 deletions

diff --git a/src/interp/ChangeLog b/src/interp/ChangeLog
index 7be876a1..a3bf75ef 100644
--- a/src/interp/ChangeLog
+++ b/src/interp/ChangeLog
@@ -1,3 +1,11 @@
+2007-11-04  Gabriel Dos Reis  <gdr@cs.tamu.edu>
+
+	* Makefile.pamphlet (record.$(FASLEXT)): New rule.
+	(newfort.$(FASLEXT)): Likewise.
+	(<<record.clisp>>): Remove.
+	(<<newfort.clisp>>): Likewise.
+	* newfort.boot.pamphlet: Push into package "BOOT".
+
 2007-11-02  Gabriel Dos Reis  <gdr@cs.tamu.edu>
 
 	* Makefile.pamphlet (database.$(FASLEXT)): New rule.
diff --git a/src/interp/Makefile.in b/src/interp/Makefile.in
index 21e0258b..f928bbe0 100644
--- a/src/interp/Makefile.in
+++ b/src/interp/Makefile.in
@@ -451,6 +451,9 @@ format.$(FASLEXT): format.boot macros.$(FASLEXT)
 match.$(FASLEXT): match.boot sys-macros.$(FASLEXT)
 	$(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
 
+record.$(FASLEXT): record.boot nlib.$(FASLEXT) pathname.$(FASLEXT)
+	$(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
+
 ## OpenAxiom's compiler
 
 define.$(FASLEXT): define.boot cattable.$(FASLEXT) category.$(FASLEXT) \
@@ -476,6 +479,9 @@ compat.$(FASLEXT): compat.boot pathname.$(FASLEXT)
 simpbool.$(FASLEXT): simpbool.boot macros.$(FASLEXT)
 	$(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
 
+newfort.$(FASLEXT): newfort.boot macros.$(FASLEXT)
+	$(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
+
 ## Interface with the Aldor compiler.
 ax.$(FASLEXT): ax.boot as.$(FASLEXT)
 	$(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
@@ -768,10 +774,6 @@ msgdb.clisp: msgdb.boot
 	@ echo 346 making $@ from $<
 	@ echo '(old-boot::boot "msgdb.boot")' | ${DEPSYS}
 
-newfort.clisp: newfort.boot
-	@ echo 349 making $@ from $<
-	@ echo '(old-boot::boot "newfort.boot")' | ${DEPSYS}
-
 nruncomp.clisp: nruncomp.boot
 	@ echo 353 making $@ from $<
 	@ echo '(old-boot::boot "nruncomp.boot")' | ${DEPSYS}
@@ -792,10 +794,6 @@ nrunopt.clisp: nrunopt.boot
 	@ echo 365 making $@ from $<
 	@ echo '(old-boot::boot "nrunopt.boot")' | ${DEPSYS}
 
-record.clisp: record.boot
-	@ echo 447 making $@ $<
-	@ echo '(old-boot::boot "record.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 2f69125e..fa092a7a 100644
--- a/src/interp/Makefile.pamphlet
+++ b/src/interp/Makefile.pamphlet
@@ -1261,14 +1261,6 @@ msgdb.clisp: msgdb.boot
 	@ echo '(old-boot::boot "msgdb.boot")' | ${DEPSYS}
 @
 
-\subsection{newfort.boot}
-
-<<newfort.clisp>>=
-newfort.clisp: newfort.boot
-	@ echo 349 making $@ from $<
-	@ echo '(old-boot::boot "newfort.boot")' | ${DEPSYS}
-@
-
 \subsection{nruncomp.boot}
 
 <<nruncomp.clisp>>=
@@ -1327,14 +1319,6 @@ setvart.clisp: setvart.boot
 	@ echo '(old-boot::boot "setvart.boot")' | ${DEPSYS}
 @
 
-\subsection{record.boot}
-
-<<record.clisp>>=
-record.clisp: record.boot
-	@ echo 447 making $@ $<
-	@ echo '(old-boot::boot "record.boot")' | ${DEPSYS}
-@
-
 \subsection{br-con.boot}
 
 <<br-con.clisp>>=
@@ -1542,6 +1526,9 @@ format.$(FASLEXT): format.boot macros.$(FASLEXT)
 match.$(FASLEXT): match.boot sys-macros.$(FASLEXT)
 	$(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
 
+record.$(FASLEXT): record.boot nlib.$(FASLEXT) pathname.$(FASLEXT)
+	$(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
+
 ## OpenAxiom's compiler
 
 define.$(FASLEXT): define.boot cattable.$(FASLEXT) category.$(FASLEXT) \
@@ -1567,6 +1554,9 @@ compat.$(FASLEXT): compat.boot pathname.$(FASLEXT)
 simpbool.$(FASLEXT): simpbool.boot macros.$(FASLEXT)
 	$(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
 
+newfort.$(FASLEXT): newfort.boot macros.$(FASLEXT)
+	$(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
+
 ## Interface with the Aldor compiler.
 ax.$(FASLEXT): ax.boot as.$(FASLEXT)
 	$(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
@@ -1801,8 +1791,6 @@ boot-pkg.$(FASLEXT): boot-pkg.lisp
 
 <<msgdb.clisp>>
 
-<<newfort.clisp>>
-
 <<nruncomp.clisp>>
 
 <<nrunfast.clisp>>
@@ -1813,8 +1801,6 @@ boot-pkg.$(FASLEXT): boot-pkg.lisp
 
 <<nrunopt.clisp>>
 
-<<record.clisp>>
-
 <<setvart.clisp>>
 
 <<warm.data.stanza>>
diff --git a/src/interp/newfort.boot.pamphlet b/src/interp/newfort.boot.pamphlet
index b5720292..dea2a580 100644
--- a/src/interp/newfort.boot.pamphlet
+++ b/src/interp/newfort.boot.pamphlet
@@ -46,6 +46,9 @@
 <<*>>=
 <<license>>
 
+import '"macros"
+)package "BOOT"
+
 --% Translation of Expression to FORTRAN
 assignment2Fortran1(name,e) ==
   $fortError : fluid := nil
@@ -582,7 +585,7 @@ indentFortLevel(i) ==
   $maximumFortranExpressionLength := $maximumFortranExpressionLength -2*i
   $fortIndent := $fortIndent + 2*i
 
-changeExprLength(i) ==>
+changeExprLength(i) ==
   $maximumFortranExpressionLength := $maximumFortranExpressionLength + i
 
 fortFormatDo(var,lo,hi,incr,lab) ==
@@ -681,7 +684,7 @@ nameLen n ==>
  +/[1+LENGTH(u) for u in n]
 
 fortFormatTypes(typeName,names) ==
-  null names => return()
+  null names => return nil
   $fortError : fluid := nil
   $fortranSegment : fluid := nil
   $fortInts2Floats : fluid := nil
@@ -729,7 +732,7 @@ fortFormatCharacterTypes(names) ==
 
 fortFormatIntrinsics(l) ==
   $fortError : fluid := nil
-  null l => return()
+  null l => return nil
   displayLines fortran2Lines ['"INTRINSIC ",:addCommas(l)]
   
  
diff --git a/src/interp/record.boot.pamphlet b/src/interp/record.boot
index f716f545..25131364 100644
--- a/src/interp/record.boot.pamphlet
+++ b/src/interp/record.boot
@@ -1,40 +1,3 @@
-\documentclass{article}
-\usepackage{axiom}
-
-\title{\File{src/interp/record.boot} Pamphlet}
-\author{The Axiom Team}
-
-\begin{document}
-\maketitle
-\begin{abstract}
-\end{abstract}
-\eject
-\tableofcontents
-\eject
-\begin{verbatim}
-                        Usage
-
-)bo inputFile2RecordFile('"<idir>fn.input",'"<odir>a.b")
-  converts input file "fn" to a record file stored at "<odir>fn.record".
-  If you give one argument, <idir> is used for <odir>
-
-)bo htFile2RecordFile('"<idir>fn.ht",'"<odir>a.b")
-   converts HT file "fn" to a record file stored at "<odir>fn.record".
-   If you give one argument, record file goes to "<idir>fn.record".
-   A file "<odir>fn.input" is produced as a side-effect.
-
-)bo htFile2InputFile('"<idir>fn.input",'"<odir>a.b")
-   converts input file "fn" to an input file stored at "<odir>fn.input"
-
-)bo printRecordFile('"<idir>fn.record") to display results recorded
-
-)bo verifyRecordFile('"<idir>fn.record") to verfiy that same output
-   results from running original fn.input file
-\end{verbatim}
-
-\section{License}
-
-<<license>>=
 -- Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd.
 -- All rights reserved.
 --
@@ -66,9 +29,30 @@
 -- NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 -- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-@
-<<*>>=
-<<license>>
+
+--                         Usage
+
+-- )bo inputFile2RecordFile('"<idir>fn.input",'"<odir>a.b")
+--   converts input file "fn" to a record file stored at "<odir>fn.record".
+--   If you give one argument, <idir> is used for <odir>
+
+-- )bo htFile2RecordFile('"<idir>fn.ht",'"<odir>a.b")
+--    converts HT file "fn" to a record file stored at "<odir>fn.record".
+--    If you give one argument, record file goes to "<idir>fn.record".
+--    A file "<odir>fn.input" is produced as a side-effect.
+
+-- )bo htFile2InputFile('"<idir>fn.input",'"<odir>a.b")
+--    converts input file "fn" to an input file stored at "<odir>fn.input"
+
+-- )bo printRecordFile('"<idir>fn.record") to display results recorded
+
+-- )bo verifyRecordFile('"<idir>fn.record") to verfiy that same output
+--    results from running original fn.input file
+
+
+import '"nlib"
+import '"pathname"
+)package "BOOT"
 
 --=======================================================================
 --                      Global Variables
@@ -95,7 +79,7 @@ inputFile2RecordFile(pathname,:option) ==
   opath := KAR option or pathname
   odirect := pathnameDirectory opath
   opathname := htMkPath(odirect,ifn,'"rec")
-  _*PRINT_-ARRAY_*: local := true
+  SETQ(_*PRINT_-ARRAY_*, true)
   $mkTestFlag: local := true
   $runTestFlag: local := false
   $mkTestInputStack: local := nil
@@ -119,7 +103,7 @@ printRecordFile(pathname,:option) ==
   stream := DEFIOSTREAM([['FILE,:pathname], '(MODE . INPUT)],80,0)
   repeat
     NULL (PEEK_-CHAR ( true, stream , nil, nil )) => return nil
-    [i,t,:o] := dewritify READ stream
+    [i,t,:o] := dewritify VMREAD stream
     sayNewLine()
     for x in i repeat sayBrightly x
     sayNewLine()
@@ -166,11 +150,11 @@ verifyRecordFile(pathname) ==
   result := 'ok
   for j in 1.. repeat
     NULL (PEEK_-CHAR ( true, stream ,nil,nil ))=>return nil
-    [i,t,:o] := dewritify READ stream
+    [i,t,:o] := dewritify VMREAD stream
     null i => return nil
     t = 'ForSystemCommands => 
       return testInput2Output(i,nil)  
-	--read trailing system commands
+        --read trailing system commands
     [typ,:output] := testInput2Output(i,j)
     typ = t =>
       output = o => 'ok
@@ -292,9 +276,3 @@ recordAndPrintTest md ==  --called by recordAndPrint
   $mkTestOutputStack := nil
  
  
-@
-\eject
-\begin{thebibliography}{99}
-\bibitem{1} nothing
-\end{thebibliography}
-\end{document}