aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/boot/ast.boot2
-rw-r--r--src/boot/strap/ast.clisp2
-rw-r--r--src/interp/br-con.boot8
-rw-r--r--src/interp/c-util.boot6
-rw-r--r--src/interp/define.boot2
-rw-r--r--src/interp/g-opt.boot2
-rw-r--r--src/interp/ht-util.boot8
-rw-r--r--src/interp/i-coerce.boot4
-rw-r--r--src/interp/i-eval.boot4
-rw-r--r--src/interp/i-syscmd.boot6
-rw-r--r--src/interp/i-toplev.boot2
-rw-r--r--src/interp/int-top.boot12
-rw-r--r--src/interp/msgdb.boot10
-rw-r--r--src/interp/newfort.boot70
-rw-r--r--src/interp/nrunfast.boot4
-rw-r--r--src/interp/record.boot2
-rw-r--r--src/interp/server.boot18
17 files changed, 79 insertions, 83 deletions
diff --git a/src/boot/ast.boot b/src/boot/ast.boot
index f6819e08..32d6af8d 100644
--- a/src/boot/ast.boot
+++ b/src/boot/ast.boot
@@ -461,7 +461,6 @@ bfForin(lhs,U)==
bfLocal(a,b)==
b is "FLUID" => compFluid a
- b is "fluid" => compFluid a
b is "local" => compFluid a
a
@@ -1007,7 +1006,6 @@ bfTagged(a,b)==
$op = nil => %Signature(a,b) -- surely a toplevel decl
symbol? a =>
b is "FLUID" => bfLET(compFluid a,nil)
- b is "fluid" => bfLET(compFluid a,nil)
b is "local" => bfLET(compFluid a,nil)
$typings := [["TYPE",b,a],:$typings]
a
diff --git a/src/boot/strap/ast.clisp b/src/boot/strap/ast.clisp
index 4d3fb2a8..c43b3c3e 100644
--- a/src/boot/strap/ast.clisp
+++ b/src/boot/strap/ast.clisp
@@ -696,7 +696,6 @@
(DEFUN |bfLocal| (|a| |b|)
(COND
((EQ |b| 'FLUID) (|compFluid| |a|))
- ((EQ |b| '|fluid|) (|compFluid| |a|))
((EQ |b| '|local|) (|compFluid| |a|))
(T |a|)))
@@ -1936,7 +1935,6 @@
((SYMBOLP |a|)
(COND
((EQ |b| 'FLUID) (|bfLET| (|compFluid| |a|) NIL))
- ((EQ |b| '|fluid|) (|bfLET| (|compFluid| |a|) NIL))
((EQ |b| '|local|) (|bfLET| (|compFluid| |a|) NIL))
(T (SETQ |$typings| (CONS (LIST 'TYPE |b| |a|) |$typings|)) |a|)))
(T (LIST 'THE |b| |a|))))
diff --git a/src/interp/br-con.boot b/src/interp/br-con.boot
index 00548b03..9b781471 100644
--- a/src/interp/br-con.boot
+++ b/src/interp/br-con.boot
@@ -674,13 +674,13 @@ dbMkEvalable form ==
mkEvalable form
topLevelInterpEval x ==
- $ProcessInteractiveValue: fluid := true
- $noEvalTypeMsg: fluid := true
+ $ProcessInteractiveValue: local := true
+ $noEvalTypeMsg: local := true
processInteractive(x,nil)
kisValidType typeForm ==
- $ProcessInteractiveValue: fluid := true
- $noEvalTypeMsg: fluid := true
+ $ProcessInteractiveValue: local := true
+ $noEvalTypeMsg: local := true
CATCH($SpadReaderTag, processInteractive(typeForm,nil))
is [m,:t] and member(m,$LangSupportTypes) =>
kCheckArgumentNumbers t and t
diff --git a/src/interp/c-util.boot b/src/interp/c-util.boot
index 3184e728..4a972ca1 100644
--- a/src/interp/c-util.boot
+++ b/src/interp/c-util.boot
@@ -1651,9 +1651,9 @@ removeToplevelRETURN_-FROM body ==
++ x has the strucrure: <name, parms, stmt1, ...>
transformToBackendCode: %Form -> %Code
transformToBackendCode x ==
- $FluidVars: fluid := nil
- $LocalVars: fluid := nil
- $SpecialVars: fluid := nil
+ $FluidVars: local := nil
+ $LocalVars: local := nil
+ $SpecialVars: local := nil
x := middleEndExpand x
massageBackendCode CDDR x
body := skipDeclarations CDDR x
diff --git a/src/interp/define.boot b/src/interp/define.boot
index 5d3772e0..2c5bc83b 100644
--- a/src/interp/define.boot
+++ b/src/interp/define.boot
@@ -884,7 +884,7 @@ compDefineFunctor(df,m,e,prefix,fal) ==
$domainShell: local := nil -- holds the category of the object being compiled
$profileCompiler: local := true
$profileAlist: local := nil
- $mutableDomain: fluid := false
+ $mutableDomain: local := false
$compileExportsOnly or not $LISPLIB =>
compDefineFunctor1(df,m,e,prefix,fal)
compDefineLisplib(df,m,e,prefix,fal,'compDefineFunctor1)
diff --git a/src/interp/g-opt.boot b/src/interp/g-opt.boot
index fbfc9efe..1171c72c 100644
--- a/src/interp/g-opt.boot
+++ b/src/interp/g-opt.boot
@@ -324,7 +324,7 @@ AssocBarGensym(key,l) ==
EqualBarGensym(key,first x) => return x
EqualBarGensym(x,y) ==
- $GensymAssoc: fluid := nil
+ $GensymAssoc: local := nil
fn(x,y) where
fn(x,y) ==
x=y => true
diff --git a/src/interp/ht-util.boot b/src/interp/ht-util.boot
index 028df423..fd16ac54 100644
--- a/src/interp/ht-util.boot
+++ b/src/interp/ht-util.boot
@@ -515,10 +515,10 @@ condErrorMsg type ==
strconc('"Error: Could not make your input into a ", typeString)
parseAndEval string ==
- $InteractiveMode :fluid := true
- $SPAD: fluid := true
- $e:fluid := $InteractiveFrame
- $QuietCommand:local := true
+ $InteractiveMode: local := true
+ $SPAD: local := true
+ $e: local := $InteractiveFrame
+ $QuietCommand: local := true
parseAndEval1 string
parseAndEval1 string ==
diff --git a/src/interp/i-coerce.boot b/src/interp/i-coerce.boot
index 4c21e80c..74e9e0ac 100644
--- a/src/interp/i-coerce.boot
+++ b/src/interp/i-coerce.boot
@@ -314,7 +314,7 @@ retractByFunction(object,u) ==
null fun => nil
first(fun) = function Undef => nil
--+
- $: fluid := dcVector
+ $: local := dcVector
object' := coerceUnion2Branch objNewWrap(SPADCALL(val,fun),target)
u' := objMode object'
u = u' => object'
@@ -1338,7 +1338,7 @@ coerceByFunction(T,m2) ==
fn = function Undef => nil
isWrapped x =>
--+
- $: fluid := dcVector
+ $: local := dcVector
val := CATCH('coerceFailure, SPADCALL(unwrap x,fun))
(val = $coerceFailure) => nil
objNewWrap(val,m2)
diff --git a/src/interp/i-eval.boot b/src/interp/i-eval.boot
index 17b9f2f8..9d848d27 100644
--- a/src/interp/i-eval.boot
+++ b/src/interp/i-eval.boot
@@ -82,7 +82,7 @@ evaluateType0 form ==
-- and finally checking to see whether the type satisfies the
-- conditions of its modemap
-- However, the input might be an attribute, not a type
- -- $noEvalTypeMsg: fluid := true
+ -- $noEvalTypeMsg: local := true
domain:= isDomainValuedVariable form => domain
form = $EmptyMode => form
form = "?" => $EmptyMode
@@ -266,7 +266,7 @@ evalForm(op,opName,argl,mmS) ==
if $NRTmonitorIfTrue = true then
sayBrightlyNT ['"Applying ",first fun0,'" to:"]
pp [devaluateDeeply x for x in form]
- _$:fluid := domain
+ $: local := domain
['SPADCALL, :form, fun0]
not form => nil
-- not form => throwKeyedMsg("S2IE0008",[opName])
diff --git a/src/interp/i-syscmd.boot b/src/interp/i-syscmd.boot
index 0daaf964..bcae78dd 100644
--- a/src/interp/i-syscmd.boot
+++ b/src/interp/i-syscmd.boot
@@ -2389,7 +2389,7 @@ reportOpsFromUnitDirectly0 D ==
reportOpsFromUnitDirectly1 D ==
showFile := pathname ['SHOW,'LISTING,$listingDirectory]
_$ERASE showFile
- $sayBrightlyStream : fluid :=
+ $sayBrightlyStream: local :=
DEFIOSTREAM([['FILE,:showFile], '(MODE . OUTPUT)],255,0)
sayShowWarning()
reportOpsFromUnitDirectly D
@@ -2412,7 +2412,7 @@ reportOpsFromLisplib0(unitForm,u) ==
reportOpsFromLisplib1(unitForm,u) ==
showFile := pathname ['SHOW,'LISTING,$listingDirectory]
_$ERASE showFile
- $sayBrightlyStream : fluid :=
+ $sayBrightlyStream: local :=
DEFIOSTREAM([['FILE,:showFile], '(MODE . OUTPUT)],255,0)
sayShowWarning()
reportOpsFromLisplib(unitForm,u)
@@ -3065,7 +3065,7 @@ tabsToBlanks s ==
doSystemCommand string ==
string := strconc('")", EXPAND_-TABS string)
- LINE: fluid := string
+ LINE: local := string
processSynonyms()
string := LINE
string:=subString(string,1)
diff --git a/src/interp/i-toplev.boot b/src/interp/i-toplev.boot
index 5e2b5f65..50b372ce 100644
--- a/src/interp/i-toplev.boot
+++ b/src/interp/i-toplev.boot
@@ -324,7 +324,7 @@ intSayKeyedMsg(key, args) ==
sayKeyedMsg(packageTran key, packageTran args)
intProcessSynonyms str ==
- LINE: fluid := str
+ LINE: local := str
processSynonyms
LINE
diff --git a/src/interp/int-top.boot b/src/interp/int-top.boot
index 248077e8..053b0115 100644
--- a/src/interp/int-top.boot
+++ b/src/interp/int-top.boot
@@ -85,12 +85,12 @@ runspad() ==
ncTopLevel() ==
-- Top-level read-parse-eval-print loop for the interpreter. Uses
-- the Bill Burge's parser.
- IN_-STREAM: fluid := $InputStream
- _*EOF_*: fluid := nil
- $InteractiveMode :fluid := true
- $NEWSPAD: fluid := true
- $SPAD: fluid := true
- $e:fluid := $InteractiveFrame
+ IN_-STREAM: local := $InputStream
+ _*EOF_*: local := nil
+ $InteractiveMode: local := true
+ $NEWSPAD: local := true
+ $SPAD: local := true
+ $e: local := $InteractiveFrame
ncIntLoop()
diff --git a/src/interp/msgdb.boot b/src/interp/msgdb.boot
index 6623cb5b..9f11e30e 100644
--- a/src/interp/msgdb.boot
+++ b/src/interp/msgdb.boot
@@ -326,11 +326,11 @@ throwPatternMsg(key,args) ==
spadThrow()
sayKeyedMsgAsTeX(key, args) ==
- $texFormatting: fluid := true
+ $texFormatting: local := true
sayKeyedMsgLocal(key, args)
sayKeyedMsg(key,args) ==
- $texFormatting: fluid := false
+ $texFormatting: local := false
sayKeyedMsgLocal(key, args)
sayKeyedMsgLocal(key, args) ==
@@ -395,15 +395,15 @@ systemErrorHere what ==
keyedSystemError("S2GE0017",[what])
isKeyedMsgInDb(key,dbName) ==
- $msgDatabaseName : fluid := pathname dbName
+ $msgDatabaseName : local := pathname dbName
fetchKeyedMsg(key,true)
getKeyedMsgInDb(key,dbName) ==
- $msgDatabaseName : fluid := pathname dbName
+ $msgDatabaseName : local := pathname dbName
fetchKeyedMsg(key,false)
sayKeyedMsgFromDb(key,args,dbName) ==
- $msgDatabaseName : fluid := pathname dbName
+ $msgDatabaseName : local := pathname dbName
msg := segmentKeyedMsg getKeyedMsg key
msg := substituteSegmentedMsg(msg,args)
if $displayMsgNumber then msg := ['"%b",key,":",'"%d",:msg]
diff --git a/src/interp/newfort.boot b/src/interp/newfort.boot
index 295aea7a..bc6f2bd8 100644
--- a/src/interp/newfort.boot
+++ b/src/interp/newfort.boot
@@ -39,12 +39,12 @@ $fortranArrayStartingIndex := 0
--% Translation of Expression to FORTRAN
assignment2Fortran1(name,e) ==
- $fortError : fluid := nil
+ $fortError : local := nil
checkLines fortran2Lines statement2Fortran ["=",name,e]
integerAssignment2Fortran1(name,e) ==
- $fortError : fluid := nil
- $fortInts2Floats : fluid := nil
+ $fortError : local := nil
+ $fortInts2Floats : local := nil
checkLines fortran2Lines statement2Fortran ["=",name,e]
statement2Fortran e ==
@@ -54,8 +54,8 @@ statement2Fortran e ==
-- list of strings may contain '"%l".
-- This is used when formatting e.g. a DO loop from Lisp
$exp2FortTempVarIndex : local := 0
- $fortName : fluid := "DUMMY"
- $fortInts2Floats : fluid := nil
+ $fortName : local := "DUMMY"
+ $fortInts2Floats : local := nil
fortranCleanUp exp2Fort1 segment fortPre exp2FortOptimize outputTran e
expression2Fortran e ==
@@ -64,8 +64,8 @@ expression2Fortran e ==
-- with 'FORTRAN is merely passed on in the list of strings. The
-- list of strings may contain '"%l".
$exp2FortTempVarIndex : local := 0
- $fortName : fluid := newFortranTempVar()
- $fortInts2Floats : fluid := nil
+ $fortName : local := newFortranTempVar()
+ $fortInts2Floats : local := nil
fortranCleanUp exp2Fort1 segment fortPre exp2FortOptimize outputTran e
expression2Fortran1(name,e) ==
@@ -74,7 +74,7 @@ expression2Fortran1(name,e) ==
-- with 'FORTRAN is merely passed on in the list of strings. The
-- list of strings may contain '"%l".
$exp2FortTempVarIndex : local := 0
- $fortName : fluid := name
+ $fortName : local := name
fortranCleanUp exp2Fort1 segment fortPre exp2FortOptimize outputTran e
newFortranTempVar() ==
@@ -344,13 +344,13 @@ fortError(u,v) ==
-- The names are the same as those used in the old fortran code
dispStatement x ==
- $fortError : fluid := nil
+ $fortError : local := nil
displayLines fortran2Lines statement2Fortran x
getStatement(x,ints2Floats?) ==
- $fortInts2Floats : fluid := ints2Floats?
- $fortError : fluid := nil
+ $fortInts2Floats : local := ints2Floats?
+ $fortError : local := nil
checkLines fortran2Lines statement2Fortran x
fortexp0 x ==
@@ -379,23 +379,23 @@ dispfortexp x ==
dispfortexp1 x
dispfortexpf (xf, fortranName) ==
- $fortError : fluid := nil
+ $fortError : local := nil
linef := fortran2Lines BUTLAST(expression2Fortran1(fortranName,xf),2)
displayLines linef
dispfortexpj (xj, fortranName) ==
- $fortName : fluid := fortranName
- $fortError : fluid := nil
+ $fortName : local := fortranName
+ $fortError : local := nil
linej := fortran2Lines BUTLAST(expression2Fortran1(fortranName,xj),2)
displayLines linej
dispfortexp1 x ==
- $fortError : fluid := nil
+ $fortError : local := nil
displayLines fortran2Lines expression2Fortran x
getfortexp1 x ==
- $fortError : fluid := nil
+ $fortError : local := nil
checkLines fortran2Lines expression2Fortran x
displayLines1 lines ==
@@ -411,12 +411,12 @@ checkLines lines ==
lines
dispfortarrayexp (fortranName,m) ==
- $fortError : fluid := nil
+ $fortError : local := nil
displayLines fortran2Lines BUTLAST(expression2Fortran1(fortranName,m),2)
getfortarrayexp(fortranName,m,ints2floats?) ==
- $fortInts2Floats : fluid := ints2floats?
- $fortError : fluid := nil
+ $fortInts2Floats : local := ints2floats?
+ $fortError : local := nil
checkLines fortran2Lines BUTLAST(expression2Fortran1(fortranName,m),2)
@@ -447,7 +447,7 @@ exp2FortSpecial(op,args,nargs) ==
-- Have a matrix element
mkMat(args)
op = "SUB" =>
- $fortInts2Floats : fluid := nil
+ $fortInts2Floats : local := nil
mkFortFn(first args,rest args,#(rest args))
op in ["BRACE","BRACKET"] =>
args is [var,['AGGLST,:elts]] =>
@@ -486,7 +486,7 @@ exp2FortSpecial(op,args,nargs) ==
fortError1 [op,:args]
mkMat(args) ==
- $fortInts2Floats : fluid := nil
+ $fortInts2Floats : local := nil
mkFortFn(second args,rest rest args,#(rest rest args))
@@ -584,8 +584,8 @@ changeExprLength(i) ==
$maximumFortranExpressionLength := $maximumFortranExpressionLength + i
fortFormatDo(var,lo,hi,incr,lab) ==
- $fortError : fluid := nil
- $fortInts2Floats : fluid := nil
+ $fortError : local := nil
+ $fortInts2Floats : local := nil
incr=1 =>
checkLines fortran2Lines
['"DO ",STRINGIMAGE lab,'" ",STRINGIMAGE var,'"=",:statement2Fortran lo,_
@@ -596,7 +596,7 @@ fortFormatDo(var,lo,hi,incr,lab) ==
fortFormatIfGoto(switch,label) ==
changeExprLength(-8) -- Leave room for IF( ... )GOTO
- $fortError : fluid := nil
+ $fortError : local := nil
if first(switch) = "NULL" then switch := second switch
r := reverse! statement2Fortran switch
changeExprLength(8)
@@ -608,7 +608,7 @@ fortFormatIfGoto(switch,label) ==
fortFormatLabelledIfGoto(switch,label1,label2) ==
changeExprLength(-8) -- Leave room for IF( ... )GOTO
- $fortError : fluid := nil
+ $fortError : local := nil
if LISTP(switch) and first(switch) = "NULL" then switch := second switch
r := reverse! statement2Fortran switch
changeExprLength(8)
@@ -624,7 +624,7 @@ fortFormatLabelledIfGoto(switch,label1,label2) ==
fortFormatIf(switch) ==
changeExprLength(-8) -- Leave room for IF( ... )THEN
- $fortError : fluid := nil
+ $fortError : local := nil
if LISTP(switch) and first(switch) = "NULL" then switch := second switch
r := reverse! statement2Fortran switch
changeExprLength(8)
@@ -637,7 +637,7 @@ fortFormatIf(switch) ==
fortFormatElseIf(switch) ==
-- Leave room for IF( ... )THEN
changeExprLength(-12)
- $fortError : fluid := nil
+ $fortError : local := nil
if LISTP(switch) and first(switch) = "NULL" then switch := second switch
r := reverse! statement2Fortran switch
changeExprLength(12)
@@ -648,8 +648,8 @@ fortFormatElseIf(switch) ==
checkLines fortran2Lines reverse! [:reverse! l,'"ELSEIF(",:r]
fortFormatHead(returnType,name,args) ==
- $fortError : fluid := nil
- $fortranSegment : fluid := nil
+ $fortError : local := nil
+ $fortranSegment : local := nil
-- if returnType = '"_"_(_)_"" then
if returnType = '"void" then
asp := ['"SUBROUTINE "]
@@ -680,9 +680,9 @@ macro nameLen n ==
fortFormatTypes(typeName,names) ==
null names => return nil
- $fortError : fluid := nil
- $fortranSegment : fluid := nil
- $fortInts2Floats : fluid := nil
+ $fortError : local := nil
+ $fortranSegment : local := nil
+ $fortInts2Floats : local := nil
typeName := checkType typeName
typeName = '"CHARACTER" =>
fortFormatCharacterTypes([unravel(u) for u in names])
@@ -726,7 +726,7 @@ fortFormatCharacterTypes(names) ==
:rest [:['",",:statement2Fortran(v)] for v in rest u],'")"])
fortFormatIntrinsics(l) ==
- $fortError : fluid := nil
+ $fortError : local := nil
null l => return nil
displayLines fortran2Lines ['"INTRINSIC ",:addCommas(l)]
@@ -766,7 +766,7 @@ fortPre l ==
-- Essentially, the idea is to fix things so that we know what size of
-- expression we will generate, which helps segment large expressions
-- and do transformations to double precision output etc..
- $exprStack : fluid := nil -- sometimes we will add elements to this in
+ $exprStack : local := nil -- sometimes we will add elements to this in
-- other functions, for example when extracing
-- lists etc.
for e in l repeat if new := fortPre1 e then
@@ -838,7 +838,7 @@ fortPre1 e ==
fortPreRoot e ==
-- To set $fortInts2Floats
- $fortInts2Floats : fluid := true
+ $fortInts2Floats : local := true
fortPre1 e
fix2FortranFloat e ==
diff --git a/src/interp/nrunfast.boot b/src/interp/nrunfast.boot
index 834e2432..8962ebf9 100644
--- a/src/interp/nrunfast.boot
+++ b/src/interp/nrunfast.boot
@@ -89,7 +89,7 @@ getOpCode(op,vec,max) ==
evalSlotDomain(u,dollar) ==
$returnNowhereFromGoGet: local := false
- $ : fluid := dollar -- ??? substitute
+ $: local := dollar -- ??? substitute
$lookupDefaults : local := false -- new world
u is '$ => dollar
u is "$$" => dollar
@@ -607,7 +607,7 @@ newExpandLocalTypeArgs(u,dollar,domain,typeFlag) ==
newExpandLocalTypeForm(u,dollar,domain)
nrtEval(expr,dom) ==
- $:fluid := dom --??? this should be a substitute
+ $: local := dom --??? this should be a substitute
eval expr
domainVal(dollar,domain,index) ==
diff --git a/src/interp/record.boot b/src/interp/record.boot
index 8fc3183b..594a6131 100644
--- a/src/interp/record.boot
+++ b/src/interp/record.boot
@@ -188,7 +188,7 @@ evaluateLines lines ==
PRINTEXP(line, file)
TERPRI file
SHUT file
- _/EDITFILE: fluid := '"/tmp/temp.input"
+ _/EDITFILE: local := '"/tmp/temp.input"
_/RF()
-- can't use _/EDITFILE since it might be reset
DELETE_-FILE '"/tmp/temp.input"
diff --git a/src/interp/server.boot b/src/interp/server.boot
index 6e73a06a..3e46b28a 100644
--- a/src/interp/server.boot
+++ b/src/interp/server.boot
@@ -51,8 +51,8 @@ serverReadLine(stream) ==
FORCE_-OUTPUT()
not $SpadServer or not IS_-CONSOLE stream =>
read_-line(stream)
- IN_-STREAM: fluid := stream
- _*EOF_*: fluid := nil
+ IN_-STREAM: local := stream
+ _*EOF_*: local := nil
line :=
while not $EndServerSession and not _*EOF_* repeat
if $NeedToSignalSessionManager then
@@ -100,13 +100,13 @@ serverReadLine(stream) ==
""
parseAndInterpret str ==
- $InteractiveMode :fluid := true
- $SPAD: fluid := true
- $e:fluid := $InteractiveFrame
+ $InteractiveMode : local := true
+ $SPAD: local := true
+ $e: local := $InteractiveFrame
ncParseAndInterpretString str
executeQuietCommand() ==
- $QuietCommand: fluid := true
+ $QuietCommand: local := true
stringBuf := sockGetString $MenuServer
CATCH('coerceFailure,CATCH($intTopLevel, CATCH($SpadReaderTag,
parseAndInterpret stringBuf)))
@@ -145,9 +145,9 @@ parseAndInterpToString str ==
breakIntoLines rest v
parseAndEvalStr string ==
- $InteractiveMode :fluid := true
- $SPAD: fluid := true
- $e:fluid := $InteractiveFrame
+ $InteractiveMode: local := true
+ $SPAD: local := true
+ $e: local := $InteractiveFrame
parseAndEvalStr1 string
parseAndEvalStr1 string ==
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-04 04:11:27 +0000