* ast.boot.pamphlet (bfGetOldBootName): New.

	(bfSameMeaning): Likewise.
	(bfReName): Use them.
	* parser.boot.pamphlet (bpCompare): Tidy.
	* tokens.boot.pamphlet: Rename NE to SHOENE.  Record Old Boot
	renaming tokens. Likewise for tokens with same meaning.
	* translator.boot.pamphlet (AxiomCore::%sysInit): New.
	($translatingOldBoot): Likewise.

1 files changed, 91 insertions, 6 deletions

diff --git a/src/boot/tokens.boot.pamphlet b/src/boot/tokens.boot.pamphlet
index 4e429a81..482729a8 100644
--- a/src/boot/tokens.boot.pamphlet
+++ b/src/boot/tokens.boot.pamphlet
@@ -205,7 +205,7 @@ shoeKeyWords := [  _
             ['">=","GE" ], _
             ['"=", "SHOEEQ"], _
             ['"^", "NOT"], _
-            ['"^=","NE" ], _
+            ['"^=","SHOENE" ], _
             ['"..","SEG" ], _
             ['"#", "LENGTH"], _
             ['"=>","EXIT" ], _
@@ -318,7 +318,7 @@ for i in [      _
         ["GT"    ,">"], _
         ["LE"   ,"<="], _
         ["GE"   ,">="], _
-        ["NE"  ,"^="] _
+        ["SHOENE"  ,"^="] _
                    ]_
        repeat SETF (GET(CAR i,'SHOEINF),CADR i)
  
@@ -402,10 +402,95 @@ for i in [ _
   ["LE",             "<="], _
   ["GE",              ">="], _
   ["SHOEEQ",        "EQUAL"], _
-  ["NE",              "/="], _
+  ["SHOENE",        "/="], _
   ["T",               "T$"]   _
                                 ]
        repeat SETF (GET(CAR i,'SHOERENAME),CDR i)
+
+-- For code written in `Old Boot', we would like to warn about
+-- the difference in renaming.
+for i in [ _
+  ["PLUS", "PLUS"], _
+  ["and", "AND"], _
+  ["append", "APPEND"], _
+  ["apply", "APPLY"], _
+  ["atom", "ATOM"], _
+  ["brace", "REMDUP"], _
+  ["car", "CAR"], _
+  ["cdr", "CDR"], _
+  ["cons", "CONS"], _
+  ["copy", "COPY"], _
+  ["croak", "CROAK"], _
+  ["drop", "DROP"], _
+  ["exit", "EXIT"], _
+  ["false", "NIL"], _
+  ["first", "CAR"], _
+  ["genvar", "GENVAR"], _
+  ["in", "member"], _
+  ["is", "IS"], _
+  ["lastNode", "LASTNODE"], _
+  ["list", "LIST"], _
+  ["mkpf", "MKPF"], _
+  ["nconc", "NCONC"], _
+  ["nil", "NIL"], _
+  ["not", "NULL"], _
+  ["NOT", "NULL"], _
+  ["nreverse", "NREVERSE"], _
+  ["null", "NULL"], _
+  ["or", "OR"], _
+  ["otherwise", "T"], _
+  ["removeDuplicates", "REMDUP"], _
+  ["rest", "CDR"], _
+  ["return", "RETURN"], _
+  ["reverse", "REVERSE"], _
+  ["setDifference", "SETDIFFERENCE"], _
+  ["setIntersection", "intersection"], _
+  ["setPart", "SETELT"], _
+  ["setUnion", "union"], _
+  ["size", "SIZE"], _
+  ["strconc", "STRCONC"], _
+  ["substitute", "MSUBST"], _
+  ["SUBST", "MSUBST"], _
+  ["take", "TAKE"], _
+  ["true", "T"], _
+  ["where", "WHERE"], _
+  ["TIMES", "TIMES"], _
+  ["POWER", "EXPT"], _
+  ["NOT", "NULL"], _
+  ["SHOENE", "NEQUAL"], _
+  ["MINUS", "SPADDIFFERENCE"], _
+  ["SLASH", "QUOTIENT"], _
+  ["=", "EQUAL"], _
+  ["SHOEEQ", "BOOT-EQUAL"], _
+  ["ASSOC",  "assoc"], _
+  ["DELETE", "delete"], _
+  ["GET", "GETL"], _
+  ["INTERSECTION", "intersection"], _
+  ["LAST", "last"], _
+  ["MEMBER", "member"], _
+  ["RASSOC", "rassoc"], _
+  ["READ", "VMREAD"], _
+  ["READ-LINE", "read-line"], _
+  ["REDUCE", "SPADREDUCE"], _
+  ["REMOVE", "remove"], _
+  ["BAR", "SUCHTHAT"], _
+  ["T", "T$"], _
+  ["IN", "member"], _
+  ["UNION", "union"]_
+                     ]
+  repeat SETF (GET(CAR i,'OLD_-BOOT),CDR i)
+
+-- The following difference in renaming are verified to be OK.
+for i in [ _
+  "LT", "LE", _
+  "GT", "GE", _
+  "TIMES", "PLUS", _
+  "MINUS", "function",_
+  "PAIRP"
+   ]
+  repeat SETF(GET(i, 'RENAME_-OK), true)
+
+  
  
 for i in [ _
   ["setName",               0] , _
@@ -470,7 +555,7 @@ for i in [ _
             (LIST "**" 'POWER) (LIST "/" 'SLASH) (LIST "+" 'PLUS)
             (LIST "-" 'MINUS) (LIST "<" 'LT) (LIST ">" 'GT)
             (LIST "<=" 'LE) (LIST ">=" 'GE) (LIST "=" 'SHOEEQ)
-            (LIST "^" 'NOT) (LIST "^=" 'NE) (LIST ".." 'SEG)
+            (LIST "^" 'NOT) (LIST "^=" 'SHOENE) (LIST ".." 'SEG)
             (LIST "#" 'LENGTH) (LIST "=>" 'EXIT) (LIST ":=" 'BEC)
             (LIST "==" 'DEF) (LIST "==>" 'MDEF) (LIST "<=>" 'TDEF)
             (LIST "(" 'OPAREN) (LIST ")" 'CPAREN) (LIST "(|" 'OBRACK)
@@ -651,7 +736,7 @@ for i in [ _
              (LIST 'IS '|is|) (LIST 'ISNT '|isnt|) (LIST 'AND '|and|)
              (LIST 'OR '|or|) (LIST 'SLASH '/) (LIST 'POWER '**)
              (LIST 'MINUS '-) (LIST 'LT '<) (LIST 'GT '>)
-             (LIST 'LE '<=) (LIST 'GE '>=) (LIST 'NE '^=))
+             (LIST 'LE '<=) (LIST 'GE '>=) (LIST 'SHOENE '^=))
        NIL))))
 
 (EVAL-WHEN (:EXECUTE :LOAD-TOPLEVEL)
@@ -709,7 +794,7 @@ for i in [ _
              (LIST '|true| 'T) (LIST 'PLUS '+) (LIST 'MINUS '-)
              (LIST 'TIMES '*) (LIST 'POWER 'EXPT) (LIST 'SLASH '/)
              (LIST 'LT '<) (LIST 'GT '>) (LIST 'LE '<=) (LIST 'GE '>=)
-             (LIST 'SHOEEQ 'EQUAL) (LIST 'NE '/=) (LIST 'T 'T$))
+             (LIST 'SHOEEQ 'EQUAL) (LIST 'SHOENE '/=) (LIST 'T 'T$))
        NIL))))
 
 (EVAL-WHEN (:EXECUTE :LOAD-TOPLEVEL)