aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog12
-rw-r--r--src/boot/ast.boot6
-rw-r--r--src/boot/includer.boot4
-rw-r--r--src/boot/parser.boot30
-rw-r--r--src/boot/pile.boot12
-rw-r--r--src/boot/scanner.boot10
-rw-r--r--src/boot/strap/ast.clisp4
-rw-r--r--src/boot/strap/includer.clisp2
-rw-r--r--src/boot/strap/parser.clisp21
-rw-r--r--src/boot/strap/pile.clisp2
-rw-r--r--src/boot/strap/scanner.clisp2
-rw-r--r--src/boot/strap/tokens.clisp2
-rw-r--r--src/boot/strap/translator.clisp9
-rw-r--r--src/boot/tokens.boot4
-rw-r--r--src/boot/translator.boot18
-rw-r--r--src/interp/alql.boot2
-rw-r--r--src/interp/apply.boot2
-rw-r--r--src/interp/as.boot2
-rw-r--r--src/interp/astr.boot2
-rw-r--r--src/interp/ax.boot2
-rw-r--r--src/interp/bc-matrix.boot2
-rw-r--r--src/interp/bc-misc.boot2
-rw-r--r--src/interp/bc-solve.boot4
-rw-r--r--src/interp/bc-util.boot2
-rw-r--r--src/interp/br-con.boot2
-rw-r--r--src/interp/br-data.boot2
-rw-r--r--src/interp/br-op1.boot2
-rw-r--r--src/interp/br-op2.boot2
-rw-r--r--src/interp/br-prof.boot2
-rw-r--r--src/interp/br-saturn.boot2
-rw-r--r--src/interp/br-search.boot2
-rw-r--r--src/interp/br-util.boot2
-rw-r--r--src/interp/buildom.boot2
-rw-r--r--src/interp/c-doc.boot2
-rw-r--r--src/interp/c-util.boot2
-rw-r--r--src/interp/category.boot2
-rw-r--r--src/interp/cattable.boot4
-rw-r--r--src/interp/cformat.boot4
-rw-r--r--src/interp/clam.boot2
-rw-r--r--src/interp/clammed.boot2
-rw-r--r--src/interp/compat.boot2
-rw-r--r--src/interp/compiler.boot10
-rw-r--r--src/interp/compress.boot2
-rw-r--r--src/interp/cparse.boot2
-rw-r--r--src/interp/cstream.boot2
-rw-r--r--src/interp/database.boot10
-rw-r--r--src/interp/define.boot6
-rw-r--r--src/interp/diagnostics.boot6
-rw-r--r--src/interp/dq.boot2
-rw-r--r--src/interp/format.boot2
-rw-r--r--src/interp/fortcall.boot2
-rw-r--r--src/interp/functor.boot4
-rw-r--r--src/interp/g-boot.boot4
-rw-r--r--src/interp/g-cndata.boot2
-rw-r--r--src/interp/g-error.boot4
-rw-r--r--src/interp/g-opt.boot2
-rw-r--r--src/interp/g-timer.boot4
-rw-r--r--src/interp/g-util.boot4
-rw-r--r--src/interp/hashcode.boot2
-rw-r--r--src/interp/ht-root.boot2
-rw-r--r--src/interp/ht-util.boot2
-rw-r--r--src/interp/htcheck.boot4
-rw-r--r--src/interp/htsetvar.boot2
-rw-r--r--src/interp/hypertex.boot2
-rw-r--r--src/interp/i-analy.boot2
-rw-r--r--src/interp/i-code.boot2
-rw-r--r--src/interp/i-coerce.boot4
-rw-r--r--src/interp/i-coerfn.boot2
-rw-r--r--src/interp/i-eval.boot2
-rw-r--r--src/interp/i-funsel.boot2
-rw-r--r--src/interp/i-intern.boot4
-rw-r--r--src/interp/i-map.boot2
-rw-r--r--src/interp/i-object.boot2
-rw-r--r--src/interp/i-output.boot2
-rw-r--r--src/interp/i-parser.boot4
-rw-r--r--src/interp/i-resolv.boot2
-rw-r--r--src/interp/i-spec1.boot2
-rw-r--r--src/interp/i-spec2.boot2
-rw-r--r--src/interp/i-syscmd.boot6
-rw-r--r--src/interp/i-toplev.boot2
-rw-r--r--src/interp/i-util.boot2
-rw-r--r--src/interp/incl.boot6
-rw-r--r--src/interp/info.boot2
-rw-r--r--src/interp/int-top.boot6
-rw-r--r--src/interp/interop.boot2
-rw-r--r--src/interp/intfile.boot2
-rw-r--r--src/interp/iterator.boot2
-rw-r--r--src/interp/lisplib.boot6
-rw-r--r--src/interp/macex.boot2
-rw-r--r--src/interp/mark.boot2
-rw-r--r--src/interp/match.boot2
-rw-r--r--src/interp/modemap.boot4
-rw-r--r--src/interp/msg.boot4
-rw-r--r--src/interp/msgdb.boot2
-rw-r--r--src/interp/newfort.boot2
-rw-r--r--src/interp/nruncomp.boot4
-rw-r--r--src/interp/nrunfast.boot2
-rw-r--r--src/interp/nrungo.boot2
-rw-r--r--src/interp/nrunopt.boot2
-rw-r--r--src/interp/nruntime.boot2
-rw-r--r--src/interp/osyscmd.boot2
-rw-r--r--src/interp/package.boot2
-rw-r--r--src/interp/packtran.boot2
-rw-r--r--src/interp/parse.boot2
-rw-r--r--src/interp/pathname.boot2
-rw-r--r--src/interp/pf2sex.boot2
-rw-r--r--src/interp/pile.boot2
-rw-r--r--src/interp/posit.boot4
-rw-r--r--src/interp/postpar.boot2
-rw-r--r--src/interp/profile.boot2
-rw-r--r--src/interp/pspad1.boot2
-rw-r--r--src/interp/pspad2.boot2
-rw-r--r--src/interp/ptrees.boot4
-rw-r--r--src/interp/record.boot4
-rw-r--r--src/interp/rulesets.boot2
-rw-r--r--src/interp/scan.boot6
-rw-r--r--src/interp/serror.boot2
-rw-r--r--src/interp/server.boot2
-rw-r--r--src/interp/setvars.boot4
-rw-r--r--src/interp/setvart.boot2
-rw-r--r--src/interp/sfsfun.boot2
-rw-r--r--src/interp/showimp.boot2
-rw-r--r--src/interp/simpbool.boot2
-rw-r--r--src/interp/slam.boot2
-rw-r--r--src/interp/spad-parser.boot4
-rw-r--r--src/interp/sys-constants.boot2
-rw-r--r--src/interp/sys-driver.boot2
-rw-r--r--src/interp/sys-globals.boot4
-rw-r--r--src/interp/sys-os.boot6
-rw-r--r--src/interp/sys-utility.boot4
-rw-r--r--src/interp/template.boot2
-rw-r--r--src/interp/termrw.boot2
-rw-r--r--src/interp/topics.boot2
-rw-r--r--src/interp/trace.boot2
-rw-r--r--src/interp/types.boot50
-rw-r--r--src/interp/wi1.boot2
-rw-r--r--src/interp/wi2.boot4
-rw-r--r--src/lisp/core.lisp.in49
138 files changed, 313 insertions, 260 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 24149a72..6c17ef7b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,15 @@
+2008-04-23 Gabriel Dos Reis <gdr@cs.tamu.edu>
+
+ * boot/ast.boot: Tidy.
+ * boot/includer.boot: Likewise.
+ * boot/parser.boot: Likewise.
+ * boot/pile.boot: Likewise.
+ * boot/scanner.boot: Likewise.
+ * boot/tokens.boot: Likewise.
+ * boot/translator.boot: Likewise.
+ * boot/strap: Update Lisp translation.
+ * lisp/core.lisp.in: Tidy.
+
2008-04-21 Gabriel Dos Reis <gdr@cs.tamu.edu>
* interp/br-data.boot: Tidy.
diff --git a/src/boot/ast.boot b/src/boot/ast.boot
index cf186896..9026ea7a 100644
--- a/src/boot/ast.boot
+++ b/src/boot/ast.boot
@@ -38,8 +38,8 @@
-- for representing Boot programs.
--
-module '"boot-ast"
-import '"includer"
+module ast
+import includer
)package "BOOTTRAN"
@@ -77,7 +77,7 @@ structure %Name ==
structure %Ast ==
Command(%String) -- includer command
- Module(%String) -- module declaration
+ %Module(%String) -- module declaration
Import(%String) -- import module
ImportSignature(Name, Signature) -- import function declaration
TypeAlias(%Head, %List) -- type alias definition
diff --git a/src/boot/includer.boot b/src/boot/includer.boot
index 2f81c55a..bb8da9a9 100644
--- a/src/boot/includer.boot
+++ b/src/boot/includer.boot
@@ -37,8 +37,8 @@
-- This file defines the includer (or preprocessor) of Boot programs.
--
-module '"boot-includer"
-import '"tokens"
+module includer
+import tokens
)package "BOOTTRAN"
-- BOOT INCLUDER
diff --git a/src/boot/parser.boot b/src/boot/parser.boot
index af8098b2..224121e7 100644
--- a/src/boot/parser.boot
+++ b/src/boot/parser.boot
@@ -39,10 +39,10 @@
--
-module '"boot-parser"
-import '"includer"
-import '"scanner"
-import '"ast"
+module parser
+import includer
+import scanner
+import ast
)package "BOOTTRAN"
@@ -415,13 +415,8 @@ bpConstTok() ==
++ Module:
++ MODULE QUOTE String
bpModule() ==
- bpEqKey "MODULE" =>
- -- we really want to check that the next token is indeed
- -- a string. For the moment, we delay the type checking
- -- to the Lisp compiler/interpreter. That is likely to
- -- cause cryptic diagnostics. To be fixed.
- bpConstTok() and bpPush Module bpPop1()
- false
+ bpEqKey "MODULE" and (bpName() or bpTrap()) and
+ bpPush %Module bpPop1()
++ Parse a module import, or a import declaration for a foreign entity.
++ Import:
@@ -429,14 +424,11 @@ bpModule() ==
++ IMPORT QUOTE String
bpImport() ==
bpEqKey "IMPORT" =>
- (bpName() and (bpEqKey "FOR" or bpTrap()) and bpSignature()
- and bpPush ImportSignature(bpPop2(), bpPop1()))
- or
- -- we really want to check that the next token is indeed
- -- a string. For the moment, we delay the type checking
- -- to the Lisp compiler/interpreter. That is likely to
- -- cause cryptic diagnostics. To be fixed.
- (bpConstTok() and bpPush Import bpPop1())
+ bpName() or bpTrap()
+ bpEqKey "FOR" =>
+ (bpSignature() or bpTrap()) and
+ bpPush ImportSignature(bpPop2(), bpPop1())
+ bpPush Import bpPop1()
false
-- Parse a type alias defnition:
diff --git a/src/boot/pile.boot b/src/boot/pile.boot
index 0b8b1651..c5f16064 100644
--- a/src/boot/pile.boot
+++ b/src/boot/pile.boot
@@ -1,4 +1,6 @@
--- Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd.
+-- Copyright (c) 1991-2002, The Numerical Algorithms Group Ltd.
+-- All rights reserved.
+-- Copyright (C) 2007-2008, Gabriel Dos Reis.
-- All rights reserved.
--
-- Redistribution and use in source and binary forms, with or without
@@ -13,7 +15,7 @@
-- the documentation and/or other materials provided with the
-- distribution.
--
--- - Neither the name of The Numerical ALgorithms Group Ltd. nor the
+-- - Neither the name of The Numerical Algorithms Group Ltd. nor the
-- names of its contributors may be used to endorse or promote products
-- derived from this software without specific prior written permission.
--
@@ -30,9 +32,9 @@
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-module '"boot-pile"
-import '"includer"
-import '"scanner"
+module pile
+import includer
+import scanner
)package "BOOTTRAN"
shoeFirstTokPosn t== shoeTokPosn CAAR t
diff --git a/src/boot/scanner.boot b/src/boot/scanner.boot
index cd127781..108fc58a 100644
--- a/src/boot/scanner.boot
+++ b/src/boot/scanner.boot
@@ -1,4 +1,4 @@
--- Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd.
+-- Copyright (c) 1991-2002, The Numerical Algorithms Group Ltd.
-- All rights reserved.
-- Copyright (C) 2007-2008, Gabriel Dos Reis.
-- All rights reserved.
@@ -15,7 +15,7 @@
-- the documentation and/or other materials provided with the
-- distribution.
--
--- - Neither the name of The Numerical ALgorithms Group Ltd. nor the
+-- - Neither the name of The Numerical Algorithms Group Ltd. nor the
-- names of its contributors may be used to endorse or promote products
-- derived from this software without specific prior written permission.
--
@@ -33,9 +33,9 @@
--
-module '"boot-lexer"
-import '"tokens"
-import '"includer"
+module scanner
+import tokens
+import includer
)package "BOOTTRAN"
diff --git a/src/boot/strap/ast.clisp b/src/boot/strap/ast.clisp
index 5bbd792c..c02bb4a7 100644
--- a/src/boot/strap/ast.clisp
+++ b/src/boot/strap/ast.clisp
@@ -1,4 +1,4 @@
-(EVAL-WHEN (:COMPILE-TOPLEVEL) (PROVIDE "boot-ast"))
+(EVAL-WHEN (:COMPILE-TOPLEVEL) (PROVIDE "ast"))
(IMPORT-MODULE "includer")
@@ -26,7 +26,7 @@
(DEFUN |Command| #0=(|bfVar#2|) (CONS '|Command| (LIST . #0#)))
-(DEFUN |Module| #0=(|bfVar#3|) (CONS '|Module| (LIST . #0#)))
+(DEFUN |%Module| #0=(|bfVar#3|) (CONS '|%Module| (LIST . #0#)))
(DEFUN |Import| #0=(|bfVar#4|) (CONS '|Import| (LIST . #0#)))
diff --git a/src/boot/strap/includer.clisp b/src/boot/strap/includer.clisp
index d8b645cc..167e7f2a 100644
--- a/src/boot/strap/includer.clisp
+++ b/src/boot/strap/includer.clisp
@@ -1,4 +1,4 @@
-(EVAL-WHEN (:COMPILE-TOPLEVEL) (PROVIDE "boot-includer"))
+(EVAL-WHEN (:COMPILE-TOPLEVEL) (PROVIDE "includer"))
(IMPORT-MODULE "tokens")
diff --git a/src/boot/strap/parser.clisp b/src/boot/strap/parser.clisp
index 9a9c2cf7..f7139d25 100644
--- a/src/boot/strap/parser.clisp
+++ b/src/boot/strap/parser.clisp
@@ -1,4 +1,4 @@
-(EVAL-WHEN (:COMPILE-TOPLEVEL) (PROVIDE "boot-parser"))
+(EVAL-WHEN (:COMPILE-TOPLEVEL) (PROVIDE "parser"))
(IMPORT-MODULE "includer")
@@ -443,19 +443,20 @@
('T (|bpString|))))
(DEFUN |bpModule| ()
- (COND
- ((|bpEqKey| 'MODULE)
- (AND (|bpConstTok|) (|bpPush| (|Module| (|bpPop1|)))))
- ('T NIL)))
+ (AND (|bpEqKey| 'MODULE) (OR (|bpName|) (|bpTrap|))
+ (|bpPush| (|%Module| (|bpPop1|)))))
(DEFUN |bpImport| ()
(COND
((|bpEqKey| 'IMPORT)
- (OR (AND (|bpName|) (OR (|bpEqKey| 'FOR) (|bpTrap|))
- (|bpSignature|)
- (|bpPush| (|ImportSignature| (|bpPop2|) (|bpPop1|))))
- (AND (|bpConstTok|) (|bpPush| (|Import| (|bpPop1|))))))
- ('T NIL)))
+ (PROGN
+ (OR (|bpName|) (|bpTrap|))
+ (COND
+ ((|bpEqKey| 'FOR)
+ (AND (OR (|bpSignature|) (|bpTrap|))
+ (|bpPush| (|ImportSignature| (|bpPop2|) (|bpPop1|)))))
+ (#0='T (|bpPush| (|Import| (|bpPop1|)))))))
+ (#0# NIL)))
(DEFUN |bpTypeAliasDefition| ()
(AND (OR (|bpTerm|) (|bpTrap|)) (|bpEqKey| 'TDEF) (|bpLogical|)
diff --git a/src/boot/strap/pile.clisp b/src/boot/strap/pile.clisp
index a0f6d6db..2bd3ebb2 100644
--- a/src/boot/strap/pile.clisp
+++ b/src/boot/strap/pile.clisp
@@ -1,4 +1,4 @@
-(EVAL-WHEN (:COMPILE-TOPLEVEL) (PROVIDE "boot-pile"))
+(EVAL-WHEN (:COMPILE-TOPLEVEL) (PROVIDE "pile"))
(IMPORT-MODULE "includer")
diff --git a/src/boot/strap/scanner.clisp b/src/boot/strap/scanner.clisp
index 4d3406f4..b5595ebf 100644
--- a/src/boot/strap/scanner.clisp
+++ b/src/boot/strap/scanner.clisp
@@ -1,4 +1,4 @@
-(EVAL-WHEN (:COMPILE-TOPLEVEL) (PROVIDE "boot-lexer"))
+(EVAL-WHEN (:COMPILE-TOPLEVEL) (PROVIDE "scanner"))
(IMPORT-MODULE "tokens")
diff --git a/src/boot/strap/tokens.clisp b/src/boot/strap/tokens.clisp
index 97b0f8ff..fdacce47 100644
--- a/src/boot/strap/tokens.clisp
+++ b/src/boot/strap/tokens.clisp
@@ -1,4 +1,4 @@
-(EVAL-WHEN (:COMPILE-TOPLEVEL) (PROVIDE "boot-tokens"))
+(EVAL-WHEN (:COMPILE-TOPLEVEL) (PROVIDE "tokens"))
(IMPORT-MODULE "initial-env")
diff --git a/src/boot/strap/translator.clisp b/src/boot/strap/translator.clisp
index d2675cea..ba0b894b 100644
--- a/src/boot/strap/translator.clisp
+++ b/src/boot/strap/translator.clisp
@@ -1,4 +1,4 @@
-(EVAL-WHEN (:COMPILE-TOPLEVEL) (PROVIDE "boot-translator"))
+(EVAL-WHEN (:COMPILE-TOPLEVEL) (PROVIDE "translator"))
(IMPORT-MODULE "includer")
@@ -644,14 +644,15 @@
(LET ((|op| (CAR |bfVar#16|))
(|t| (CADR |bfVar#16|)))
(|bpPush| (LIST (|genDeclaration| |op| |t|)))))
- (|Module|
+ (|%Module|
(LET ((|m| (CAR |bfVar#16|)))
(|bpPush|
(LIST (|shoeCompileTimeEvaluation|
- (LIST 'PROVIDE |m|))))))
+ (LIST 'PROVIDE (STRING |m|)))))))
(|Import|
(LET ((|m| (CAR |bfVar#16|)))
- (|bpPush| (LIST (LIST 'IMPORT-MODULE |m|)))))
+ (|bpPush|
+ (LIST (LIST 'IMPORT-MODULE (STRING |m|))))))
(|ImportSignature|
(LET ((|x| (CAR |bfVar#16|))
(|sig| (CADR |bfVar#16|)))
diff --git a/src/boot/tokens.boot b/src/boot/tokens.boot
index 8dda774f..8895fe53 100644
--- a/src/boot/tokens.boot
+++ b/src/boot/tokens.boot
@@ -32,8 +32,8 @@
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--
-module '"boot-tokens"
-import '"initial-env"
+module tokens
+import initial_-env
)package "BOOTTRAN"
diff --git a/src/boot/translator.boot b/src/boot/translator.boot
index bfaab592..a4c868f2 100644
--- a/src/boot/translator.boot
+++ b/src/boot/translator.boot
@@ -33,12 +33,12 @@
--
-module '"boot-translator"
-import '"includer"
-import '"scanner"
-import '"pile"
-import '"parser"
-import '"ast"
+module translator
+import includer
+import scanner
+import pile
+import parser
+import ast
)package "BOOTTRAN"
@@ -401,11 +401,11 @@ bpOutItem()==
Signature(op,t) =>
bpPush [genDeclaration(op,t)]
- Module(m) =>
- bpPush [shoeCompileTimeEvaluation ["PROVIDE", m]]
+ %Module(m) =>
+ bpPush [shoeCompileTimeEvaluation ["PROVIDE", STRING m]]
Import(m) =>
- bpPush [["IMPORT-MODULE", m]]
+ bpPush [["IMPORT-MODULE", STRING m]]
ImportSignature(x, sig) =>
bpPush genImportDeclaration(x, sig)
diff --git a/src/interp/alql.boot b/src/interp/alql.boot
index 12b663f5..b00677a8 100644
--- a/src/interp/alql.boot
+++ b/src/interp/alql.boot
@@ -30,7 +30,7 @@
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"br-search"
+import br_-search
)package "BOOT"
getBrowseDatabase(kind) ==
diff --git a/src/interp/apply.boot b/src/interp/apply.boot
index 386a7a6f..30aeefc2 100644
--- a/src/interp/apply.boot
+++ b/src/interp/apply.boot
@@ -32,7 +32,7 @@
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"compiler"
+import compiler
)package "BOOT"
compAtomWithModemap: (%Form,%Mode,%Env,%Thing) -> %Maybe %Triple
diff --git a/src/interp/as.boot b/src/interp/as.boot
index 6ab40d99..62b241ad 100644
--- a/src/interp/as.boot
+++ b/src/interp/as.boot
@@ -32,7 +32,7 @@
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"macros"
+import macros
)package "BOOT"
--global hash tables for new compiler
diff --git a/src/interp/astr.boot b/src/interp/astr.boot
index a5243849..81a28706 100644
--- a/src/interp/astr.boot
+++ b/src/interp/astr.boot
@@ -31,7 +31,7 @@
-- NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"vmlisp"
+import vmlisp
)package "BOOT"
diff --git a/src/interp/ax.boot b/src/interp/ax.boot
index ab40f81e..c492d683 100644
--- a/src/interp/ax.boot
+++ b/src/interp/ax.boot
@@ -32,7 +32,7 @@
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"as"
+import as
)package "BOOT"
$stripTypes := false
diff --git a/src/interp/bc-matrix.boot b/src/interp/bc-matrix.boot
index 0f8fe3f7..8cba8faf 100644
--- a/src/interp/bc-matrix.boot
+++ b/src/interp/bc-matrix.boot
@@ -32,7 +32,7 @@
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"bc-util"
+import bc_-util
)package "BOOT"
-- Basic Command matrix entry
diff --git a/src/interp/bc-misc.boot b/src/interp/bc-misc.boot
index e5e1bb3b..158baac3 100644
--- a/src/interp/bc-misc.boot
+++ b/src/interp/bc-misc.boot
@@ -32,7 +32,7 @@
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"bc-util"
+import bc_-util
)package "BOOT"
--Hypertex commands other than solve and matrix
diff --git a/src/interp/bc-solve.boot b/src/interp/bc-solve.boot
index 29992b8f..f481404b 100644
--- a/src/interp/bc-solve.boot
+++ b/src/interp/bc-solve.boot
@@ -32,8 +32,8 @@
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"bc-matrix"
-import '"bc-misc"
+import bc_-matrix
+import bc_-misc
)package "BOOT"
-- HyperTeX basic Solve Command
diff --git a/src/interp/bc-util.boot b/src/interp/bc-util.boot
index bdd73c3d..55a454db 100644
--- a/src/interp/bc-util.boot
+++ b/src/interp/bc-util.boot
@@ -32,7 +32,7 @@
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"ht-util"
+import ht_-util
)package "BOOT"
++
diff --git a/src/interp/br-con.boot b/src/interp/br-con.boot
index 18042be9..c61bc00e 100644
--- a/src/interp/br-con.boot
+++ b/src/interp/br-con.boot
@@ -32,7 +32,7 @@
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"bc-util"
+import bc_-util
)package "BOOT"
diff --git a/src/interp/br-data.boot b/src/interp/br-data.boot
index 91bef7ba..57812809 100644
--- a/src/interp/br-data.boot
+++ b/src/interp/br-data.boot
@@ -32,7 +32,7 @@
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"bc-util"
+import bc_-util
)package "BOOT"
lefts u ==
diff --git a/src/interp/br-op1.boot b/src/interp/br-op1.boot
index 5ba992a9..e359dd93 100644
--- a/src/interp/br-op1.boot
+++ b/src/interp/br-op1.boot
@@ -32,7 +32,7 @@
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"bc-util"
+import bc_-util
)package "BOOT"
--====================> WAS b-op1.boot <================================
diff --git a/src/interp/br-op2.boot b/src/interp/br-op2.boot
index d6f499bb..dbac1262 100644
--- a/src/interp/br-op2.boot
+++ b/src/interp/br-op2.boot
@@ -32,7 +32,7 @@
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"br-op1"
+import br_-op1
)package "BOOT"
--====================> WAS br-op2.boot <================================
diff --git a/src/interp/br-prof.boot b/src/interp/br-prof.boot
index 7d916543..762a6cde 100644
--- a/src/interp/br-prof.boot
+++ b/src/interp/br-prof.boot
@@ -32,7 +32,7 @@
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"bc-util"
+import bc_-util
)package "BOOT"
--====================> WAS b-prof.boot <================================
diff --git a/src/interp/br-saturn.boot b/src/interp/br-saturn.boot
index 3df47a86..9dc8e5e3 100644
--- a/src/interp/br-saturn.boot
+++ b/src/interp/br-saturn.boot
@@ -32,7 +32,7 @@
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"bc-util"
+import bc_-util
)package "BOOT"
--====================> WAS b-saturn.boot <================================
diff --git a/src/interp/br-search.boot b/src/interp/br-search.boot
index 07c8f876..782be275 100644
--- a/src/interp/br-search.boot
+++ b/src/interp/br-search.boot
@@ -32,7 +32,7 @@
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"bc-util"
+import bc_-util
)package "BOOT"
--====================> WAS b-search.boot <================================
diff --git a/src/interp/br-util.boot b/src/interp/br-util.boot
index 64d34d20..b5515501 100644
--- a/src/interp/br-util.boot
+++ b/src/interp/br-util.boot
@@ -32,7 +32,7 @@
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"bc-util"
+import bc_-util
)package "BOOT"
--====================> WAS b-util.boot <================================
diff --git a/src/interp/buildom.boot b/src/interp/buildom.boot
index 2e7c1988..f3daabca 100644
--- a/src/interp/buildom.boot
+++ b/src/interp/buildom.boot
@@ -40,7 +40,7 @@
-- runtime system.
-- GDR, March 2008.
-import '"sys-macros"
+import sys_-macros
)package "BOOT"
$noCategoryDomains == '(Mode SubDomain)
diff --git a/src/interp/c-doc.boot b/src/interp/c-doc.boot
index 95d33691..5507c9f3 100644
--- a/src/interp/c-doc.boot
+++ b/src/interp/c-doc.boot
@@ -32,7 +32,7 @@
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"c-util"
+import c_-util
)package "BOOT"
batchExecute() ==
diff --git a/src/interp/c-util.boot b/src/interp/c-util.boot
index 5b0885b6..c9bf8214 100644
--- a/src/interp/c-util.boot
+++ b/src/interp/c-util.boot
@@ -32,7 +32,7 @@
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"g-util"
+import g_-util
)package "BOOT"
++ If using old `Rep' definition semantics, return `$' when m is `Rep'.
diff --git a/src/interp/category.boot b/src/interp/category.boot
index d3a21b25..a9f46ec8 100644
--- a/src/interp/category.boot
+++ b/src/interp/category.boot
@@ -32,7 +32,7 @@
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"g-util"
+import g_-util
)package "BOOT"
-- Functions for building categories
diff --git a/src/interp/cattable.boot b/src/interp/cattable.boot
index 86508063..6f2a42b1 100644
--- a/src/interp/cattable.boot
+++ b/src/interp/cattable.boot
@@ -32,8 +32,8 @@
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"simpbool"
-import '"g-util"
+import simpbool
+import g_-util
)package "BOOT"
hasCat(domainOrCatName,catName) ==
diff --git a/src/interp/cformat.boot b/src/interp/cformat.boot
index 2a79baaf..4f48e679 100644
--- a/src/interp/cformat.boot
+++ b/src/interp/cformat.boot
@@ -32,8 +32,8 @@
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"unlisp"
-import '"posit"
+import unlisp
+import posit
)package "BOOT"
diff --git a/src/interp/clam.boot b/src/interp/clam.boot
index e9f4a787..273ed119 100644
--- a/src/interp/clam.boot
+++ b/src/interp/clam.boot
@@ -32,7 +32,7 @@
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"g-timer"
+import g_-timer
)package "BOOT"
--% Cache Lambda Facility
diff --git a/src/interp/clammed.boot b/src/interp/clammed.boot
index 01493950..30348f55 100644
--- a/src/interp/clammed.boot
+++ b/src/interp/clammed.boot
@@ -31,7 +31,7 @@
-- NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"g-timer"
+import g_-timer
)package "BOOT"
++ All functions defined in this file are `clammed', e.g. they are
diff --git a/src/interp/compat.boot b/src/interp/compat.boot
index 0288ab68..7ff3c776 100644
--- a/src/interp/compat.boot
+++ b/src/interp/compat.boot
@@ -32,7 +32,7 @@
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"pathname"
+import pathname
)package "BOOT"
-- some functions that may need to be changed on different lisp
diff --git a/src/interp/compiler.boot b/src/interp/compiler.boot
index 71dbf34b..e0530427 100644
--- a/src/interp/compiler.boot
+++ b/src/interp/compiler.boot
@@ -32,11 +32,11 @@
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"c-util"
-import '"pathname"
-import '"modemap"
-import '"define"
-import '"iterator"
+import c_-util
+import pathname
+import modemap
+import define
+import iterator
)package "BOOT"
++ A list of routines for diagnostic reports. These functions, in an
diff --git a/src/interp/compress.boot b/src/interp/compress.boot
index ab5d3a10..358dbb14 100644
--- a/src/interp/compress.boot
+++ b/src/interp/compress.boot
@@ -32,7 +32,7 @@
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"sys-macros"
+import sys_-macros
)package "BOOT"
-- This one is not currently in general use, but can be applied
diff --git a/src/interp/cparse.boot b/src/interp/cparse.boot
index 4193670f..8d3972ec 100644
--- a/src/interp/cparse.boot
+++ b/src/interp/cparse.boot
@@ -31,7 +31,7 @@
-- NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"ptrees"
+import ptrees
)package "BOOT"
diff --git a/src/interp/cstream.boot b/src/interp/cstream.boot
index d935de69..02621cbb 100644
--- a/src/interp/cstream.boot
+++ b/src/interp/cstream.boot
@@ -32,7 +32,7 @@
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"sys-macros"
+import sys_-macros
)package "BOOT"
diff --git a/src/interp/database.boot b/src/interp/database.boot
index 07d67515..bfe0107e 100644
--- a/src/interp/database.boot
+++ b/src/interp/database.boot
@@ -32,11 +32,11 @@
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"nlib"
-import '"g-cndata"
-import '"clam"
-import '"cattable"
-import '"compat"
+import nlib
+import g_-cndata
+import clam
+import cattable
+import compat
)package "BOOT"
$getUnexposedOperations := true
diff --git a/src/interp/define.boot b/src/interp/define.boot
index 937ce162..661fdf5b 100644
--- a/src/interp/define.boot
+++ b/src/interp/define.boot
@@ -32,9 +32,9 @@
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"c-util"
-import '"cattable"
-import '"category"
+import c_-util
+import cattable
+import category
)package "BOOT"
NRTPARSE := false
diff --git a/src/interp/diagnostics.boot b/src/interp/diagnostics.boot
index c679cf4c..c868815a 100644
--- a/src/interp/diagnostics.boot
+++ b/src/interp/diagnostics.boot
@@ -38,9 +38,9 @@
-- These routines are bused by both the interprerter and the compiler.
--
-import '"sys-constants"
-import '"sys-globals"
-import '"vmlisp"
+import sys_-constants
+import sys_-globals
+import vmlisp
)package "BOOT"
diff --git a/src/interp/dq.boot b/src/interp/dq.boot
index 55a1c048..c1d4c03e 100644
--- a/src/interp/dq.boot
+++ b/src/interp/dq.boot
@@ -32,7 +32,7 @@
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"types"
+import types
)package "BOOT"
-- Dequeue functions
diff --git a/src/interp/format.boot b/src/interp/format.boot
index f42f7255..fdbd9934 100644
--- a/src/interp/format.boot
+++ b/src/interp/format.boot
@@ -32,7 +32,7 @@
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"macros"
+import macros
)package "BOOT"
--% Functions for display formatting system objects
diff --git a/src/interp/fortcall.boot b/src/interp/fortcall.boot
index 43dda14a..5fcb6611 100644
--- a/src/interp/fortcall.boot
+++ b/src/interp/fortcall.boot
@@ -32,7 +32,7 @@
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"sys-macros"
+import sys_-macros
)package "BOOT"
makeVector(elts, t) ==
diff --git a/src/interp/functor.boot b/src/interp/functor.boot
index 6b283a96..5046c462 100644
--- a/src/interp/functor.boot
+++ b/src/interp/functor.boot
@@ -32,8 +32,8 @@
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"c-util"
-import '"category"
+import c_-util
+import category
)package "BOOT"
--% Domain printing
diff --git a/src/interp/g-boot.boot b/src/interp/g-boot.boot
index c9cd955f..3b5bdc56 100644
--- a/src/interp/g-boot.boot
+++ b/src/interp/g-boot.boot
@@ -32,8 +32,8 @@
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"def"
-import '"g-util"
+import def
+import g_-util
)package "BOOT"
-- @(#)g-boot.boot 2.2 89/11/02 14:44:09
diff --git a/src/interp/g-cndata.boot b/src/interp/g-cndata.boot
index d7042859..647c52a1 100644
--- a/src/interp/g-cndata.boot
+++ b/src/interp/g-cndata.boot
@@ -32,7 +32,7 @@
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"sys-macros"
+import sys_-macros
)package "BOOT"
--% Manipulation of Constructor Datat
diff --git a/src/interp/g-error.boot b/src/interp/g-error.boot
index 5e559762..dbb991ba 100644
--- a/src/interp/g-error.boot
+++ b/src/interp/g-error.boot
@@ -32,8 +32,8 @@
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"diagnostics"
-import '"g-util"
+import diagnostics
+import g_-util
)package "BOOT"
-- This file contains the error printing code used in BOOT and SPAD.
diff --git a/src/interp/g-opt.boot b/src/interp/g-opt.boot
index c6004799..e497c187 100644
--- a/src/interp/g-opt.boot
+++ b/src/interp/g-opt.boot
@@ -32,7 +32,7 @@
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"def"
+import def
)package "BOOT"
diff --git a/src/interp/g-timer.boot b/src/interp/g-timer.boot
index ef08a060..a000929a 100644
--- a/src/interp/g-timer.boot
+++ b/src/interp/g-timer.boot
@@ -32,8 +32,8 @@
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"macros"
-import '"g-util"
+import macros
+import g_-util
)package "BOOT"
--% Code instrumentation facilities
diff --git a/src/interp/g-util.boot b/src/interp/g-util.boot
index d1a5b70b..580fb329 100644
--- a/src/interp/g-util.boot
+++ b/src/interp/g-util.boot
@@ -32,8 +32,8 @@
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"macros"
-import '"sys-utility"
+import macros
+import sys_-utility
)package "BOOT"
++
diff --git a/src/interp/hashcode.boot b/src/interp/hashcode.boot
index d52781c0..692710ac 100644
--- a/src/interp/hashcode.boot
+++ b/src/interp/hashcode.boot
@@ -32,7 +32,7 @@
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"g-util"
+import g_-util
)package "BOOT"
$DomainsWithoutLisplibs ==
diff --git a/src/interp/ht-root.boot b/src/interp/ht-root.boot
index d6570961..a96de4c5 100644
--- a/src/interp/ht-root.boot
+++ b/src/interp/ht-root.boot
@@ -32,7 +32,7 @@
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"ht-util"
+import ht_-util
)package "BOOT"
$historyDisplayWidth := 120
diff --git a/src/interp/ht-util.boot b/src/interp/ht-util.boot
index c66c8449..7a6a44b1 100644
--- a/src/interp/ht-util.boot
+++ b/src/interp/ht-util.boot
@@ -32,7 +32,7 @@
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"macros"
+import macros
)package "BOOT"
-- HyperTeX Utilities for generating basic Command pages
diff --git a/src/interp/htcheck.boot b/src/interp/htcheck.boot
index 39fa49bb..18ab09d0 100644
--- a/src/interp/htcheck.boot
+++ b/src/interp/htcheck.boot
@@ -32,8 +32,8 @@
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"sys-driver"
-import '"macros"
+import sys_-driver
+import macros
)package "BOOT"
$primitiveHtCommands := '(
diff --git a/src/interp/htsetvar.boot b/src/interp/htsetvar.boot
index 59b6aff1..15524191 100644
--- a/src/interp/htsetvar.boot
+++ b/src/interp/htsetvar.boot
@@ -32,7 +32,7 @@
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"macros"
+import macros
)package "BOOT"
htsv() ==
diff --git a/src/interp/hypertex.boot b/src/interp/hypertex.boot
index f12ecb1a..ac83bc33 100644
--- a/src/interp/hypertex.boot
+++ b/src/interp/hypertex.boot
@@ -32,7 +32,7 @@
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"types"
+import types
)package "BOOT"
-- HyperTex Spad interface
diff --git a/src/interp/i-analy.boot b/src/interp/i-analy.boot
index dab675e8..2f2bc259 100644
--- a/src/interp/i-analy.boot
+++ b/src/interp/i-analy.boot
@@ -32,7 +32,7 @@
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"i-object"
+import i_-object
)package "BOOT"
$univariateDomains ==
diff --git a/src/interp/i-code.boot b/src/interp/i-code.boot
index 080e0dc0..b2d5d132 100644
--- a/src/interp/i-code.boot
+++ b/src/interp/i-code.boot
@@ -30,7 +30,7 @@
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"i-object"
+import i_-object
)package "BOOT"
--% Interpreter Code Generation Routines
diff --git a/src/interp/i-coerce.boot b/src/interp/i-coerce.boot
index aab49da6..769a5990 100644
--- a/src/interp/i-coerce.boot
+++ b/src/interp/i-coerce.boot
@@ -32,8 +32,8 @@
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"i-analy"
-import '"i-resolv"
+import i_-analy
+import i_-resolv
)package "BOOT"
$useCoerceOrCroak := true
diff --git a/src/interp/i-coerfn.boot b/src/interp/i-coerfn.boot
index 47e8ddf7..911df807 100644
--- a/src/interp/i-coerfn.boot
+++ b/src/interp/i-coerfn.boot
@@ -30,7 +30,7 @@
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"i-coerce"
+import i_-coerce
)package "BOOT"
$coerceFailure := GENSYM()
diff --git a/src/interp/i-eval.boot b/src/interp/i-eval.boot
index 6fc95c1f..08e9c0a8 100644
--- a/src/interp/i-eval.boot
+++ b/src/interp/i-eval.boot
@@ -30,7 +30,7 @@
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"i-analy"
+import i_-analy
)package "BOOT"
--% Constructor Evaluation
diff --git a/src/interp/i-funsel.boot b/src/interp/i-funsel.boot
index bce242f8..3c618749 100644
--- a/src/interp/i-funsel.boot
+++ b/src/interp/i-funsel.boot
@@ -32,7 +32,7 @@
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"i-coerfn"
+import i_-coerfn
)package "BOOT"
$constructorExposureList := '(Boolean Integer String)
diff --git a/src/interp/i-intern.boot b/src/interp/i-intern.boot
index c23bc2f6..c0a2244e 100644
--- a/src/interp/i-intern.boot
+++ b/src/interp/i-intern.boot
@@ -32,8 +32,8 @@
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"i-object"
-import '"ptrees"
+import i_-object
+import ptrees
)package "BOOT"
$useParserSrcPos := NIL
diff --git a/src/interp/i-map.boot b/src/interp/i-map.boot
index ceab55c3..b2481035 100644
--- a/src/interp/i-map.boot
+++ b/src/interp/i-map.boot
@@ -32,7 +32,7 @@
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"i-object"
+import i_-object
)package "BOOT"
--% User Function Creation and Analysis Code
diff --git a/src/interp/i-object.boot b/src/interp/i-object.boot
index 465c60d8..14255c0c 100644
--- a/src/interp/i-object.boot
+++ b/src/interp/i-object.boot
@@ -31,7 +31,7 @@
-- NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"g-util"
+import g_-util
)package "BOOT"
++ true when the interpreter should evaluate forms to values, as
diff --git a/src/interp/i-output.boot b/src/interp/i-output.boot
index e1de03d9..222d03fb 100644
--- a/src/interp/i-output.boot
+++ b/src/interp/i-output.boot
@@ -32,7 +32,7 @@
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"sys-macros"
+import sys_-macros
)package "BOOT"
--Modified JHD February 1993: see files miscout.input for some tests of this
diff --git a/src/interp/i-parser.boot b/src/interp/i-parser.boot
index e4041438..ec1ef706 100644
--- a/src/interp/i-parser.boot
+++ b/src/interp/i-parser.boot
@@ -35,8 +35,8 @@
--% to these low level facilities exists in the algrebra as domain Parser.
--%
-import '"cparse"
-import '"pf2sex"
+import cparse
+import pf2sex
)package "BOOT"
++ returns the list of tokens making up a line in the stream `s'
diff --git a/src/interp/i-resolv.boot b/src/interp/i-resolv.boot
index 7ba536ae..f8223435 100644
--- a/src/interp/i-resolv.boot
+++ b/src/interp/i-resolv.boot
@@ -30,7 +30,7 @@
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"i-object"
+import i_-object
)package "BOOT"
resolveTypeList u ==
diff --git a/src/interp/i-spec1.boot b/src/interp/i-spec1.boot
index e5ed26c5..d2170a90 100644
--- a/src/interp/i-spec1.boot
+++ b/src/interp/i-spec1.boot
@@ -32,7 +32,7 @@
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"i-analy"
+import i_-analy
)package "BOOT"
diff --git a/src/interp/i-spec2.boot b/src/interp/i-spec2.boot
index 51c34197..9e25b2a3 100644
--- a/src/interp/i-spec2.boot
+++ b/src/interp/i-spec2.boot
@@ -32,7 +32,7 @@
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"i-spec1"
+import i_-spec1
)package "BOOT"
++ Interpreter macros
diff --git a/src/interp/i-syscmd.boot b/src/interp/i-syscmd.boot
index 47f03680..b3f2433f 100644
--- a/src/interp/i-syscmd.boot
+++ b/src/interp/i-syscmd.boot
@@ -32,7 +32,7 @@
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"i-object"
+import i_-object
)package "BOOT"
--% Utility Variable Initializations
@@ -2339,7 +2339,7 @@ reportOpsFromUnitDirectly unitForm ==
sayBrightly concat('%b,formatOpType unitForm,
'%d,'"is a",'%b,kind,'%d, '"constructor.")
if not isRecordOrUnion then
- abb := getConstructorAbbreviatiomFronDB top
+ abb := getConstructorAbbreviationFromDB top
sourceFile := getConstructorSourceFileFromDB top
sayBrightly ['" Abbreviation for",:bright top,'"is",:bright abb]
verb :=
@@ -2748,7 +2748,7 @@ filterAndFormatConstructors(constrType,label,patterns) ==
whatConstructors constrType ==
-- here constrType should be one of 'category, 'domain, 'package
- MSORT [CONS(getConstructorAbbreviatiomFronDB con, STRING(con))
+ MSORT [CONS(getConstructorAbbreviationFromDB con, STRING(con))
for con in allConstructors()
| getConstructorKindFromDB con = constrType]
diff --git a/src/interp/i-toplev.boot b/src/interp/i-toplev.boot
index c6a6631e..34f6813f 100644
--- a/src/interp/i-toplev.boot
+++ b/src/interp/i-toplev.boot
@@ -32,7 +32,7 @@
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"i-analy"
+import i_-analy
)package "BOOT"
--% Top Level Interpreter Code
diff --git a/src/interp/i-util.boot b/src/interp/i-util.boot
index 37bdd0fd..e301536d 100644
--- a/src/interp/i-util.boot
+++ b/src/interp/i-util.boot
@@ -30,7 +30,7 @@
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"g-util"
+import g_-util
)package "BOOT"
--% The function for making prompts
diff --git a/src/interp/incl.boot b/src/interp/incl.boot
index f32878db..91795e30 100644
--- a/src/interp/incl.boot
+++ b/src/interp/incl.boot
@@ -32,9 +32,9 @@
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"unlisp"
-import '"cstream"
-import '"cformat"
+import unlisp
+import cstream
+import cformat
)package "BOOT"
diff --git a/src/interp/info.boot b/src/interp/info.boot
index adda1212..b4c978b8 100644
--- a/src/interp/info.boot
+++ b/src/interp/info.boot
@@ -56,7 +56,7 @@
--% The use of two representations is admitted to be clumsy
-import '"g-util"
+import g_-util
)package "BOOT"
printInfo $e ==
diff --git a/src/interp/int-top.boot b/src/interp/int-top.boot
index 645577e1..7dc611be 100644
--- a/src/interp/int-top.boot
+++ b/src/interp/int-top.boot
@@ -32,9 +32,9 @@
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"incl"
-import '"i-toplev"
-import '"unlisp"
+import incl
+import i_-toplev
+import unlisp
)package "BOOT"
ncParseAndInterpretString s ==
diff --git a/src/interp/interop.boot b/src/interp/interop.boot
index b17ba754..3ca88058 100644
--- a/src/interp/interop.boot
+++ b/src/interp/interop.boot
@@ -32,7 +32,7 @@
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"c-util"
+import c_-util
)package "BOOT"
-- note domainObjects are now (dispatchVector hashCode . domainVector)
diff --git a/src/interp/intfile.boot b/src/interp/intfile.boot
index d80dc82d..08d474fd 100644
--- a/src/interp/intfile.boot
+++ b/src/interp/intfile.boot
@@ -32,7 +32,7 @@
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"cstream"
+import cstream
)package "BOOT"
shoeInternFile(fn)==
diff --git a/src/interp/iterator.boot b/src/interp/iterator.boot
index ff88a8e8..e0fbc485 100644
--- a/src/interp/iterator.boot
+++ b/src/interp/iterator.boot
@@ -32,7 +32,7 @@
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"g-util"
+import g_-util
)package "BOOT"
--% ITERATORS
diff --git a/src/interp/lisplib.boot b/src/interp/lisplib.boot
index 562d22ed..d6fed03d 100644
--- a/src/interp/lisplib.boot
+++ b/src/interp/lisplib.boot
@@ -32,9 +32,9 @@
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"nlib"
-import '"c-util"
-import '"debug"
+import nlib
+import c_-util
+import debug
)package "BOOT"
++
diff --git a/src/interp/macex.boot b/src/interp/macex.boot
index f104f466..8aa1d6e9 100644
--- a/src/interp/macex.boot
+++ b/src/interp/macex.boot
@@ -32,7 +32,7 @@
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"ptrees"
+import ptrees
)package "BOOT"
--% Macro expansion
diff --git a/src/interp/mark.boot b/src/interp/mark.boot
index addbd96a..316c3531 100644
--- a/src/interp/mark.boot
+++ b/src/interp/mark.boot
@@ -41,7 +41,7 @@
-- Entire constructor is then assembled and prettyprinted
-import '"macros"
+import macros
)package "BOOT"
REMPROP("and",'parseTran)
diff --git a/src/interp/match.boot b/src/interp/match.boot
index 3e59dd23..31cc742b 100644
--- a/src/interp/match.boot
+++ b/src/interp/match.boot
@@ -32,7 +32,7 @@
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"sys-macros"
+import sys_-macros
)package "BOOT"
$wildCard := char "*"
diff --git a/src/interp/modemap.boot b/src/interp/modemap.boot
index f5a3b157..ebde0559 100644
--- a/src/interp/modemap.boot
+++ b/src/interp/modemap.boot
@@ -32,8 +32,8 @@
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"c-util"
-import '"info"
+import c_-util
+import info
)package "BOOT"
--% EXTERNAL ROUTINES
diff --git a/src/interp/msg.boot b/src/interp/msg.boot
index 519f2562..0e47862d 100644
--- a/src/interp/msg.boot
+++ b/src/interp/msg.boot
@@ -32,8 +32,8 @@
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"sys-macros"
-import '"astr"
+import sys_-macros
+import astr
)package "BOOT"
$erLocMsgDatabaseName := pathname '(co_-eng msgs a)
diff --git a/src/interp/msgdb.boot b/src/interp/msgdb.boot
index 63f80a76..9128d3c1 100644
--- a/src/interp/msgdb.boot
+++ b/src/interp/msgdb.boot
@@ -76,7 +76,7 @@
--% above for examples.
-import '"g-util"
+import g_-util
)package "BOOT"
--% Message Database Code and Message Utility Functions
diff --git a/src/interp/newfort.boot b/src/interp/newfort.boot
index 618f4be0..c57e0163 100644
--- a/src/interp/newfort.boot
+++ b/src/interp/newfort.boot
@@ -32,7 +32,7 @@
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"macros"
+import macros
)package "BOOT"
$fortranArrayStartingIndex := 0
diff --git a/src/interp/nruncomp.boot b/src/interp/nruncomp.boot
index a595c075..6e03833b 100644
--- a/src/interp/nruncomp.boot
+++ b/src/interp/nruncomp.boot
@@ -32,8 +32,8 @@
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"c-util"
-import '"simpbool"
+import c_-util
+import simpbool
)package "BOOT"
diff --git a/src/interp/nrunfast.boot b/src/interp/nrunfast.boot
index 2e7f293e..2fbc1c88 100644
--- a/src/interp/nrunfast.boot
+++ b/src/interp/nrunfast.boot
@@ -32,7 +32,7 @@
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"c-util"
+import c_-util
)package "BOOT"
++
diff --git a/src/interp/nrungo.boot b/src/interp/nrungo.boot
index 237b392f..3f2c4e53 100644
--- a/src/interp/nrungo.boot
+++ b/src/interp/nrungo.boot
@@ -32,7 +32,7 @@
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"c-util"
+import c_-util
)package "BOOT"
++
diff --git a/src/interp/nrunopt.boot b/src/interp/nrunopt.boot
index 12a6bb7f..4bf2d1f9 100644
--- a/src/interp/nrunopt.boot
+++ b/src/interp/nrunopt.boot
@@ -32,7 +32,7 @@
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"c-util"
+import c_-util
)package "BOOT"
--=======================================================================
diff --git a/src/interp/nruntime.boot b/src/interp/nruntime.boot
index 0275bd1e..89d2aa5f 100644
--- a/src/interp/nruntime.boot
+++ b/src/interp/nruntime.boot
@@ -32,7 +32,7 @@
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"c-util"
+import c_-util
)package "BOOT"
++ fetchs the item in the nth entry of a domain shell.
diff --git a/src/interp/osyscmd.boot b/src/interp/osyscmd.boot
index c742d09a..21ed923c 100644
--- a/src/interp/osyscmd.boot
+++ b/src/interp/osyscmd.boot
@@ -32,7 +32,7 @@
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"int-top"
+import int_-top
)package "BOOT"
diff --git a/src/interp/package.boot b/src/interp/package.boot
index d7905211..e6788af1 100644
--- a/src/interp/package.boot
+++ b/src/interp/package.boot
@@ -32,7 +32,7 @@
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"clam"
+import clam
)package "BOOT"
isPackageFunction() ==
diff --git a/src/interp/packtran.boot b/src/interp/packtran.boot
index 84d5f64f..0826ccbf 100644
--- a/src/interp/packtran.boot
+++ b/src/interp/packtran.boot
@@ -32,7 +32,7 @@
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"sys-macros"
+import sys_-macros
)package "BOOT"
rePackageTran(sex, package) ==
diff --git a/src/interp/parse.boot b/src/interp/parse.boot
index 32658cb6..0a157057 100644
--- a/src/interp/parse.boot
+++ b/src/interp/parse.boot
@@ -32,7 +32,7 @@
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"postpar"
+import postpar
)package "BOOT"
--% Transformation of Parser Output
diff --git a/src/interp/pathname.boot b/src/interp/pathname.boot
index ea349019..421c0388 100644
--- a/src/interp/pathname.boot
+++ b/src/interp/pathname.boot
@@ -32,7 +32,7 @@
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"nlib"
+import nlib
)package "BOOT"
-- This file implements the Common Lisp pathname functions for
diff --git a/src/interp/pf2sex.boot b/src/interp/pf2sex.boot
index 122edc5e..45f4cdfc 100644
--- a/src/interp/pf2sex.boot
+++ b/src/interp/pf2sex.boot
@@ -32,7 +32,7 @@
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"ptrees"
+import ptrees
)package "BOOT"
$dotdot := INTERN('"..", '"BOOT")
diff --git a/src/interp/pile.boot b/src/interp/pile.boot
index 9742602e..725993fd 100644
--- a/src/interp/pile.boot
+++ b/src/interp/pile.boot
@@ -31,7 +31,7 @@
-- NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"scan"
+import scan
)package "BOOT"
diff --git a/src/interp/posit.boot b/src/interp/posit.boot
index 7b5d3345..3dc3fa90 100644
--- a/src/interp/posit.boot
+++ b/src/interp/posit.boot
@@ -31,8 +31,8 @@
-- NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"sys-macros"
-import '"astr"
+import sys_-macros
+import astr
)package "BOOT"
diff --git a/src/interp/postpar.boot b/src/interp/postpar.boot
index 08f94ce4..afb39ff7 100644
--- a/src/interp/postpar.boot
+++ b/src/interp/postpar.boot
@@ -32,7 +32,7 @@
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"macros"
+import macros
)package "BOOT"
++ The type of parse trees.
diff --git a/src/interp/profile.boot b/src/interp/profile.boot
index bc0916ac..81c4b067 100644
--- a/src/interp/profile.boot
+++ b/src/interp/profile.boot
@@ -32,7 +32,7 @@
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"macros"
+import macros
)package "BOOT"
--$profileCompiler := true
diff --git a/src/interp/pspad1.boot b/src/interp/pspad1.boot
index f97b4396..8201b734 100644
--- a/src/interp/pspad1.boot
+++ b/src/interp/pspad1.boot
@@ -32,7 +32,7 @@
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"macros"
+import macros
)package "BOOT"
$escapeWords := ["always", "assert", "but", "define",
diff --git a/src/interp/pspad2.boot b/src/interp/pspad2.boot
index bd514f50..3be0e640 100644
--- a/src/interp/pspad2.boot
+++ b/src/interp/pspad2.boot
@@ -32,7 +32,7 @@
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"pspad1"
+import pspad1
)package "BOOT"
--======================================================================
diff --git a/src/interp/ptrees.boot b/src/interp/ptrees.boot
index 5de24af0..85cfc48a 100644
--- a/src/interp/ptrees.boot
+++ b/src/interp/ptrees.boot
@@ -47,8 +47,8 @@
-import '"posit"
-import '"serror"
+import posit
+import serror
)package "BOOT"
diff --git a/src/interp/record.boot b/src/interp/record.boot
index 25131364..8d9af571 100644
--- a/src/interp/record.boot
+++ b/src/interp/record.boot
@@ -50,8 +50,8 @@
-- results from running original fn.input file
-import '"nlib"
-import '"pathname"
+import nlib
+import pathname
)package "BOOT"
--=======================================================================
diff --git a/src/interp/rulesets.boot b/src/interp/rulesets.boot
index 7ce97720..6bb7bddf 100644
--- a/src/interp/rulesets.boot
+++ b/src/interp/rulesets.boot
@@ -32,7 +32,7 @@
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"vmlisp"
+import vmlisp
)package "BOOT"
$ruleSetsInitialized := false
diff --git a/src/interp/scan.boot b/src/interp/scan.boot
index fcebbc9c..b6e4f61b 100644
--- a/src/interp/scan.boot
+++ b/src/interp/scan.boot
@@ -32,9 +32,9 @@
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"bits"
-import '"dq"
-import '"incl"
+import bits
+import dq
+import incl
)package "BOOT"
diff --git a/src/interp/serror.boot b/src/interp/serror.boot
index 9d7dabe7..cbc98480 100644
--- a/src/interp/serror.boot
+++ b/src/interp/serror.boot
@@ -31,7 +31,7 @@
-- NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"posit"
+import posit
--% Functions to handle specific errors (mostly syntax)
diff --git a/src/interp/server.boot b/src/interp/server.boot
index 33779dc1..02525de7 100644
--- a/src/interp/server.boot
+++ b/src/interp/server.boot
@@ -32,7 +32,7 @@
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"macros"
+import macros
)package "BOOT"
-- Scratchpad-II server
diff --git a/src/interp/setvars.boot b/src/interp/setvars.boot
index fe6393d9..f2143e5e 100644
--- a/src/interp/setvars.boot
+++ b/src/interp/setvars.boot
@@ -53,8 +53,8 @@
-- its arguments, such as describeSetOutputFortran.
-import '"macros"
-import '"debug"
+import macros
+import debug
)package "BOOT"
diff --git a/src/interp/setvart.boot b/src/interp/setvart.boot
index 310fe79d..5df4ff7f 100644
--- a/src/interp/setvart.boot
+++ b/src/interp/setvart.boot
@@ -32,7 +32,7 @@
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"macros"
+import macros
)package "BOOT"
--% Table of )set options
diff --git a/src/interp/sfsfun.boot b/src/interp/sfsfun.boot
index d6b251e4..3c4cbd92 100644
--- a/src/interp/sfsfun.boot
+++ b/src/interp/sfsfun.boot
@@ -67,7 +67,7 @@
-import '"macros"
+import macros
)package "BOOT"
FloatError(formatstring,arg) ==
diff --git a/src/interp/showimp.boot b/src/interp/showimp.boot
index f6cea219..a8830f47 100644
--- a/src/interp/showimp.boot
+++ b/src/interp/showimp.boot
@@ -32,7 +32,7 @@
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"macros"
+import macros
)package "BOOT"
$returnNowhereFromGoGet := false
diff --git a/src/interp/simpbool.boot b/src/interp/simpbool.boot
index dbba7e5c..a49eb909 100644
--- a/src/interp/simpbool.boot
+++ b/src/interp/simpbool.boot
@@ -31,7 +31,7 @@
-- NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"macros"
+import macros
)package "BOOT"
simpBool x == dnf2pf reduceDnf be x
diff --git a/src/interp/slam.boot b/src/interp/slam.boot
index 62e539e8..8629a5ed 100644
--- a/src/interp/slam.boot
+++ b/src/interp/slam.boot
@@ -32,7 +32,7 @@
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"g-timer"
+import g_-timer
)package "BOOT"
++ List of compiled function names.
diff --git a/src/interp/spad-parser.boot b/src/interp/spad-parser.boot
index 8d031b8c..94cf610a 100644
--- a/src/interp/spad-parser.boot
+++ b/src/interp/spad-parser.boot
@@ -42,8 +42,8 @@
-- -- gdr/2007-11-02
--
-import '"metalex"
-import '"parse"
+import metalex
+import parse
)package "BOOT"
++ Given a pathname to a source file containing Spad code, returns
diff --git a/src/interp/sys-constants.boot b/src/interp/sys-constants.boot
index 862edb65..41759124 100644
--- a/src/interp/sys-constants.boot
+++ b/src/interp/sys-constants.boot
@@ -37,7 +37,7 @@
-- the interpreter or the compiler or both.
--
-import '"types"
+import types
)package "BOOT"
diff --git a/src/interp/sys-driver.boot b/src/interp/sys-driver.boot
index 3eda1fa6..94c982c4 100644
--- a/src/interp/sys-driver.boot
+++ b/src/interp/sys-driver.boot
@@ -36,7 +36,7 @@
-- both the OpenAxiom compiler and interpreter.
--
-import '"types"
+import types
)package "BOOT"
++ true means try starting an open server
diff --git a/src/interp/sys-globals.boot b/src/interp/sys-globals.boot
index b9ca2437..551f2b56 100644
--- a/src/interp/sys-globals.boot
+++ b/src/interp/sys-globals.boot
@@ -37,8 +37,8 @@
-- the interpreter or the compiler or both.
--
-import '"hash"
-import '"sys-constants"
+import hash
+import sys_-constants
)package "BOOT"
++ FIXME
diff --git a/src/interp/sys-os.boot b/src/interp/sys-os.boot
index f3b04862..019228d2 100644
--- a/src/interp/sys-os.boot
+++ b/src/interp/sys-os.boot
@@ -38,9 +38,9 @@
-- supporting C runtime libopen-axiom-core.
--
-import '"types"
-import '"cfuns"
-import '"sockio"
+import types
+import cfuns
+import sockio
)package "BOOT"
)if not %hasFeature KEYWORD::GCL
diff --git a/src/interp/sys-utility.boot b/src/interp/sys-utility.boot
index 2fa80cb7..1a97df33 100644
--- a/src/interp/sys-utility.boot
+++ b/src/interp/sys-utility.boot
@@ -33,8 +33,8 @@
-- This file defines some utility functions common to both the compiler
-- and interpreter.
-import '"sys-os"
-import '"vmlisp"
+import sys_-os
+import vmlisp
)package "BOOT"
diff --git a/src/interp/template.boot b/src/interp/template.boot
index 0f0cb908..77215762 100644
--- a/src/interp/template.boot
+++ b/src/interp/template.boot
@@ -31,7 +31,7 @@
-- NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"c-util"
+import c_-util
)package "BOOT"
getOperationAlistFromLisplib x ==
diff --git a/src/interp/termrw.boot b/src/interp/termrw.boot
index 6723b9d1..2edf0e3c 100644
--- a/src/interp/termrw.boot
+++ b/src/interp/termrw.boot
@@ -31,7 +31,7 @@
-- NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"macros"
+import macros
)package "BOOT"
termRW(t,R) ==
diff --git a/src/interp/topics.boot b/src/interp/topics.boot
index aee5e275..a1f717f4 100644
--- a/src/interp/topics.boot
+++ b/src/interp/topics.boot
@@ -31,7 +31,7 @@
-- NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"macros"
+import macros
)package "BOOT"
$topicsDefaults := '(
diff --git a/src/interp/trace.boot b/src/interp/trace.boot
index fa173b58..8de15dfc 100644
--- a/src/interp/trace.boot
+++ b/src/interp/trace.boot
@@ -32,7 +32,7 @@
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"debug"
+import debug
)package "BOOT"
--% Code for tracing functions
diff --git a/src/interp/types.boot b/src/interp/types.boot
index 6061252e..06b8b9b8 100644
--- a/src/interp/types.boot
+++ b/src/interp/types.boot
@@ -31,35 +31,67 @@
--
--
-import '"boot-pkg"
+import boot_-pkg
)package "BOOT"
--% Basic types used throughout Boot codes.
-%Void <=> nil
+++ Type of nothing. Bottom of the latting.
+%Void <=>
+ nil
-%Boolean <=> BOOLEAN
+++ Type of truth values.
+%Boolean <=>
+ BOOLEAN
+++ Type of 8-bit sized unsigned integer values.
%Byte <=>
UNSIGNED_-BYTE 8
+++ Type of characters -- no distinction yet.
%Char <=>
CHARACTER
-%Short <=> FIXNUM
+++ Type of fixnums.
+%Short <=>
+ FIXNUM
-%Integer <=> BIGNUM
+++ Type of unlimited precision integers.
+%Bignum <=>
+ BIGNUM
-%Number <=> NUMBER
+++ Type of single precision floating point numbers. Most of the
+++ time, this is a 32-bit datatype.
+%SingleFloat <=>
+ SINGLE_-FLOAT
-%Symbol <=> SYMBOL
+++ Type of double precision floating point numbers. Most of the time,
+++ this is a 64-bit sized datatype.
+%DoubleFloat <=>
+ DOUBLE_-FLOAT
-%String <=> STRING
+++ General type for numbers.
+%Number <=>
+ NUMBER
+++ Type of identifiers. Ideally, we want actually want to exclude
+++ Lisp oddities such as NIL and T.
+%Symbol <=>
+ SYMBOL
+
+++ The type of literal strings
+%String <=>
+ STRING
+
+++ Anything that is not a cons cell.
%Atom <=> atom
-%List <=> LIST
+++ nil or a cons cell. Ideally, this should be parameterized, but
+++ we cannot afford that luxury with Lisp.
+%List <=>
+ LIST
+++ The type of a linear homogeneous non-extensible array.
%SimpleArray a <=>
SIMPLE_-ARRAY a
diff --git a/src/interp/wi1.boot b/src/interp/wi1.boot
index 91aab6ab..db0ae6cd 100644
--- a/src/interp/wi1.boot
+++ b/src/interp/wi1.boot
@@ -32,7 +32,7 @@
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"macros"
+import macros
)package "BOOT"
-- !! do not delete the next function !
diff --git a/src/interp/wi2.boot b/src/interp/wi2.boot
index 3d65de7a..3641b7af 100644
--- a/src/interp/wi2.boot
+++ b/src/interp/wi2.boot
@@ -32,8 +32,8 @@
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import '"macros"
-import '"define"
+import macros
+import define
)package "BOOT"
compDefineFunctor1(df, m,$e,$prefix,$formalArgList) ==
diff --git a/src/lisp/core.lisp.in b/src/lisp/core.lisp.in
index c6ba6cd3..aecca91e 100644
--- a/src/lisp/core.lisp.in
+++ b/src/lisp/core.lisp.in
@@ -192,6 +192,9 @@
(|installDriver| key driver)))
+;; true if in main program booted
+(defvar |$mainBooted| nil)
+
;;
;; -*- OpenAxiom Command Line Parsing -*-
;;
@@ -465,10 +468,13 @@
(|saveCore| core-image entry-point))
#+:ecl (progn
(unless entry-point
- (setq entry-point si::top-level))
+ (setq entry-point #'si::top-level))
(c:build-program core-image
- :lisp-files (mapcar #'|compileFilePathname| lisp-files)
- :epilogue-code `(,entry-point))
+ :lisp-files (mapcar #'|compileFilePathname|
+ lisp-files)
+ :epilogue-code `(progn
+ (setq |$mainBooted| t)
+ (,entry-point)))
(|coreQuit|)))
@@ -721,12 +727,17 @@
(defparameter |$ImportedModules| nil)
;; Return true if MODULE is known to have been imported or loaded.
+(defun |getModuleInternalSymbol| (module)
+ (intern module (find-package "AxiomCore")))
+
(defun |alreadyLoaded?| (module)
- (member (namestring module) |$ImportedModules| :test #'equal))
+ (get (|getModuleInternalSymbol| (namestring module))
+ '|AxiomCore.loaded|))
-;; Remember that MODULE is imported or loaded.
-(defun |noteLoadUnit| (module)
- (pushnew (namestring module) |$ImportedModules|))
+;; Remember that MODULE was imported or loaded.
+(defun |noteUnitLoaded| (module)
+ (setf (get (|getModuleInternalSymbol| (namestring module))
+ '|AxiomCore.loaded|) t))
;; We are searching for MODULE (currently a FASL) in DIRECTORY. So, this
;; function returns a (tentative) pathname designating that module.
@@ -740,26 +751,28 @@
(if (|alreadyLoaded?| module)
module
(when (load module :if-does-not-exist nil)
- (|noteLoadUnit| module)
+ (|noteUnitLoaded| module)
module)))
(defun |loadOrElse| (module)
(if (|alreadyLoaded?| module)
module
(when (load module :if-does-not-exist :error)
- (|noteLoadUnit| module)
+ (|noteUnitLoaded| module)
module)))
(defun do-import-module (module directories)
- (unless directories
- (|fatalError|
- (format nil
- "module ~S not found in search path ~S"
- module
- |$LoadDirectories|)))
- (let ((p (|loadPathname| module (car directories))))
- (unless (|loadIfPresent| p)
- (do-import-module module (cdr directories)))))
+ (cond ((null directories)
+ (unless (and (member :ecl *features* :test #'eq) |$mainBooted|)
+ (|fatalError|
+ (format nil
+ "module ~S not found in search path ~S"
+ module
+ |$LoadDirectories|))))
+ (t
+ (let ((p (|loadPathname| module (car directories))))
+ (unless (|loadIfPresent| p)
+ (do-import-module module (cdr directories)))))))
(defun |importModule| (module)
(do-import-module module |$LoadDirectories|))