Replace DELETE-FILE with removeFile.

8 files changed, 25 insertions, 35 deletions

diff --git a/src/interp/br-saturn.boot b/src/interp/br-saturn.boot
index 4d0987ce..dd290317 100644
--- a/src/interp/br-saturn.boot
+++ b/src/interp/br-saturn.boot
@@ -1713,16 +1713,6 @@ purgeLocalLibdb() ==   --called by the user through a clear command?
   $newConstructorList := nil
   removeFile '"libdb.text"
 
---moveFile(before,after) ==
---  $saturn => MOVE_-FILE(before, after)
---  RENAME_-FILE(before, after)
---  --obey strconc('"mv ", before, '" ", after)
-
--- deleted JHD/MCD, since already one in pathname.boot
---removeFile fn ==
---  $saturn => DELETE_-FILE fn
---  obey strconc('"rm ",fn)
-
 --=======================================================================
 --            from DAASE.LISP
 --=======================================================================
diff --git a/src/interp/fortcall.boot b/src/interp/fortcall.boot
index a906d3b8..f45a82c3 100644
--- a/src/interp/fortcall.boot
+++ b/src/interp/fortcall.boot
@@ -720,9 +720,9 @@ protectedNagCall(objFiles,nfile,data,results) ==
 
 
 cleanUpAfterNagman(f1,f2,listf)==
-  PROBE_-FILE(f1) and DELETE_-FILE(f1)
-  PROBE_-FILE(f2) and DELETE_-FILE(f2)
-  for fn in listf repeat PROBE_-FILE(fn) and DELETE_-FILE(fn)
+  removeFile f1
+  removeFile f2
+  for fn in listf repeat removeFile fn
 
 sendNagmanErrorSignal()==
 -- excite nagman's signal handler!
diff --git a/src/interp/i-syscmd.boot b/src/interp/i-syscmd.boot
index ccc2976d..fb075d75 100644
--- a/src/interp/i-syscmd.boot
+++ b/src/interp/i-syscmd.boot
@@ -1809,7 +1809,7 @@ writify ob ==
                 sameObject?(ob, %nonNullStream) => ['WRITIFIED!!, 'NONNULLSTREAM]
                 ob
             float? ob =>
-                ob = READ_-FROM_-STRING STRINGIMAGE ob => ob
+                ob = readLispFromString STRINGIMAGE ob => ob
                 ['WRITIFIED!!, 'FLOAT, ob,:
                    MULTIPLE_-VALUE_-LIST INTEGER_-DECODE_-FLOAT ob]
             ob
@@ -2819,7 +2819,7 @@ stripLisp str ==
 
 
 nplisp str ==
-  $ans := eval READ_-FROM_-STRING str
+  $ans := eval readLispFromString str
   formatToStdout('"~&Value = ~S~%", $ans)
 
 npsystem(unab, str) ==
@@ -2843,7 +2843,7 @@ tokenSystemCommand(unabr, tokList) ==
 tokTran tok ==
   string? tok =>
     #tok = 0 => nil
-    isIntegerString tok => READ_-FROM_-STRING tok
+    isIntegerString tok => readLispFromString tok
     stringChar(tok,0) = char "_"" => subSequence(tok, 1, #tok-1)
     makeSymbol tok
   tok
diff --git a/src/interp/pf2atree.boot b/src/interp/pf2atree.boot
index a3ea8e70..10fb2217 100644
--- a/src/interp/pf2atree.boot
+++ b/src/interp/pf2atree.boot
@@ -419,15 +419,15 @@ pfSequence2Atree0(seqList, pf) ==
 --    mantPart :=
 --      eIndex => subSequence(num, 0, eIndex)
 --      num
---    expPart := (eIndex => READ_-FROM_-STRING subSequence(num, eIndex+1); 0)
+--    expPart := (eIndex => readLispFromString subSequence(num, eIndex+1); 0)
 --    dotIndex := findChar(char ".", mantPart)
 --    intPart :=
---      dotIndex => READ_-FROM_-STRING subSequence(mantPart, 0, dotIndex)
---      READ_-FROM_-STRING mantPart
+--      dotIndex => readLispFromString subSequence(mantPart, 0, dotIndex)
+--      readLispFromString mantPart
 --    fracPartString :=
 --      dotIndex => subSequence(mantPart, dotIndex+1)
 --      '"0"
---    bfForm := MAKE_-FLOAT(intPart, READ_-FROM_-STRING fracPartString,
+--    bfForm := MAKE_-FLOAT(intPart, readLispFromString fracPartString,
 --      # fracPartString, expPart)
 --    [., frac, :exp] := bfForm
 --    [["$elt", intNewFloat(), 'float], frac, exp, 10]
diff --git a/src/interp/pf2sex.boot b/src/interp/pf2sex.boot
index 5d5bc9f8..38bb44d1 100644
--- a/src/interp/pf2sex.boot
+++ b/src/interp/pf2sex.boot
@@ -386,15 +386,15 @@ float2Sex num ==
   mantPart :=
     eIndex => subSequence(num, 0, eIndex)
     num
-  expPart := (eIndex => READ_-FROM_-STRING subSequence(num, eIndex+1); 0)
+  expPart := (eIndex => readLispFromString subSequence(num, eIndex+1); 0)
   dotIndex := findChar(char ".", mantPart)
   intPart :=
-    dotIndex => READ_-FROM_-STRING subSequence(mantPart, 0, dotIndex)
-    READ_-FROM_-STRING mantPart
+    dotIndex => readLispFromString subSequence(mantPart, 0, dotIndex)
+    readLispFromString mantPart
   fracPartString :=
     dotIndex => subSequence(mantPart, dotIndex+1)
     '"0"
-  bfForm := MAKE_-FLOAT(intPart, READ_-FROM_-STRING fracPartString,
+  bfForm := MAKE_-FLOAT(intPart, readLispFromString fracPartString,
     # fracPartString, expPart)
   $useBFasDefault =>
     [., frac, :exp] := bfForm
diff --git a/src/interp/record.boot b/src/interp/record.boot
index 66660a5a..e5b60953 100644
--- a/src/interp/record.boot
+++ b/src/interp/record.boot
@@ -88,12 +88,12 @@ inputFile2RecordFile(pathname,:option) ==
   $mkTestOutputStack: local := nil
   $mkTestOutputType: local := nil
   $currentLine: local := nil
-  if isExistingFile opathname then DELETE_-FILE opathname
-  $testStream := MAKE_-OUTSTREAM opathname
+  removeFile opathname
+  $testStream := outputTextFile opathname
   CATCH($SpadReaderTag,_/READ(pathname,nil))
   --for trailing system commands
   if not null $currentLine then recordAndPrintTest '(ForSystemCommands)
-  SHUT $testStream
+  closeFile $testStream
   opathname 
 --=======================================================================
 --                Function for Displaying a `record' file
@@ -180,16 +180,16 @@ testInput2Output(lines,n) ==
   [prefix2String typ,:output]
 
 evaluateLines lines ==
-  file := MAKE_-OUTSTREAM '"/tmp/temp.input"
+  file := outputTextFile '"/tmp/temp.input"
   for line in lines repeat
     stringPrefix?('")r",line) => 'skip
     stringPrefix?('")undo )redo",line) => 'skip
     writeLine(line, file)
-  SHUT file
+  closeFile file
   $editFile: local := '"/tmp/temp.input"
   _/RF()
     -- can't use $editFile since it might be reset
-  DELETE_-FILE '"/tmp/temp.input"
+  removeFile '"/tmp/temp.input"
 
 
 wasIs(old,new,:typePart) ==
@@ -214,11 +214,11 @@ htFile2InputFile(pathname,:option) ==
   opath := KAR option or pathname
   odirect := pathnameDirectory opath
   opathname := htMkPath(odirect,ifn,'"input")
-  if isExistingFile opathname then DELETE_-FILE opathname
+  removeFile opathname
   $htStream : local := MAKE_-INSTREAM pathname
   alist := [[htGetPageName u,:htGetSpadCommands()] 
               while (u := htExampleFind '"\begin{page}")]
-  SHUT $htStream
+  closeFile $htStream
   outStream := MAKE_-OUTSTREAM opathname
   for [pageName,:commands] in alist repeat
     writeString('"-- ",outStream)
@@ -229,7 +229,7 @@ htFile2InputFile(pathname,:option) ==
       PRINC(htCommandToInputLine x,outStream)
       writeNewline outStream
     writeNewline outStream
-  SHUT outStream
+  closeFile outStream
   opathname
  
 htCommandToInputLine s == fn(s,0) where fn(s,init) ==
diff --git a/src/interp/server.boot b/src/interp/server.boot
index e3aba16a..0245129e 100644
--- a/src/interp/server.boot
+++ b/src/interp/server.boot
@@ -79,7 +79,7 @@ serverReadLine(stream) ==
      action = $LispCommand =>
        $NeedToSignalSessionManager := true
        buf := sockGetString $MenuServer
-       form := unescapeStringsInForm READ_-FROM_-STRING buf
+       form := unescapeStringsInForm readLispFromString buf
        protectedEVAL form
      action = $QuietSpadCommand =>
        $NeedToSignalSessionManager := true
diff --git a/src/interp/spad-parser.boot b/src/interp/spad-parser.boot
index 27c1b371..2c37ee6e 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,start <- 1)
+        readLispFromString(s,true,nil,start <- 1)
     nil
   nil