* 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.

7 files changed, 22 insertions, 20 deletions

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|)))