aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authordos-reis <gdr@axiomatics.org>2007-08-19 02:02:25 +0000
committerdos-reis <gdr@axiomatics.org>2007-08-19 02:02:25 +0000
commit24c3320e85644fda0e2157db51cdb0697ef5ea09 (patch)
tree2dc3c000554bc8cf9ab3f77ae9c2970ef0657a9e /src
parentbc5a8eb98b7a1cee6b0813a515c92a765d0cc470 (diff)
downloadopen-axiom-24c3320e85644fda0e2157db51cdb0697ef5ea09.tar.gz
* translator.boot.pamphlet (EVAL-BOOT-FILE): Fix thinko. Use
setCurrentPackage to reset current package. (BO): Likewise. (bStreamPackageNull): Likewise. Update cached Lisp translation.
Diffstat (limited to 'src')
-rw-r--r--src/boot/ChangeLog8
-rw-r--r--src/boot/translator.boot.pamphlet24
2 files changed, 20 insertions, 12 deletions
diff --git a/src/boot/ChangeLog b/src/boot/ChangeLog
index 0015cc43..0577aeec 100644
--- a/src/boot/ChangeLog
+++ b/src/boot/ChangeLog
@@ -1,3 +1,11 @@
+2007-08-18 Gabriel Dos Reis <gdr@cs.tamu.edu>
+
+ * translator.boot.pamphlet (EVAL-BOOT-FILE): Fix thinko. Use
+ setCurrentPackage to reset current package.
+ (BO): Likewise.
+ (bStreamPackageNull): Likewise.
+ Update cached Lisp translation.
+
2007-08-17 Gabriel Dos Reis <gdr@cs.tamu.edu>
* translator.boot.pamphlet (bpOutItem): Translate ConstantDefinition
diff --git a/src/boot/translator.boot.pamphlet b/src/boot/translator.boot.pamphlet
index c805b20b..2a3f4e6d 100644
--- a/src/boot/translator.boot.pamphlet
+++ b/src/boot/translator.boot.pamphlet
@@ -199,26 +199,26 @@ shoeMc(a,fn)==
shoeConsole CONCAT(fn,'" COMPILED AND LOADED")
EVAL_-BOOT_-FILE fn ==
- b:=PACKAGE_-NAME _*PACKAGE_*
+ b := _*PACKAGE_*
IN_-PACKAGE '"BOOTTRAN"
$bfClamming:local:=false
infn:=shoeAddbootIfNec fn
outfn:=CONCAT(shoeRemovebootIfNec fn,'".",_*LISP_-SOURCE_-FILETYPE_*)
shoeOpenInputFile(a,infn,shoeClLines(a,infn,[],outfn))
- IN_-PACKAGE b
+ setCurrentPackage b
LOAD outfn
-- (boot "filename") translates the file "filename.boot"
-- and prints the result at the console
BO fn==
- b:=PACKAGE_-NAME _*PACKAGE_*
+ b := _*PACKAGE_*
IN_-PACKAGE '"BOOTTRAN"
$GenVarCounter:local := 0
$bfClamming:local := false
infn:=shoeAddbootIfNec fn
shoeOpenInputFile(a,infn,shoeToConsole(a,fn))
- IN_-PACKAGE b
+ setCurrentPackage b
BOCLAM fn==
callingPackage := _*PACKAGE_*
@@ -730,10 +730,10 @@ shoePCompileTrees s==
s:=cdr s
bStreamPackageNull s==
- a:=PACKAGE_-NAME _*PACKAGE_*
+ a := _*PACKAGE_*
IN_-PACKAGE '"BOOTTRAN"
b:=bStreamNull s
- IN_-PACKAGE a
+ setCurrentPackage a
b
PSTTOMC string==
@@ -945,7 +945,7 @@ associateRequestWithFileType(Option '"compile", '"boot",
(DECLARE (SPECIAL |$bfClamming|))
(RETURN
(PROGN
- (SETQ |b| (PACKAGE-NAME *PACKAGE*))
+ (SETQ |b| *PACKAGE*)
(IN-PACKAGE "BOOTTRAN")
(SETQ |$bfClamming| NIL)
(SETQ |infn| (|shoeAddbootIfNec| |fn|))
@@ -954,7 +954,7 @@ associateRequestWithFileType(Option '"compile", '"boot",
*LISP-SOURCE-FILETYPE*))
(|shoeOpenInputFile| |a| |infn|
(|shoeClLines| |a| |infn| NIL |outfn|))
- (IN-PACKAGE |b|)
+ (|setCurrentPackage| |b|)
(LOAD |outfn|)))))
(DEFUN BO (|fn|)
@@ -962,13 +962,13 @@ associateRequestWithFileType(Option '"compile", '"boot",
(DECLARE (SPECIAL |$bfClamming| |$GenVarCounter|))
(RETURN
(PROGN
- (SETQ |b| (PACKAGE-NAME *PACKAGE*))
+ (SETQ |b| *PACKAGE*)
(IN-PACKAGE "BOOTTRAN")
(SETQ |$GenVarCounter| 0)
(SETQ |$bfClamming| NIL)
(SETQ |infn| (|shoeAddbootIfNec| |fn|))
(|shoeOpenInputFile| |a| |infn| (|shoeToConsole| |a| |fn|))
- (IN-PACKAGE |b|)))))
+ (|setCurrentPackage| |b|)))))
(DEFUN BOCLAM (|fn|)
(PROG (|$bfClamming| |$GenVarCounter| |result| |infn|
@@ -1832,10 +1832,10 @@ associateRequestWithFileType(Option '"compile", '"boot",
(PROG (|b| |a|)
(RETURN
(PROGN
- (SETQ |a| (PACKAGE-NAME *PACKAGE*))
+ (SETQ |a| *PACKAGE*)
(IN-PACKAGE "BOOTTRAN")
(SETQ |b| (|bStreamNull| |s|))
- (IN-PACKAGE |a|)
+ (|setCurrentPackage| |a|)
|b|))))
(DEFUN PSTTOMC (|string|)