aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/interp/database.boot4
-rw-r--r--src/interp/diagnostics.boot2
-rw-r--r--src/interp/i-syscmd.boot4
-rw-r--r--src/interp/lisplib.boot32
-rw-r--r--src/interp/sys-globals.boot6
-rw-r--r--src/interp/word.boot2
6 files changed, 15 insertions, 35 deletions
diff --git a/src/interp/database.boot b/src/interp/database.boot
index f4786648..e3e266fb 100644
--- a/src/interp/database.boot
+++ b/src/interp/database.boot
@@ -314,14 +314,14 @@ buildDatabase(filemode,expensive) ==
saveUsersHashTable() ==
removeFile makeFullFilePath ['USERS,'DATABASE,'a]
- stream:= writeLib1('USERS,'DATABASE,'a)
+ stream:= writeLib('USERS,'DATABASE)
for k in MSORT HKEYS $usersTb repeat
rwrite(k, tableValue($usersTb, k), stream)
RSHUT stream
saveDependentsHashTable() ==
removeFile makeFullFilePath ['DEPENDENTS,'DATABASE,'a]
- stream:= writeLib1('DEPENDENTS,'DATABASE,'a)
+ stream:= writeLib('DEPENDENTS,'DATABASE)
for k in MSORT HKEYS $depTb repeat
rwrite(k, tableValue($depTb, k), stream)
RSHUT stream
diff --git a/src/interp/diagnostics.boot b/src/interp/diagnostics.boot
index c8a193a2..31378832 100644
--- a/src/interp/diagnostics.boot
+++ b/src/interp/diagnostics.boot
@@ -148,7 +148,7 @@ sayMSG x ==
sayBrightly1(x,$algebraOutputStream)
sayMSG2File msg ==
- file := makePathname('spadmsg,'listing,$listingDirectory)
+ file := makePathname('spadmsg,'listing,nil)
str := DEFIOSTREAM(['(MODE . OUTPUT),['FILE,:file]],255,0)
sayBrightly1(msg,str)
diff --git a/src/interp/i-syscmd.boot b/src/interp/i-syscmd.boot
index ad5d19c8..190121d2 100644
--- a/src/interp/i-syscmd.boot
+++ b/src/interp/i-syscmd.boot
@@ -2084,7 +2084,7 @@ reportOpsFromUnitDirectly0 D ==
reportOpsFromUnitDirectly D
reportOpsFromUnitDirectly1 D ==
- showFile := pathname ['SHOW,'LISTING,$listingDirectory]
+ showFile := pathname ['SHOW,'LISTING,nil]
removeFile makeFullFilePath showFile
$sayBrightlyStream: local :=
DEFIOSTREAM([['FILE,:showFile], '(MODE . OUTPUT)],255,0)
@@ -2107,7 +2107,7 @@ reportOpsFromLisplib0(unitForm,u) ==
reportOpsFromLisplib(unitForm,u)
reportOpsFromLisplib1(unitForm,u) ==
- showFile := pathname ['SHOW,'LISTING,$listingDirectory]
+ showFile := pathname ['SHOW,'LISTING,nil]
removeFile makeFullFilePath showFile
$sayBrightlyStream: local :=
DEFIOSTREAM([['FILE,:showFile], '(MODE . OUTPUT)],255,0)
diff --git a/src/interp/lisplib.boot b/src/interp/lisplib.boot
index 6695c431..89a96e01 100644
--- a/src/interp/lisplib.boot
+++ b/src/interp/lisplib.boot
@@ -208,24 +208,11 @@ readLibPathFast p ==
-- 2) file has already been checked for existence
RDEFIOSTREAM([['FILE,:p], '(MODE . INPUT)],false)
-writeLib(fn,ft) == writeLib1(fn,ft,"*")
-
-writeLib1(fn,ft,fm) == RDEFIOSTREAM [['FILE,fn,ft,fm],'(MODE . OUTPUT)]
+writeLib(fn,ft) == RDEFIOSTREAM [['FILE,fn,ft,nil],'(MODE . OUTPUT)]
lisplibWrite(prop,val,filename) ==
-- this may someday not write nil keys, but it will now
- rwrite128(prop,val,filename)
-
-rwrite128(key,value,stream) ==
- rwrite(key,value,stream)
-
-evalAndRwriteLispForm(key,form) ==
- eval form
- rwriteLispForm(key,form)
-
-rwriteLispForm(key,form) ==
- rwrite( key,form,$libFile)
- LAM_,FILEACTQ(key,form)
+ rwrite(prop,val,filename)
--% Loading
@@ -406,9 +393,8 @@ compConLib1(fun,infileOrNil,outfileOrNil,auxOp,editFlag,traceFlag) ==
infile:= infileOrNil or getFunctionSourceFile fun or
throwKeyedMsg("S2IL0004",[fun])
$editFile := infile
- outfile := outfileOrNil or
- [libName,'OUTPUT,$listingDirectory] --always QUIET
- removeFile makeFullFilePath [libName,'OUTPUT,$listingDirectory]
+ outfile := outfileOrNil or [libName,'OUTPUT,nil] --always QUIET
+ removeFile makeFullFilePath [libName,'OUTPUT,nil]
outstream:= DEFSTREAM(outfile,'OUTPUT)
val:= _/D_,2_,LIB(fun,infile,outstream,auxOp,editFlag,traceFlag)
val
@@ -440,7 +426,7 @@ compDefineLisplib(db,df:=["DEF",[op,:.],:.],m,e,fal,fn) ==
finally
RSHUT $libFile
if ok then lisplibDoRename(libName)
- filearg := makeFullFilePath [libName,$spadLibFT,$libraryDirectory]
+ filearg := makeFullFilePath [libName,$spadLibFT,nil]
RPACKFILE filearg
freshLine $algebraOutputStream
sayMSG fillerSpaces(72,char "-")
@@ -461,9 +447,9 @@ compileDocumentation(ctor,libName) ==
['dummy, $EmptyMode, $e]
initializeLisplib libName ==
- removeFile makeFullFilePath [libName,'ERRORLIB,$libraryDirectory]
+ removeFile makeFullFilePath [libName,'ERRORLIB,nil]
resetErrorCount()
- $libFile := writeLib1(libName,'ERRORLIB,$libraryDirectory)
+ $libFile := writeLib(libName,'ERRORLIB)
addCompilerOption('FILE,$libFile)
mkCtorDBForm ctor ==
@@ -586,8 +572,8 @@ finalizeLisplib(db,libName) ==
true
lisplibDoRename(libName) ==
- _$REPLACE([libName,$spadLibFT,$libraryDirectory],
- [libName,'ERRORLIB,$libraryDirectory])
+ _$REPLACE([libName,$spadLibFT,nil],
+ [libName,'ERRORLIB,nil])
lisplibError(cname,fname,type,cn,fn,typ,error) ==
sayMSG bright ['" Illegal ",$spadLibFT]
diff --git a/src/interp/sys-globals.boot b/src/interp/sys-globals.boot
index 282d5969..ab28b9d0 100644
--- a/src/interp/sys-globals.boot
+++ b/src/interp/sys-globals.boot
@@ -284,12 +284,6 @@ $insideCoerceInteractive := false
$insideEvalMmCondIfTrue := false
++
-$libraryDirectory := "A"
-
-++
-$listingDirectory := "A"
-
-++
$UserLevel := "development"
++
diff --git a/src/interp/word.boot b/src/interp/word.boot
index 76b9ad16..87c991f2 100644
--- a/src/interp/word.boot
+++ b/src/interp/word.boot
@@ -64,7 +64,7 @@ writeFunctionTables(filemode) ==
writeFunctionTable(filemode,name,dicts) ==
removeFile makeFullFilePath makePathname(name,'DATABASE,filemode)
- stream:= writeLib1(name,'DATABASE,filemode)
+ stream:= writeLib1(name,'DATABASE)
if not $functionTable then
$functionTable:= buildFunctionTable dicts
for [key,:val] in entries $functionTable repeat