Misc cleanup.

10 files changed, 19 insertions, 24 deletions

diff --git a/src/interp/fortcall.boot b/src/interp/fortcall.boot
index 8184539d..a906d3b8 100644
--- a/src/interp/fortcall.boot
+++ b/src/interp/fortcall.boot
@@ -39,11 +39,10 @@ namespace BOOT
 $nagMessages := nil
 
 makeVector(elts, t) ==
-  MAKE_-ARRAY(#elts, KEYWORD::ELEMENT_-TYPE, t or true,
-              KEYWORD::INITIAL_-CONTENTS, elts)
+  MAKE_-ARRAY(#elts, element_-type <- t or true, initial_-contents <- elts)
 
 makeList(n, e) ==
-  MAKE_-LIST(n, KEYWORD::INITIAL_-ELEMENT, e)
+  MAKE_-LIST(n, initial_-element <- e)
 
 makeFort(name,args,decls,results,returnType,aspInfo) ==
   -- Create an executable Fortran file to call a given library function,
diff --git a/src/interp/g-util.boot b/src/interp/g-util.boot
index 2fe0791b..271279ec 100644
--- a/src/interp/g-util.boot
+++ b/src/interp/g-util.boot
@@ -1104,7 +1104,7 @@ queryVar? var ==
 ++ Returns a newly allocated domain shell (a simple vector) of length `n'.
 newShell: %Short -> SIMPLE_-ARRAY
 newShell n ==
-  MAKE_-ARRAY(n,KEYWORD::INITIAL_-ELEMENT,nil)
+  MAKE_-ARRAY(n,initial_-element <- nil)
 
 -- Push into the BOOT package when invoked in batch mode.
 AxiomCore::$sysScope := '"BOOT"
diff --git a/src/interp/i-output.boot b/src/interp/i-output.boot
index 25d53edc..ccbcb385 100644
--- a/src/interp/i-output.boot
+++ b/src/interp/i-output.boot
@@ -551,7 +551,7 @@ print(x,domain) ==
 ++ Write x as an asgard form on the standard output.
 outputAsgardForm(x,t) ==
   f := ['%OBJECT,x,devaluate t]
-  WRITE(f,KEYWORD::STREAM,$algebraOutputStream)
+  WRITE(f,stream <- $algebraOutputStream)
   freshLine $algebraOutputStream
 
 mathprintWithNumber(x,t) ==
@@ -1224,7 +1224,7 @@ maprin x ==
   if $demoFlag=true then recordOrCompareDemoResult x
   CATCH('output,maprin0 x)
   $leanMode and 
-    WRITE($RecordSeparator,KEYWORD::STREAM,$algebraOutputStream)
+    WRITE($RecordSeparator,stream <- $algebraOutputStream)
   nil
 
 maprin0 x ==
diff --git a/src/interp/lexing.boot b/src/interp/lexing.boot
index 9cee8ad5..a5356225 100644
--- a/src/interp/lexing.boot
+++ b/src/interp/lexing.boot
@@ -128,7 +128,7 @@ getIntegerInRadix(rd,buf,r) ==
     d = nil => leave nil
     d >= r => SPAD__SYNTAX__ERROR rd
     advanceChar! rd
-  PARSE_-INTEGER(buf,KEYWORD::START,mark,KEYWORD::RADIX,r)
+  PARSE_-INTEGER(buf,start <- mark,radix <- r)
 
 radixSuffix? c ==
   c = char "r" or c = char "R"
diff --git a/src/interp/pathname.boot b/src/interp/pathname.boot
index fa30d4dc..c1b9d868 100644
--- a/src/interp/pathname.boot
+++ b/src/interp/pathname.boot
@@ -71,7 +71,7 @@ pathnameTypeId p ==
  
 pathnameDirectory p ==
    null p => nil
-   NAMESTRING MAKE_-PATHNAME(KEYWORD::DIRECTORY,PATHNAME_-DIRECTORY pathname p)
+   NAMESTRING MAKE_-PATHNAME(directory <- PATHNAME_-DIRECTORY pathname p)
  
 isExistingFile f ==
 --  p := pathname f
diff --git a/src/interp/pf2sex.boot b/src/interp/pf2sex.boot
index ecd19406..5d5bc9f8 100644
--- a/src/interp/pf2sex.boot
+++ b/src/interp/pf2sex.boot
@@ -183,10 +183,9 @@ pfLiteral2Sex pf ==
   type = 'integer =>
     txt := pfLiteralString pf
     MULTIPLE_-VALUE_-BIND(part1 pos1,
-      readInteger(txt,KEYWORD::JUNK_-ALLOWED,true),
+      readInteger(txt,junk_-allowed <- true),
         if pos1 = #txt then part1
-        else readInteger(subString(txt,pos1+1),
-               KEYWORD::RADIX, part1))
+        else readInteger(subString(txt,pos1+1), radix <- part1))
   type = 'string or type = 'char =>
     pfLiteralString pf
   type = 'float =>
diff --git a/src/interp/spad-parser.boot b/src/interp/spad-parser.boot
index 1e33482b..4fc465d3 100644
--- a/src/interp/spad-parser.boot
+++ b/src/interp/spad-parser.boot
@@ -382,7 +382,7 @@ floatExponent x ==
     s := symbolName x
     charUpcase stringChar(s,0) = char "E" and #s > 1
       and (and/[DIGITP stringChar(s,i) for i in 1..maxIndex s]) =>
-        READ_-FROM_-STRING(s,true,nil,KEYWORD::START,1)
+        READ_-FROM_-STRING(s,true,nil,start <- 1)
     nil
   nil
 
diff --git a/src/interp/sys-driver.boot b/src/interp/sys-driver.boot
index 0ab72349..f6a8e7de 100644
--- a/src/interp/sys-driver.boot
+++ b/src/interp/sys-driver.boot
@@ -98,10 +98,9 @@ systemDatabaseDirectory() ==
 ++ Load list of exposed categories, domains, and packages.
 ++ User-specified list takes precedence over system wide list.
 loadExposureGroupData() ==
-  LOAD('"./exposed", KEYWORD::VERBOSE,false,
-    KEYWORD::IF_-DOES_-NOT_-EXIST,nil) => "done"
+  LOAD('"./exposed", verbose <- false, if_-does_-not_-exist <- nil) => "done"
   LOAD(getSystemModulePath '"exposed",
-    KEYWORD::VERBOSE,false,KEYWORD::IF_-DOES_-NOT_-EXIST,nil) => "done"
+     verbose <- false,if_-does_-not_-exist <- nil) => "done"
   "failed"
 
 ++ 
diff --git a/src/interp/sys-os.boot b/src/interp/sys-os.boot
index c4f7209d..7c36ee50 100644
--- a/src/interp/sys-os.boot
+++ b/src/interp/sys-os.boot
@@ -208,7 +208,7 @@ runProgram(prog,args) ==
 )if %hasFeature KEYWORD::GCL
   SYSTEM::SYSTEM(strconc/[prog,:[:['" ",a] for a in args]])
 )elseif %hasFeature KEYWORD::CLISP
-  EXT::RUN_-PROGRAM(prog,KEYWORD::ARGUMENTS,args)
+  EXT::RUN_-PROGRAM(prog,arguments <- args)
 )elseif %hasFeature KEYWORD::SBCL
   SB_-EXT::RUN_-PROGRAM(prog,args)
 )else
diff --git a/src/interp/sys-utility.boot b/src/interp/sys-utility.boot
index 650fcf7c..008f07a0 100644
--- a/src/interp/sys-utility.boot
+++ b/src/interp/sys-utility.boot
@@ -243,7 +243,7 @@ hashTable cmp ==
     cmp = 'EQL => function scalarEq?
     cmp = 'EQUAL => function EQUAL
     error '"bad arg to hashTable"
-  MAKE_-HASH_-TABLE(KEYWORD::TEST,testFun)
+  MAKE_-HASH_-TABLE(test <- testFun)
 
 --% Trees to Graphs
 
@@ -280,12 +280,10 @@ $ClosedIOMode == KEYWORD::CLOSED
 ++ if something went wrong.  This function is used by the Algebra.
 openBinaryFile(file,mode) ==
   mode = $InputIOMode =>
-    OPEN(file,KEYWORD::DIRECTION,mode,
-      KEYWORD::IF_-DOES_-NOT_-EXIST,nil,
-        KEYWORD::ELEMENT_-TYPE,"%Byte")
-  OPEN(file,KEYWORD::DIRECTION,mode,
-    KEYWORD::IF_-EXISTS,KEYWORD::SUPERSEDE,
-      KEYWORD::ELEMENT_-TYPE,"%Byte")
+    OPEN(file,direction <- mode,
+      if_-does_-not_-exist <- nil,element_-type <- "%Byte")
+  OPEN(file,direction <- mode,
+    if_-exists <- KEYWORD::SUPERSEDE,element_-type <- "%Byte")
 
 ++ Write byte `b' to output binary file `ofile'.
 writeByteToFile(ofile,b) ==
@@ -320,7 +318,7 @@ writeByteToStreamSocket(s,b) ==
 
 --%
 makeByteBuffer(n,b == 0) ==
-  MAKE_-ARRAY(n,KEYWORD::ELEMENT_-TYPE,"%Byte",KEYWORD::INITIAL_-ELEMENT,b)
+  MAKE_-ARRAY(n,element_-type <- "%Byte",initial_-element <- b)
 
 ++ Return the position of the symbol `s' in the list `l', if present.
 ++ Otherwise return nil.