axiom-developer
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Axiom-developer] [build-improvements] src/boot package hell


From: Gabriel Dos Reis
Subject: [Axiom-developer] [build-improvements] src/boot package hell
Date: 18 Nov 2006 04:23:33 -0600

Hi,

  The basic idea of this patch is to push into package boottran when
translating Boot files.  

  Apparently, boottran::boottocl is the most tested function.  It gets
it right.  But other similar translation functions (e.g. the cousine
boottran::boottoclc) do not; therefore the will do incorrect translation.
The faults in the output is failure to recognize Boot-specific
keywords or functions.  For example, before this patch

  * boottocl translates true to T         -- correct
  * boottoclc translates true to |true|   -- incorrect.

The reason is that when the current package is not boottran, the
translaters get hold on inexistant translation tables, which
results in their thinking that some identifiers that are special are
not. 

This patch always push into boottran before doing translation.  I've
also made a list of functions for which the behaviour is defined.

Build and tested on an i686-pc-linux-gnu.

-- Gaby

2006-11-16  Gabriel Dos Reis  <address@hidden>

        * ptyout.boot.pamphlet (BOOTTOCLLINES, BOOTTOMC, BOCLAM,
        STEVAL, STTOMC, PSTOU): Temporarily push
        into package BootTran and default float format to double.
        (BOOTTOCL): Don't do it here.
        (shoeNotFound): Return nil.

*** ptyout.boot.pamphlet        (revision 16896)
--- ptyout.boot.pamphlet        (local)
***************
*** 1,14 ****
  \documentclass{article}
  \usepackage{axiom}
! \begin{document}
  \title{\$SPAD/src/boot ptyout.boot}
  \author{The Axiom Team}
  \maketitle
  \begin{abstract}
  \end{abstract}
  \eject
  \tableofcontents
  \eject
  We assume that we are translating a file called {\bf ``foo.boot''}
  and expect to generate a file called {\bf ``foo.clisp''}.
  
--- 1,42 ----
  \documentclass{article}
  \usepackage{axiom}
! 
  \title{\$SPAD/src/boot ptyout.boot}
  \author{The Axiom Team}
+ 
+ \begin{document}
  \maketitle
+ 
  \begin{abstract}
+ This file implement various Boot translaters.
  \end{abstract}
  \eject
+ 
  \tableofcontents
  \eject
+ 
+ \section{Entry points to this module}
+ 
+ The only entry points to this module are:
+ \begin{itemize}
+ \item [BOOTTOCL]
+ \item [BOOTCLAM]
+ \item [BOOTTOCLC]
+ \item [BOOTTOMC]
+ \item [BOOT]
+ \item [COMPILE-BOOT-FILE]
+ \item [EVAL-BOOT-FILE]
+ \item [BO]
+ \item [BOCLAM]
+ \item [STOUT]
+ \item [STEVAL]
+ \item [STTOMC]
+ \end{itmize}
+ 
+ Calling other functions defined here, from outside of this module,
+ may lead to unpredictable results.  
+ 
+ 
  We assume that we are translating a file called {\bf ``foo.boot''}
  and expect to generate a file called {\bf ``foo.clisp''}.
  
*************** return the string ``foo.clisp PRODUCED''
*** 27,36 ****
  
  <<BOOTTOCLLINES>>= 
  BOOTTOCLLINES(lines, fn)==
     infn:=shoeAddbootIfNec fn
     outfn:=CONCAT(shoeRemovebootIfNec fn,'".clisp")
!    shoeOpenInputFile(a,infn,
!         shoeClLines(a,fn,lines,outfn))
   
  @
  \section{License}
--- 55,69 ----
  
  <<BOOTTOCLLINES>>= 
  BOOTTOCLLINES(lines, fn)==
+    _*READ_-DEFAULT_-FLOAT_-FORMAT_* := 'DOUBLE_-FLOAT
+    callingPackage := PACKAGE_-NAME _*PACKAGE_*
+    IN_-PACKAGE 'BOOTTRAN
     infn:=shoeAddbootIfNec fn
     outfn:=CONCAT(shoeRemovebootIfNec fn,'".clisp")
!    result := shoeOpenInputFile(a,infn,
!                 shoeClLines(a,fn,lines,outfn))
!    IN_-PACKAGE callingPackage
!    result
   
  @
  \section{License}
*************** BOOTTOCLLINES(lines, fn)==
*** 75,86 ****
  -- the common lisp file "filename.clisp"
   
  BOOTTOCL fn ==
-          a:=PACKAGE_-NAME _*PACKAGE_*
-          IN_-PACKAGE 'BOOTTRAN
           $bfClamming:local:=false
-          _*READ_-DEFAULT_-FLOAT_-FORMAT_* := 'DOUBLE_-FLOAT
           BOOTTOCLLINES(nil,fn)
-          IN_-PACKAGE a
   
  -- (bootclam "filename") translates the file "filename.boot" to
  -- the common lisp file "filename.clisp" , producing, for each function
--- 108,115 ----
*************** shoeClLines(a,fn,lines,outfn)==
*** 111,121 ****
  BOOTTOCLC fn==BOOTTOCLCLINES(nil,fn)
   
  BOOTTOCLCLINES(lines, fn)==
    $bfClamming:local:=false
    infn:=shoeAddbootIfNec fn
    outfn:=shoeRemovebootIfNec fn
!   shoeOpenInputFile(a,infn,
!          shoeClCLines(a,fn,lines,CONCAT(outfn,'".clisp")))
   
  shoeClCLines(a,fn,lines,outfn)==
        if null a
--- 140,155 ----
  BOOTTOCLC fn==BOOTTOCLCLINES(nil,fn)
   
  BOOTTOCLCLINES(lines, fn)==
+   callingPackage := PACKAGE_-NAME _*PACKAGE_*
+   IN_-PACKAGE 'BOOTTRAN
    $bfClamming:local:=false
    infn:=shoeAddbootIfNec fn
    outfn:=shoeRemovebootIfNec fn
!   result := shoeOpenInputFile(a,infn,
!                shoeClCLines(a,fn,lines,CONCAT(outfn,'".clisp")))
!   IN_-PACKAGE callingPackage
!   result
!   
   
  shoeClCLines(a,fn,lines,outfn)==
        if null a
*************** shoeClCLines(a,fn,lines,outfn)==
*** 132,141 ****
  -- to machine code and loads it one item at a time
   
  BOOTTOMC fn==
     $bfClamming:local:=false
     $GenVarCounter:local := 0
     infn:=shoeAddbootIfNec fn
!    shoeOpenInputFile(a,infn,shoeMc(a,fn))
   
  shoeMc(a,fn)==
     if null a
--- 166,179 ----
  -- to machine code and loads it one item at a time
   
  BOOTTOMC fn==
+    callingPackage := PACKAGE_-NAME _*PACKAGE_*
+    IN_-PACKAGE 'BOOTTRAN
     $bfClamming:local:=false
     $GenVarCounter:local := 0
     infn:=shoeAddbootIfNec fn
!    result := shoeOpenInputFile(a,infn,shoeMc(a,fn))
!    IN_-PACKAGE callingPackage
!    result
   
  shoeMc(a,fn)==
     if null a
*************** BO fn==
*** 182,191 ****
       IN_-PACKAGE b
   
  BOCLAM fn==
       $GenVarCounter:local := 0
       $bfClamming:local := true
       infn:=shoeAddbootIfNec fn
!      shoeOpenInputFile(a,infn,shoeToConsole(a,fn))
   
  shoeToConsole(a,fn)==
       if null a
--- 220,233 ----
       IN_-PACKAGE b
   
  BOCLAM fn==
+      callingPackage := PACKAGE_-NAME _*PACKAGE_*
+      IN_-PACKAGE 'BOOTTRAN
       $GenVarCounter:local := 0
       $bfClamming:local := true
       infn:=shoeAddbootIfNec fn
!      result := shoeOpenInputFile(a,infn,shoeToConsole(a,fn))
!      IN_-PACKAGE callingPackage
!      result
   
  shoeToConsole(a,fn)==
       if null a
*************** STOUT string==   PSTOUT [string]
*** 203,227 ****
  --   shoeConsoleTrees shoeTransformString [string]
   
  STEVAL string==
     $GenVarCounter:local := 0
     $bfClamming:local:=false
     a:=  shoeTransformString [string]
!    if bStreamPackageNull a
!    then nil
!    else
!     fn:=stripm(CAR a,_*PACKAGE_*,FIND_-PACKAGE '"BOOTTRAN")
!     EVAL fn
   
  -- (sttomc "string") translates the string "string"
  -- to common lisp, and compiles it.
   
  STTOMC string==
     $GenVarCounter:local := 0
     $bfClamming:local:=false
     a:=  shoeTransformString [string]
!    if bStreamPackageNull a
!    then nil
!    else shoePCompile car a
   
   
  shoeCompileTrees s==
--- 245,276 ----
  --   shoeConsoleTrees shoeTransformString [string]
   
  STEVAL string==
+    callingPackage := PACKAGE_-NAME _*PACKAGE_*
+    IN_-PACKAGE 'BOOTTRAN
     $GenVarCounter:local := 0
     $bfClamming:local:=false
     a:=  shoeTransformString [string]
!    result := 
!       bStreamPackageNull a => nil
!       fn:=stripm(CAR a,_*PACKAGE_*,FIND_-PACKAGE '"BOOTTRAN")
!       EVAL fn
!    IN_-PACKAGE callingPACKAGE
!    result
   
  -- (sttomc "string") translates the string "string"
  -- to common lisp, and compiles it.
   
  STTOMC string==
+    callingPackage := PACKAGE_-NAME _*PACKAGE_*
+    IN_-PACKAGE 'BOOTTRAN
     $GenVarCounter:local := 0
     $bfClamming:local:=false
     a:=  shoeTransformString [string]
!    result := 
!       bStreamPackageNull a => nil
!       shoePCompile car a
!    IN_-PACKAGE callingPACKAGE
!    result
   
   
  shoeCompileTrees s==
*************** shoeCompile fn==
*** 234,240 ****
            COMPILE (name,['LAMBDA,bv,:body])
      EVAL fn
   
! shoeNotFound fn==  shoeConsole CONCAT(fn ,'" NOT FOUND")
   
  shoeTransform str==
      bNext(function shoeTreeConstruct,
--- 283,291 ----
            COMPILE (name,['LAMBDA,bv,:body])
      EVAL fn
   
! shoeNotFound fn ==  
!    shoeConsole CONCAT(fn ,'" NOT FOUND")
!    nil
   
  shoeTransform str==
      bNext(function shoeTreeConstruct,
*************** BOOTPO ()==
*** 816,824 ****
      BOOTPO()
   
  PSTOUT string==
     $GenVarCounter:local := 0
     $bfClamming:local:=false
!    shoeConsoleTrees shoeTransformString string
   
  @
  <<ptyout.clisp>>=
--- 867,879 ----
      BOOTPO()
   
  PSTOUT string==
+    callingPackage := PACKAGE_-NAME _*PACKAGE_*
+    IN_-PACKAGE 'BOOTTRAN
     $GenVarCounter:local := 0
     $bfClamming:local:=false
!    result := shoeConsoleTrees shoeTransformString string
!    IN_-PACKAGE callingPackage
!    result
   
  @
  <<ptyout.clisp>>=
*************** PSTOUT string==
*** 826,840 ****
  (IN-PACKAGE 'BOOTTRAN)
  
  (DEFUN BOOTTOCL (|fn|)
!   (PROG (|$bfClamming| |a|)
      (DECLARE (SPECIAL |$bfClamming|))
!     (RETURN
!       (PROGN
!         (SETQ |a| (PACKAGE-NAME *PACKAGE*))
!         (IN-PACKAGE 'BOOTTRAN)
!         (SETQ |$bfClamming| NIL)
!         (BOOTTOCLLINES NIL |fn|)
!         (IN-PACKAGE |a|)))))
  
  (DEFUN BOOTCLAM (|fn|) (PROG () (RETURN (BOOTCLAMLINES NIL |fn|))))
  
--- 881,889 ----
  (IN-PACKAGE 'BOOTTRAN)
  
  (DEFUN BOOTTOCL (|fn|)
!   (PROG (|$bfClamming|)
      (DECLARE (SPECIAL |$bfClamming|))
!     (RETURN (PROGN (SETQ |$bfClamming| NIL) (BOOTTOCLLINES NIL |fn|)))))
  
  (DEFUN BOOTCLAM (|fn|) (PROG () (RETURN (BOOTCLAMLINES NIL |fn|))))
  
*************** PSTOUT string==
*** 845,857 ****
        (PROGN (SETQ |$bfClamming| T) (BOOTTOCLLINES |lines| |fn|)))))
  
  (DEFUN BOOTTOCLLINES (|lines| |fn|)
!   (PROG (|outfn| |infn|)
      (RETURN
        (PROGN
          (SETQ |infn| (|shoeAddbootIfNec| |fn|))
          (SETQ |outfn| (CONCAT (|shoeRemovebootIfNec| |fn|) ".clisp"))
!         (|shoeOpenInputFile| |a| |infn|
!             (|shoeClLines| |a| |fn| |lines| |outfn|))))))
  
  (DEFUN |shoeClLines| (|a| |fn| |lines| |outfn|)
    (PROG (|$GenVarCounter|)
--- 894,913 ----
        (PROGN (SETQ |$bfClamming| T) (BOOTTOCLLINES |lines| |fn|)))))
  
  (DEFUN BOOTTOCLLINES (|lines| |fn|)
!   (PROG (|result| |outfn| |infn| |callingPackage|
!             *READ-DEFAULT-FLOAT-FORMAT*)
      (RETURN
        (PROGN
+         (SETQ *READ-DEFAULT-FLOAT-FORMAT* 'DOUBLE-FLOAT)
+         (SETQ |callingPackage| (PACKAGE-NAME *PACKAGE*))
+         (IN-PACKAGE 'BOOTTRAN)
          (SETQ |infn| (|shoeAddbootIfNec| |fn|))
          (SETQ |outfn| (CONCAT (|shoeRemovebootIfNec| |fn|) ".clisp"))
!         (SETQ |result|
!               (|shoeOpenInputFile| |a| |infn|
!                   (|shoeClLines| |a| |fn| |lines| |outfn|)))
!         (IN-PACKAGE |callingPackage|)
!         |result|))))
  
  (DEFUN |shoeClLines| (|a| |fn| |lines| |outfn|)
    (PROG (|$GenVarCounter|)
*************** PSTOUT string==
*** 877,891 ****
  (DEFUN BOOTTOCLC (|fn|) (PROG () (RETURN (BOOTTOCLCLINES NIL |fn|))))
  
  (DEFUN BOOTTOCLCLINES (|lines| |fn|)
!   (PROG (|$bfClamming| |outfn| |infn|)
      (DECLARE (SPECIAL |$bfClamming|))
      (RETURN
        (PROGN
          (SETQ |$bfClamming| NIL)
          (SETQ |infn| (|shoeAddbootIfNec| |fn|))
          (SETQ |outfn| (|shoeRemovebootIfNec| |fn|))
!         (|shoeOpenInputFile| |a| |infn|
!             (|shoeClCLines| |a| |fn| |lines| (CONCAT |outfn| ".clisp")))))))
  
  (DEFUN |shoeClCLines| (|a| |fn| |lines| |outfn|)
    (PROG (|$GenVarCounter|)
--- 933,953 ----
  (DEFUN BOOTTOCLC (|fn|) (PROG () (RETURN (BOOTTOCLCLINES NIL |fn|))))
  
  (DEFUN BOOTTOCLCLINES (|lines| |fn|)
!   (PROG (|$bfClamming| |result| |outfn| |infn| |callingPackage|)
      (DECLARE (SPECIAL |$bfClamming|))
      (RETURN
        (PROGN
+         (SETQ |callingPackage| (PACKAGE-NAME *PACKAGE*))
+         (IN-PACKAGE 'BOOTTRAN)
          (SETQ |$bfClamming| NIL)
          (SETQ |infn| (|shoeAddbootIfNec| |fn|))
          (SETQ |outfn| (|shoeRemovebootIfNec| |fn|))
!         (SETQ |result|
!               (|shoeOpenInputFile| |a| |infn|
!                   (|shoeClCLines| |a| |fn| |lines|
!                       (CONCAT |outfn| ".clisp"))))
!         (IN-PACKAGE |callingPackage|)
!         |result|))))
  
  (DEFUN |shoeClCLines| (|a| |fn| |lines| |outfn|)
    (PROG (|$GenVarCounter|)
*************** PSTOUT string==
*** 913,926 ****
           (|shoeConsole| (CONCAT |outfn| " PRODUCED")))))))
  
  (DEFUN BOOTTOMC (|fn|)
!   (PROG (|$GenVarCounter| |$bfClamming| |infn|)
!     (DECLARE (SPECIAL |$bfClamming| |$GenVarCounter|))
      (RETURN
        (PROGN
          (SETQ |$bfClamming| NIL)
          (SETQ |$GenVarCounter| 0)
          (SETQ |infn| (|shoeAddbootIfNec| |fn|))
!         (|shoeOpenInputFile| |a| |infn| (|shoeMc| |a| |fn|))))))
  
  (DEFUN |shoeMc| (|a| |fn|)
    (PROG ()
--- 975,994 ----
           (|shoeConsole| (CONCAT |outfn| " PRODUCED")))))))
  
  (DEFUN BOOTTOMC (|fn|)
!   (PROG (|$GenVarCounter| |$bfClamming| |result| |infn|
!             |callingPackage|)
!     (DECLARE (SPECIAL |$GenVarCounter| |$bfClamming|))
      (RETURN
        (PROGN
+         (SETQ |callingPackage| (PACKAGE-NAME *PACKAGE*))
+         (IN-PACKAGE 'BOOTTRAN)
          (SETQ |$bfClamming| NIL)
          (SETQ |$GenVarCounter| 0)
          (SETQ |infn| (|shoeAddbootIfNec| |fn|))
!         (SETQ |result|
!               (|shoeOpenInputFile| |a| |infn| (|shoeMc| |a| |fn|)))
!         (IN-PACKAGE |callingPackage|)
!         |result|))))
  
  (DEFUN |shoeMc| (|a| |fn|)
    (PROG ()
*************** PSTOUT string==
*** 970,976 ****
  
  (DEFUN BO (|fn|)
    (PROG (|$bfClamming| |$GenVarCounter| |infn| |b|)
!     (DECLARE (SPECIAL |$GenVarCounter| |$bfClamming|))
      (RETURN
        (PROGN
          (SETQ |b| (PACKAGE-NAME *PACKAGE*))
--- 1038,1044 ----
  
  (DEFUN BO (|fn|)
    (PROG (|$bfClamming| |$GenVarCounter| |infn| |b|)
!     (DECLARE (SPECIAL |$bfClamming| |$GenVarCounter|))
      (RETURN
        (PROGN
          (SETQ |b| (PACKAGE-NAME *PACKAGE*))
*************** PSTOUT string==
*** 982,995 ****
          (IN-PACKAGE |b|)))))
  
  (DEFUN BOCLAM (|fn|)
!   (PROG (|$bfClamming| |$GenVarCounter| |infn|)
!     (DECLARE (SPECIAL |$GenVarCounter| |$bfClamming|))
      (RETURN
        (PROGN
          (SETQ |$GenVarCounter| 0)
          (SETQ |$bfClamming| T)
          (SETQ |infn| (|shoeAddbootIfNec| |fn|))
!         (|shoeOpenInputFile| |a| |infn| (|shoeToConsole| |a| |fn|))))))
  
  (DEFUN |shoeToConsole| (|a| |fn|)
    (PROG ()
--- 1050,1070 ----
          (IN-PACKAGE |b|)))))
  
  (DEFUN BOCLAM (|fn|)
!   (PROG (|$bfClamming| |$GenVarCounter| |result| |infn|
!             |callingPackage|)
!     (DECLARE (SPECIAL |$bfClamming| |$GenVarCounter|))
      (RETURN
        (PROGN
+         (SETQ |callingPackage| (PACKAGE-NAME *PACKAGE*))
+         (IN-PACKAGE 'BOOTTRAN)
          (SETQ |$GenVarCounter| 0)
          (SETQ |$bfClamming| T)
          (SETQ |infn| (|shoeAddbootIfNec| |fn|))
!         (SETQ |result|
!               (|shoeOpenInputFile| |a| |infn|
!                   (|shoeToConsole| |a| |fn|)))
!         (IN-PACKAGE |callingPackage|)
!         |result|))))
  
  (DEFUN |shoeToConsole| (|a| |fn|)
    (PROG ()
*************** PSTOUT string==
*** 1005,1036 ****
  (DEFUN STOUT (|string|) (PROG () (RETURN (PSTOUT (LIST |string|)))))
  
  (DEFUN STEVAL (|string|)
!   (PROG (|$bfClamming| |$GenVarCounter| |fn| |a|)
!     (DECLARE (SPECIAL |$GenVarCounter| |$bfClamming|))
      (RETURN
        (PROGN
          (SETQ |$GenVarCounter| 0)
          (SETQ |$bfClamming| NIL)
          (SETQ |a| (|shoeTransformString| (LIST |string|)))
!         (COND
!           ((|bStreamPackageNull| |a|) NIL)
!           ('T
!            (SETQ |fn|
!                  (|stripm| (CAR |a|) *PACKAGE*
!                            (FIND-PACKAGE "BOOTTRAN")))
!            (EVAL |fn|)))))))
  
  (DEFUN STTOMC (|string|)
!   (PROG (|$bfClamming| |$GenVarCounter| |a|)
!     (DECLARE (SPECIAL |$GenVarCounter| |$bfClamming|))
      (RETURN
        (PROGN
          (SETQ |$GenVarCounter| 0)
          (SETQ |$bfClamming| NIL)
          (SETQ |a| (|shoeTransformString| (LIST |string|)))
!         (COND
!           ((|bStreamPackageNull| |a|) NIL)
!           ('T (|shoePCompile| (CAR |a|))))))))
  
  (DEFUN |shoeCompileTrees| (|s|)
    (PROG ()
--- 1080,1123 ----
  (DEFUN STOUT (|string|) (PROG () (RETURN (PSTOUT (LIST |string|)))))
  
  (DEFUN STEVAL (|string|)
!   (PROG (|$bfClamming| |$GenVarCounter| |result| |fn| |a|
!             |callingPackage|)
!     (DECLARE (SPECIAL |$bfClamming| |$GenVarCounter|))
      (RETURN
        (PROGN
+         (SETQ |callingPackage| (PACKAGE-NAME *PACKAGE*))
+         (IN-PACKAGE 'BOOTTRAN)
          (SETQ |$GenVarCounter| 0)
          (SETQ |$bfClamming| NIL)
          (SETQ |a| (|shoeTransformString| (LIST |string|)))
!         (SETQ |result|
!               (COND
!                 ((|bStreamPackageNull| |a|) NIL)
!                 ('T
!                  (PROGN
!                    (SETQ |fn|
!                          (|stripm| (CAR |a|) *PACKAGE*
!                              (FIND-PACKAGE "BOOTTRAN")))
!                    (EVAL |fn|)))))
!         (IN-PACKAGE |callingPACKAGE|)
!         |result|))))
  
  (DEFUN STTOMC (|string|)
!   (PROG (|$bfClamming| |$GenVarCounter| |result| |a| |callingPackage|)
!     (DECLARE (SPECIAL |$bfClamming| |$GenVarCounter|))
      (RETURN
        (PROGN
+         (SETQ |callingPackage| (PACKAGE-NAME *PACKAGE*))
+         (IN-PACKAGE 'BOOTTRAN)
          (SETQ |$GenVarCounter| 0)
          (SETQ |$bfClamming| NIL)
          (SETQ |a| (|shoeTransformString| (LIST |string|)))
!         (SETQ |result|
!               (COND
!                 ((|bStreamPackageNull| |a|) NIL)
!                 ('T (|shoePCompile| (CAR |a|)))))
!         (IN-PACKAGE |callingPACKAGE|)
!         |result|))))
  
  (DEFUN |shoeCompileTrees| (|s|)
    (PROG ()
*************** PSTOUT string==
*** 1062,1068 ****
          ('T (EVAL |fn|))))))
  
  (DEFUN |shoeNotFound| (|fn|)
!   (PROG () (RETURN (|shoeConsole| (CONCAT |fn| " NOT FOUND")))))
  
  (DEFUN |shoeTransform| (|str|)
    (PROG ()
--- 1149,1156 ----
          ('T (EVAL |fn|))))))
  
  (DEFUN |shoeNotFound| (|fn|)
!   (PROG ()
!     (RETURN (PROGN (|shoeConsole| (CONCAT |fn| " NOT FOUND")) NIL))))
  
  (DEFUN |shoeTransform| (|str|)
    (PROG ()
*************** PSTOUT string==
*** 1174,1180 ****
               (SETQ |bfVar#4| (CDR |bfVar#4|))))
           |lines| NIL)
          (|shoeConsole| " ")))))
- 
  (DEFUN |shoeFileLine| (|x| |stream|)
    (PROG () (RETURN (PROGN (WRITE-LINE |x| |stream|) |x|))))
  
--- 1262,1267 ----
*************** PSTOUT string==
*** 1217,1224 ****
  (DEFUN |shoeOutParse| (|stream|)
    (PROG (|$bpParenCount| |$bpCount| |$returns| |$typings| |$wheredefs|
              |$op| |$ttok| |$stok| |$stack| |$inputStream| |found|)
!     (DECLARE (SPECIAL |$stok| |$ttok| |$op| |$wheredefs| |$typings|
!                       |$returns| |$bpCount| |$bpParenCount| |$stack|
                        |$inputStream|))
      (RETURN
        (PROGN
--- 1304,1311 ----
  (DEFUN |shoeOutParse| (|stream|)
    (PROG (|$bpParenCount| |$bpCount| |$returns| |$typings| |$wheredefs|
              |$op| |$ttok| |$stok| |$stack| |$inputStream| |found|)
!     (DECLARE (SPECIAL |$bpParenCount| |$bpCount| |$returns| |$typings|
!                       |$wheredefs| |$op| |$ttok| |$stok| |$stack|
                        |$inputStream|))
      (RETURN
        (PROGN
*************** PSTOUT string==
*** 1338,1345 ****
          ((|bStreamNull| (CAR |z|))
           (COND
             ((|bStreamNull| (CADR |z|)) (LIST '|nullstream|))
!            ('T (CADR |z|))))
!         ('T (CONS (CAAR |z|) (|bAppend| (CDAR |z|) (CADR |z|))))))))
  
  (DEFUN |bMap| (|f| |x|)
    (PROG () (RETURN (|bDelay| #'|bMap1| (LIST |f| |x|)))))
--- 1425,1432 ----
          ((|bStreamNull| (CAR |z|))
           (COND
             ((|bStreamNull| (CADR |z|)) (LIST '|nullstream|))
!            (#0='T (CADR |z|))))
!         (#0# (CONS (CAAR |z|) (|bAppend| (CDAR |z|) (CADR |z|))))))))
  
  (DEFUN |bMap| (|f| |x|)
    (PROG () (RETURN (|bDelay| #'|bMap1| (LIST |f| |x|)))))
*************** PSTOUT string==
*** 1433,1440 ****
  (DEFUN |shoeDfu| (|a| |fn|)
    (PROG (|$bfClamming| |$GenVarCounter| |$bootDefinedTwice| |$bootUsed|
              |$bootDefined| |$lispWordTable| |out|)
!     (DECLARE (SPECIAL |$bootDefined| |$bootUsed| |$bootDefinedTwice|
!                       |$GenVarCounter| |$bfClamming| |$lispWordTable|))
      (RETURN
        (COND
          ((NULL |a|) (|shoeNotFound| |fn|))
--- 1520,1528 ----
  (DEFUN |shoeDfu| (|a| |fn|)
    (PROG (|$bfClamming| |$GenVarCounter| |$bootDefinedTwice| |$bootUsed|
              |$bootDefined| |$lispWordTable| |out|)
!     (DECLARE (SPECIAL |$bfClamming| |$GenVarCounter|
!                       |$bootDefinedTwice| |$bootUsed| |$bootDefined|
!                       |$lispWordTable|))
      (RETURN
        (COND
          ((NULL |a|) (|shoeNotFound| |fn|))
*************** PSTOUT string==
*** 1463,1469 ****
                       ((OR (ATOM |bfVar#5|)
                            (PROGN (SETQ |i| (CAR |bfVar#5|)) NIL))
                        (RETURN (NREVERSE |bfVar#6|)))
!                      ('T
                        (AND (NULL (GETHASH |i| |$bootUsed|))
                             (SETQ |bfVar#6| (CONS |i| |bfVar#6|)))))
                     (SETQ |bfVar#5| (CDR |bfVar#5|))))
--- 1551,1557 ----
                       ((OR (ATOM |bfVar#5|)
                            (PROGN (SETQ |i| (CAR |bfVar#5|)) NIL))
                        (RETURN (NREVERSE |bfVar#6|)))
!                      (#0='T
                        (AND (NULL (GETHASH |i| |$bootUsed|))
                             (SETQ |bfVar#6| (CONS |i| |bfVar#6|)))))
                     (SETQ |bfVar#5| (CDR |bfVar#5|))))
*************** PSTOUT string==
*** 1481,1487 ****
                       ((OR (ATOM |bfVar#7|)
                            (PROGN (SETQ |i| (CAR |bfVar#7|)) NIL))
                        (RETURN (NREVERSE |bfVar#8|)))
!                      ('T
                        (AND (NULL (GETHASH |i| |$bootDefined|))
                             (SETQ |bfVar#8| (CONS |i| |bfVar#8|)))))
                     (SETQ |bfVar#7| (CDR |bfVar#7|))))
--- 1569,1575 ----
                       ((OR (ATOM |bfVar#7|)
                            (PROGN (SETQ |i| (CAR |bfVar#7|)) NIL))
                        (RETURN (NREVERSE |bfVar#8|)))
!                      (#0#
                        (AND (NULL (GETHASH |i| |$bootDefined|))
                             (SETQ |bfVar#8| (CONS |i| |bfVar#8|)))))
                     (SETQ |bfVar#7| (CDR |bfVar#7|))))
*************** PSTOUT string==
*** 1492,1498 ****
                 ((OR (ATOM |bfVar#9|)
                      (PROGN (SETQ |i| (CAR |bfVar#9|)) NIL))
                  (RETURN NIL))
!                ('T
                  (PROGN
                    (SETQ |b| (CONCAT (PNAME |i|) " is used in "))
                    (|bootOutLines| (SSORT (GETHASH |i| |$bootUsed|))
--- 1580,1586 ----
                 ((OR (ATOM |bfVar#9|)
                      (PROGN (SETQ |i| (CAR |bfVar#9|)) NIL))
                  (RETURN NIL))
!                (#0#
                  (PROGN
                    (SETQ |b| (CONCAT (PNAME |i|) " is used in "))
                    (|bootOutLines| (SSORT (GETHASH |i| |$bootUsed|))
*************** PSTOUT string==
*** 1532,1538 ****
                                      (PROGN
                                        (SETQ |bv| (CAR |ISTMP#2|))
                                        (SETQ |body| (CDR |ISTMP#2|))
!                                       'T))))))
                   (LIST |name| (CONS 'LAMBDA (CONS |bv| |body|))))
                  ((AND (CONSP |x|) (EQ (CAR |x|) 'DEFMACRO)
                        (PROGN
--- 1620,1626 ----
                                      (PROGN
                                        (SETQ |bv| (CAR |ISTMP#2|))
                                        (SETQ |body| (CDR |ISTMP#2|))
!                                       #0='T))))))
                   (LIST |name| (CONS 'LAMBDA (CONS |bv| |body|))))
                  ((AND (CONSP |x|) (EQ (CAR |x|) 'DEFMACRO)
                        (PROGN
*************** PSTOUT string==
*** 1545,1551 ****
                                      (PROGN
                                        (SETQ |bv| (CAR |ISTMP#2|))
                                        (SETQ |body| (CDR |ISTMP#2|))
!                                       'T))))))
                   (LIST |name| (CONS 'LAMBDA (CONS |bv| |body|))))
                  ((AND (CONSP |x|) (EQ (CAR |x|) 'EVAL-WHEN)
                        (PROGN
--- 1633,1639 ----
                                      (PROGN
                                        (SETQ |bv| (CAR |ISTMP#2|))
                                        (SETQ |body| (CDR |ISTMP#2|))
!                                       #0#))))))
                   (LIST |name| (CONS 'LAMBDA (CONS |bv| |body|))))
                  ((AND (CONSP |x|) (EQ (CAR |x|) 'EVAL-WHEN)
                        (PROGN
*************** PSTOUT string==
*** 1572,1578 ****
                                               (PROGN
                                                 (SETQ |exp|
                                                  (CAR |ISTMP#5|))
!                                                'T))))))))))))
                   (LIST |id| |exp|))
                  ((AND (CONSP |x|) (EQ (CAR |x|) 'SETQ)
                        (PROGN
--- 1660,1666 ----
                                               (PROGN
                                                 (SETQ |exp|
                                                  (CAR |ISTMP#5|))
!                                                #0#))))))))))))
                   (LIST |id| |exp|))
                  ((AND (CONSP |x|) (EQ (CAR |x|) 'SETQ)
                        (PROGN
*************** PSTOUT string==
*** 1585,1593 ****
                                      (EQ (CDR |ISTMP#2|) NIL)
                                      (PROGN
                                        (SETQ |exp| (CAR |ISTMP#2|))
!                                       'T))))))
                   (LIST |id| |exp|))
!                 ('T (LIST 'TOP-LEVEL |x|))))
          (SETQ |nee| (CAR |LETTMP#1|))
          (SETQ |niens| (CADR |LETTMP#1|))
          (COND
--- 1673,1681 ----
                                      (EQ (CDR |ISTMP#2|) NIL)
                                      (PROGN
                                        (SETQ |exp| (CAR |ISTMP#2|))
!                                       #0#))))))
                   (LIST |id| |exp|))
!                 (#1='T (LIST 'TOP-LEVEL |x|))))
          (SETQ |nee| (CAR |LETTMP#1|))
          (SETQ |niens| (CADR |LETTMP#1|))
          (COND
*************** PSTOUT string==
*** 1595,1601 ****
             (SETQ |$bootDefinedTwice|
                   (COND
                     ((EQ |nee| 'TOP-LEVEL) |$bootDefinedTwice|)
!                    ('T (CONS |nee| |$bootDefinedTwice|)))))
            ('T (HPUT |$bootDefined| |nee| T)))
          (|defuse1| |e| |niens|)
          ((LAMBDA (|bfVar#10| |i|)
--- 1683,1689 ----
             (SETQ |$bootDefinedTwice|
                   (COND
                     ((EQ |nee| 'TOP-LEVEL) |$bootDefinedTwice|)
!                    (#1# (CONS |nee| |$bootDefinedTwice|)))))
            ('T (HPUT |$bootDefined| |nee| T)))
          (|defuse1| |e| |niens|)
          ((LAMBDA (|bfVar#10| |i|)
*************** PSTOUT string==
*** 1623,1630 ****
                      ((MEMQ |y| |e|) |$used|)
                      ((MEMQ |y| |$used|) |$used|)
                      ((|defusebuiltin| |y|) |$used|)
!                     ('T (UNION (LIST |y|) |$used|)))))
!            ('T NIL)))
          ((AND (CONSP |y|) (EQ (CAR |y|) 'LAMBDA)
                (PROGN
                  (SETQ |ISTMP#1| (CDR |y|))
--- 1711,1718 ----
                      ((MEMQ |y| |e|) |$used|)
                      ((MEMQ |y| |$used|) |$used|)
                      ((|defusebuiltin| |y|) |$used|)
!                     (#0='T (UNION (LIST |y|) |$used|)))))
!            (#0# NIL)))
          ((AND (CONSP |y|) (EQ (CAR |y|) 'LAMBDA)
                (PROGN
                  (SETQ |ISTMP#1| (CDR |y|))
*************** PSTOUT string==
*** 1632,1638 ****
                       (PROGN
                         (SETQ |a| (CAR |ISTMP#1|))
                         (SETQ |b| (CDR |ISTMP#1|))
!                        'T))))
           (|defuse1| (APPEND (|unfluidlist| |a|) |e|) |b|))
          ((AND (CONSP |y|) (EQ (CAR |y|) 'PROG)
                (PROGN
--- 1720,1726 ----
                       (PROGN
                         (SETQ |a| (CAR |ISTMP#1|))
                         (SETQ |b| (CDR |ISTMP#1|))
!                        #1='T))))
           (|defuse1| (APPEND (|unfluidlist| |a|) |e|) |b|))
          ((AND (CONSP |y|) (EQ (CAR |y|) 'PROG)
                (PROGN
*************** PSTOUT string==
*** 1641,1647 ****
                       (PROGN
                         (SETQ |a| (CAR |ISTMP#1|))
                         (SETQ |b| (CDR |ISTMP#1|))
!                        'T))))
           (PROGN
             (SETQ |LETTMP#1| (|defSeparate| |a|))
             (SETQ |dol| (CAR |LETTMP#1|))
--- 1729,1735 ----
                       (PROGN
                         (SETQ |a| (CAR |ISTMP#1|))
                         (SETQ |b| (CDR |ISTMP#1|))
!                        #1#))))
           (PROGN
             (SETQ |LETTMP#1| (|defSeparate| |a|))
             (SETQ |dol| (CAR |LETTMP#1|))
*************** PSTOUT string==
*** 1652,1675 ****
                    ((OR (ATOM |bfVar#11|)
                         (PROGN (SETQ |i| (CAR |bfVar#11|)) NIL))
                     (RETURN NIL))
!                   ('T (HPUT |$bootDefined| |i| T)))
                  (SETQ |bfVar#11| (CDR |bfVar#11|))))
              |dol| NIL)
             (|defuse1| (APPEND |ndol| |e|) |b|)))
          ((AND (CONSP |y|) (EQ (CAR |y|) 'QUOTE)
!               (PROGN (SETQ |a| (CDR |y|)) 'T))
           NIL)
          ((AND (CONSP |y|) (EQ (CAR |y|) '+LINE)
!               (PROGN (SETQ |a| (CDR |y|)) 'T))
           NIL)
!         ('T
           ((LAMBDA (|bfVar#12| |i|)
              (LOOP
                (COND
                  ((OR (ATOM |bfVar#12|)
                       (PROGN (SETQ |i| (CAR |bfVar#12|)) NIL))
                   (RETURN NIL))
!                 ('T (|defuse1| |e| |i|)))
                (SETQ |bfVar#12| (CDR |bfVar#12|))))
            |y| NIL))))))
  
--- 1740,1763 ----
                    ((OR (ATOM |bfVar#11|)
                         (PROGN (SETQ |i| (CAR |bfVar#11|)) NIL))
                     (RETURN NIL))
!                   (#2='T (HPUT |$bootDefined| |i| T)))
                  (SETQ |bfVar#11| (CDR |bfVar#11|))))
              |dol| NIL)
             (|defuse1| (APPEND |ndol| |e|) |b|)))
          ((AND (CONSP |y|) (EQ (CAR |y|) 'QUOTE)
!               (PROGN (SETQ |a| (CDR |y|)) #1#))
           NIL)
          ((AND (CONSP |y|) (EQ (CAR |y|) '+LINE)
!               (PROGN (SETQ |a| (CDR |y|)) #1#))
           NIL)
!         (#0#
           ((LAMBDA (|bfVar#12| |i|)
              (LOOP
                (COND
                  ((OR (ATOM |bfVar#12|)
                       (PROGN (SETQ |i| (CAR |bfVar#12|)) NIL))
                   (RETURN NIL))
!                 (#2# (|defuse1| |e| |i|)))
                (SETQ |bfVar#12| (CDR |bfVar#12|))))
            |y| NIL))))))
  
*************** PSTOUT string==
*** 1678,1689 ****
      (RETURN
        (COND
          ((NULL |x|) (LIST NIL NIL))
!         ('T (SETQ |f| (CAR |x|))
           (SETQ |LETTMP#1| (|defSeparate| (CDR |x|)))
           (SETQ |x1| (CAR |LETTMP#1|)) (SETQ |x2| (CADR |LETTMP#1|))
           (COND
             ((|bfBeginsDollar| |f|) (LIST (CONS |f| |x1|) |x2|))
!            ('T (LIST |x1| (CONS |f| |x2|)))))))))
  
  (DEFUN |unfluidlist| (|x|)
    (PROG (|y| |ISTMP#1|)
--- 1766,1777 ----
      (RETURN
        (COND
          ((NULL |x|) (LIST NIL NIL))
!         (#0='T (SETQ |f| (CAR |x|))
           (SETQ |LETTMP#1| (|defSeparate| (CDR |x|)))
           (SETQ |x1| (CAR |LETTMP#1|)) (SETQ |x2| (CADR |LETTMP#1|))
           (COND
             ((|bfBeginsDollar| |f|) (LIST (CONS |f| |x1|) |x2|))
!            (#0# (LIST |x1| (CONS |f| |x2|)))))))))
  
  (DEFUN |unfluidlist| (|x|)
    (PROG (|y| |ISTMP#1|)
*************** PSTOUT string==
*** 1727,1738 ****
      (RETURN
        (COND
          ((NULL |l|) (|shoeFileLine| |s| |outfn|))
!         ('T (SETQ |a| (PNAME (CAR |l|)))
           (COND
             ((< 70 (+ (LENGTH |s|) (LENGTH |a|)))
              (|shoeFileLine| |s| |outfn|)
              (|bootOutLines| |l| |outfn| " "))
!            ('T (|bootOutLines| (CDR |l|) |outfn| (CONCAT |s| " " |a|)))))))))
  
  (DEFUN XREF (|fn|)
    (PROG (|infn|)
--- 1815,1827 ----
      (RETURN
        (COND
          ((NULL |l|) (|shoeFileLine| |s| |outfn|))
!         (#0='T (SETQ |a| (PNAME (CAR |l|)))
           (COND
             ((< 70 (+ (LENGTH |s|) (LENGTH |a|)))
              (|shoeFileLine| |s| |outfn|)
              (|bootOutLines| |l| |outfn| " "))
!            (#0#
!             (|bootOutLines| (CDR |l|) |outfn| (CONCAT |s| " " |a|)))))))))
  
  (DEFUN XREF (|fn|)
    (PROG (|infn|)
*************** PSTOUT string==
*** 1744,1751 ****
  (DEFUN |shoeXref| (|a| |fn|)
    (PROG (|$bfClamming| |$GenVarCounter| |$bootUsed| |$bootDefined|
              |$lispWordTable| |out|)
!     (DECLARE (SPECIAL |$bootDefined| |$bootUsed| |$GenVarCounter|
!                       |$bfClamming| |$lispWordTable|))
      (RETURN
        (COND
          ((NULL |a|) (|shoeNotFound| |fn|))
--- 1833,1840 ----
  (DEFUN |shoeXref| (|a| |fn|)
    (PROG (|$bfClamming| |$GenVarCounter| |$bootUsed| |$bootDefined|
              |$lispWordTable| |out|)
!     (DECLARE (SPECIAL |$bfClamming| |$GenVarCounter| |$bootUsed|
!                       |$bootDefined| |$lispWordTable|))
      (RETURN
        (COND
          ((NULL |a|) (|shoeNotFound| |fn|))
*************** PSTOUT string==
*** 1789,1795 ****
  
  (DEFUN |shoeGeneralFC| (|f| |name| |fn|)
    (PROG (|$GenVarCounter| |$bfClamming| |filename| |a| |infn|)
!     (DECLARE (SPECIAL |$bfClamming| |$GenVarCounter|))
      (RETURN
        (PROGN
          (SETQ |$bfClamming| NIL)
--- 1878,1884 ----
  
  (DEFUN |shoeGeneralFC| (|f| |name| |fn|)
    (PROG (|$GenVarCounter| |$bfClamming| |filename| |a| |infn|)
!     (DECLARE (SPECIAL |$GenVarCounter| |$bfClamming|))
      (RETURN
        (PROGN
          (SETQ |$bfClamming| NIL)
*************** PSTOUT string==
*** 1868,1874 ****
      (RETURN
        (COND
          ((NULL |a|) (|shoeNotFound| |fn|) NIL)
!         ('T
           (SETQ |LETTMP#1|
                 (|shoePackageStartsAt| NIL (LENGTH |name|) |name|
                     (|shoeInclude|
--- 1957,1963 ----
      (RETURN
        (COND
          ((NULL |a|) (|shoeNotFound| |fn|) NIL)
!         (#0='T
           (SETQ |LETTMP#1|
                 (|shoePackageStartsAt| NIL (LENGTH |name|) |name|
                     (|shoeInclude|
*************** PSTOUT string==
*** 1878,1884 ****
           (COND
             ((|bStreamNull| |b|)
              (|shoeConsole| (CONCAT |name| " not found in " |fn|)) NIL)
!            ('T
              (COND
                ((NULL |lines|) (|shoeConsole| ")package not found")))
              (APPEND (REVERSE |lines|) (CAR |b|)))))))))
--- 1967,1973 ----
           (COND
             ((|bStreamNull| |b|)
              (|shoeConsole| (CONCAT |name| " not found in " |fn|)) NIL)
!            (#0#
              (COND
                ((NULL |lines|) (|shoeConsole| ")package not found")))
              (APPEND (REVERSE |lines|) (CAR |b|)))))))))
*************** PSTOUT string==
*** 1917,1925 ****
              (COND
                ((EQUAL (SYMBOL-PACKAGE |x|) |bt|)
                 (INTERN (PNAME |x|) |pk|))
!               ('T |x|)))
!            ('T |x|)))
!         ('T
           (CONS (|stripm| (CAR |x|) |pk| |bt|)
                 (|stripm| (CDR |x|) |pk| |bt|)))))))
  
--- 2006,2014 ----
              (COND
                ((EQUAL (SYMBOL-PACKAGE |x|) |bt|)
                 (INTERN (PNAME |x|) |pk|))
!               (#0='T |x|)))
!            (#0# |x|)))
!         (#0#
           (CONS (|stripm| (CAR |x|) |pk| |bt|)
                 (|stripm| (CDR |x|) |pk| |bt|)))))))
  
*************** PSTOUT string==
*** 1946,1952 ****
  
  (DEFUN FC (|name| |fn|)
    (PROG (|$GenVarCounter| |$bfClamming| |infn|)
!     (DECLARE (SPECIAL |$bfClamming| |$GenVarCounter|))
      (RETURN
        (PROGN
          (SETQ |$bfClamming| NIL)
--- 2035,2041 ----
  
  (DEFUN FC (|name| |fn|)
    (PROG (|$GenVarCounter| |$bfClamming| |infn|)
!     (DECLARE (SPECIAL |$GenVarCounter| |$bfClamming|))
      (RETURN
        (PROGN
          (SETQ |$bfClamming| NIL)
*************** PSTOUT string==
*** 1986,1992 ****
  
  (DEFUN PSTTOMC (|string|)
    (PROG (|$bfClamming| |$GenVarCounter|)
!     (DECLARE (SPECIAL |$GenVarCounter| |$bfClamming|))
      (RETURN
        (PROGN
          (SETQ |$GenVarCounter| 0)
--- 2075,2081 ----
  
  (DEFUN PSTTOMC (|string|)
    (PROG (|$bfClamming| |$GenVarCounter|)
!     (DECLARE (SPECIAL |$bfClamming| |$GenVarCounter|))
      (RETURN
        (PROGN
          (SETQ |$GenVarCounter| 0)
*************** PSTOUT string==
*** 2003,2009 ****
             (PROGN
               (WRITE-LINE "Boot Loop; to exit type ] ")
               (BOOTLOOP)))
!           ('T
             (PROGN
               (SETQ |b| (|shoePrefix?| ")console" |a|))
               (COND
--- 2092,2098 ----
             (PROGN
               (WRITE-LINE "Boot Loop; to exit type ] ")
               (BOOTLOOP)))
!           (#0='T
             (PROGN
               (SETQ |b| (|shoePrefix?| ")console" |a|))
               (COND
*************** PSTOUT string==
*** 2012,2018 ****
                        (PSTTOMC (|bRgen| |stream|))
                        (BOOTLOOP)))
                 ((EQUAL (ELT |a| 0) (ELT "]" 0)) NIL)
!                ('T (PROGN (PSTTOMC (LIST |a|)) (BOOTLOOP)))))))))))
  
  (DEFUN BOOTPO ()
    (PROG (|stream| |b| |a|)
--- 2101,2107 ----
                        (PSTTOMC (|bRgen| |stream|))
                        (BOOTLOOP)))
                 ((EQUAL (ELT |a| 0) (ELT "]" 0)) NIL)
!                (#0# (PROGN (PSTTOMC (LIST |a|)) (BOOTLOOP)))))))))))
  
  (DEFUN BOOTPO ()
    (PROG (|stream| |b| |a|)
*************** PSTOUT string==
*** 2022,2028 ****
          (COND
            ((EQL (LENGTH |a|) 0)
             (PROGN (WRITE-LINE "Boot Loop; to exit type ] ") (BOOTPO)))
!           ('T
             (PROGN
               (SETQ |b| (|shoePrefix?| ")console" |a|))
               (COND
--- 2111,2117 ----
          (COND
            ((EQL (LENGTH |a|) 0)
             (PROGN (WRITE-LINE "Boot Loop; to exit type ] ") (BOOTPO)))
!           (#0='T
             (PROGN
               (SETQ |b| (|shoePrefix?| ")console" |a|))
               (COND
*************** PSTOUT string==
*** 2031,2047 ****
                        (PSTOUT (|bRgen| |stream|))
                        (BOOTPO)))
                 ((EQUAL (ELT |a| 0) (ELT "]" 0)) NIL)
!                ('T (PROGN (PSTOUT (LIST |a|)) (BOOTPO)))))))))))
  
  (DEFUN PSTOUT (|string|)
!   (PROG (|$bfClamming| |$GenVarCounter|)
!     (DECLARE (SPECIAL |$GenVarCounter| |$bfClamming|))
      (RETURN
        (PROGN
          (SETQ |$GenVarCounter| 0)
          (SETQ |$bfClamming| NIL)
!         (|shoeConsoleTrees| (|shoeTransformString| |string|))))))
! 
  
  @
  \eject
--- 2120,2140 ----
                        (PSTOUT (|bRgen| |stream|))
                        (BOOTPO)))
                 ((EQUAL (ELT |a| 0) (ELT "]" 0)) NIL)
!                (#0# (PROGN (PSTOUT (LIST |a|)) (BOOTPO)))))))))))
  
  (DEFUN PSTOUT (|string|)
!   (PROG (|$bfClamming| |$GenVarCounter| |result| |callingPackage|)
!     (DECLARE (SPECIAL |$bfClamming| |$GenVarCounter|))
      (RETURN
        (PROGN
+         (SETQ |callingPackage| (PACKAGE-NAME *PACKAGE*))
+         (IN-PACKAGE 'BOOTTRAN)
          (SETQ |$GenVarCounter| 0)
          (SETQ |$bfClamming| NIL)
!         (SETQ |result|
!               (|shoeConsoleTrees| (|shoeTransformString| |string|)))
!         (IN-PACKAGE |callingPackage|)
!         |result|))))
  
  @
  \eject




reply via email to

[Prev in Thread] Current Thread [Next in Thread]