From fff23d752812e2ae22bebc21d24c42bb145a916e Mon Sep 17 00:00:00 2001 From: dos-reis Date: Sun, 9 May 2010 23:26:51 +0000 Subject: More cleanups --- src/interp/c-util.boot | 16 ++++++++-------- src/interp/define.boot | 8 ++++---- src/interp/functor.boot | 2 +- src/interp/g-util.boot | 2 +- src/interp/i-output.boot | 14 +++++++------- src/interp/i-spec1.boot | 4 ++-- src/interp/i-syscmd.boot | 16 ++++++++-------- src/interp/i-toplev.boot | 2 +- src/interp/interop.boot | 2 +- src/interp/lisplib.boot | 2 +- src/interp/msg.boot | 2 +- src/interp/msgdb.boot | 6 +++--- src/interp/newfort.boot | 2 +- src/interp/nruncomp.boot | 2 +- src/interp/pspad1.boot | 14 +++++++------- src/interp/setvars.boot | 44 ++++++++++++++++++++++---------------------- src/interp/trace.boot | 10 +++++----- src/interp/wi1.boot | 4 ++-- 18 files changed, 76 insertions(+), 76 deletions(-) (limited to 'src') diff --git a/src/interp/c-util.boot b/src/interp/c-util.boot index 7463b2fc..9a51fc2a 100644 --- a/src/interp/c-util.boot +++ b/src/interp/c-util.boot @@ -325,13 +325,13 @@ intersectionContour(c,c') == modeCompare(p,p') == pair:= assoc("mode",p) => pair':= assoc("mode",p') => - m'':= unifiable(rest pair,rest pair') => LIST ["mode",:m''] + m'':= unifiable(rest pair,rest pair') => [["mode",:m'']] stackSemanticError(['%b,$var,'%d,"has two modes: "],nil) --stackWarning ("mode for",'%b,$var,'%d,"introduced conditionally") - LIST ["conditionalmode",:rest pair] + [["conditionalmode",:rest pair]] --LIST pair --stackWarning ("mode for",'%b,$var,'%d,"introduced conditionally") - pair':= assoc("mode",p') => LIST ["conditionalmode",:rest pair'] + pair':= assoc("mode",p') => [["conditionalmode",:rest pair']] --LIST pair' unifiable(m1,m2) == m1=m2 => m1 @@ -366,7 +366,7 @@ addContour(c,E is [cur,:tail]) == if v ~=vv then stackWarning('"The conditional modes %1p and %2p conflict", [v,vv]) - LIST c + [c] makeCommonEnvironment(e,e') == interE makeSameLength(e,e') where --$ie:= @@ -416,7 +416,7 @@ getInverseEnvironment(a,e) == --the next two lines are necessary to get 3-branched Unions to work -- old-style unions, that is (get(x,"condition",e) is [["OR",:oldpred]]) and member(a,oldpred) => - put(x,"condition",LIST MKPF(delete(a,oldpred),"OR"),e) + put(x,"condition",[MKPF(delete(a,oldpred),"OR")],e) getUnionMode(x,e) is ["Union",:l] => l':= delete(m,l) for u in l' repeat @@ -644,7 +644,7 @@ isAlmostSimple x == op="has" => x op="is" => x op="%LET" => - IDENTP y => (setAssignment LIST x; y) + IDENTP y => (setAssignment [x]; y) (setAssignment [["%LET",g:= genVariable(),:l],["%LET",y,g]]; g) op = "case" and IDENTP y => x isSideEffectFree op => [op,:mapInto(rest x, function fn)] @@ -737,7 +737,7 @@ printDashedLine() == stackSemanticError(msg,expr) == BUMPERRORCOUNT "semantic" if $insideCapsuleFunctionIfTrue then msg:= [$op,": ",:msg] - if atom msg then msg:= LIST msg + if atom msg then msg:= [msg] entry:= [msg,expr] if not member(entry,$semanticErrorStack) then $semanticErrorStack:= [entry,:$semanticErrorStack] @@ -862,7 +862,7 @@ getmodeOrMapping(x,e) == outerProduct l == --of a list of lists - null l => LIST nil + null l => [nil] "append"/[[[x,:y] for y in outerProduct rest l] for x in first l] sublisR(al,u) == diff --git a/src/interp/define.boot b/src/interp/define.boot index 8bcdfef1..59a2bde4 100644 --- a/src/interp/define.boot +++ b/src/interp/define.boot @@ -1262,7 +1262,7 @@ spadCompileOrSetq (form is [nam,[lam,vl,body]]) == $optExportedFunctionReference => $capsuleFunctionStack := [form,:$capsuleFunctionStack] first form - first backendCompile LIST form + first backendCompile [form] compileConstructor form compileConstructor form == @@ -1281,7 +1281,7 @@ compileConstructor1 (form:=[fn,[key,vl,:bodyl]]) == $clamList:= [[fn,"$ConstructorCache",'domainEqualList,'count],:$clamList] 'LAMBDA - compForm:= LIST [fn,[lambdaOrSlam,vl,:bodyl]] + compForm:= [[fn,[lambdaOrSlam,vl,:bodyl]]] if getConstructorKindFromDB fn = "category" then u:= compAndDefine compForm else u:= backendCompile compForm @@ -1570,10 +1570,10 @@ compJoin(["Join",:argl],m,e) == union("append"/[getParms(y,e) for y in rest x],parameters) where getParms(y,e) == atom y => - isDomainForm(y,e) => LIST y + isDomainForm(y,e) => [y] nil y is ['LENGTH,y'] => [y,y'] - LIST y + [y] x x is ["DomainSubstitutionMacro",pl,body] => (parameters:= union(pl,parameters); body) diff --git a/src/interp/functor.boot b/src/interp/functor.boot index aabc7ec2..9968e291 100644 --- a/src/interp/functor.boot +++ b/src/interp/functor.boot @@ -513,7 +513,7 @@ DescendCodeAdd1(base,flag,target,formalArgs,formalArgModes) == --for that may change the shape of the object, but we must before --we match signatures cat:= (compMakeCategoryObject(target,e)).expr - instantiatedBase:= GENVAR() + instantiatedBase:= genvar() n:=MAXINDEX cat code:= [u diff --git a/src/interp/g-util.boot b/src/interp/g-util.boot index fbbab606..c20466fa 100644 --- a/src/interp/g-util.boot +++ b/src/interp/g-util.boot @@ -492,7 +492,7 @@ freeOfSharpVars x == freeOfSharpVars first x and freeOfSharpVars rest x listOfSharpVars x == - atom x => (isSharpVarWithNum x => LIST x; nil) + atom x => (isSharpVarWithNum x => [x]; nil) union(listOfSharpVars first x,listOfSharpVars rest x) listOfPatternIds x == diff --git a/src/interp/i-output.boot b/src/interp/i-output.boot index 57d041ef..e4dd5b49 100644 --- a/src/interp/i-output.boot +++ b/src/interp/i-output.boot @@ -1879,7 +1879,7 @@ subspan u == atom CAAR u and_ not NUMBERP CAAR u and_ GETL(CAAR u, 'SUBSPAN) ) => - APPLX(GETL(CAAR u, 'SUBSPAN), LIST u) + APPLX(GETL(CAAR u, 'SUBSPAN), [u]) MAX(subspan first u, subspan rest u) agggsub u == subspan rest u @@ -1891,7 +1891,7 @@ superspan u == atom CAAR u and_ not NUMBERP CAAR u and_ GETL(CAAR u, 'SUPERSPAN) ) => - APPLX(GETL(CAAR u, 'SUPERSPAN), LIST u) + APPLX(GETL(CAAR u, 'SUPERSPAN), [u]) MAX(superspan first u, superspan rest u) agggsuper u == superspan rest u @@ -1998,7 +1998,7 @@ appsum(u, x, y, d) == appsum(rest u, tempx, y, tempdblock) appneg(u, x, y, d) == - appsum(LIST u, x - 1, y, d) + appsum([u], x - 1, y, d) appparu(u, x, y, d) == bot := y - subspan u @@ -2100,7 +2100,7 @@ longext(u, i, n) == u := remWidth(REVERSEWOC(['" ",:rest x])) charybdis(u, i, n) if not $collectOutput then TERPRI $algebraOutputStream - charybdis(['ELSE, :LIST y], i, n) + charybdis(['ELSE, :[y]], i, n) '" " appvertline(char, x, yl, yu, d) == @@ -2325,8 +2325,8 @@ minusWidth(u) == -- LASSOC(name, x) or '"," bracketagglist(u, start, linelength, tchr, open, close) == - u := [LIST('CONCAT, open, first u), - :[LIST('CONCAT, '" ", y) for y in rest u]] + u := [['CONCAT, open, first u], + :[['CONCAT, '" ", y] for y in rest u]] repeat s := 0 for x in tails u repeat @@ -2338,7 +2338,7 @@ bracketagglist(u, start, linelength, tchr, open, close) == EQ(lastx, u) => ((nextu := rest u); u.rest := nil) true => ((nextu := lastx); PREDECESSOR(lastx, u).rest := nil) for x in tails u repeat - x.first := LIST('CONCAT, first x, tchr) + x.first := ['CONCAT, first x, tchr] if null nextu then LAST(u).rest.rest.first := close x := ASSOCIATER('CONCAT, [ichr,:u]) charybdis(ASSOCIATER('CONCAT, u), start, linelength) diff --git a/src/interp/i-spec1.boot b/src/interp/i-spec1.boot index 48cf90fa..449e6e43 100644 --- a/src/interp/i-spec1.boot +++ b/src/interp/i-spec1.boot @@ -1239,8 +1239,8 @@ isPolynomialMode m == op in '(Polynomial RationalFunction AlgebraicFunction Expression ElementaryFunction LiouvillianFunction FunctionalExpression CombinatorialFunction) => 'all - op = 'UnivariatePolynomial => LIST a - op = 'Variable => LIST a + op = 'UnivariatePolynomial => [a] + op = 'Variable => [a] op in '(MultivariatePolynomial DistributedMultivariatePolynomial HomogeneousDistributedMultivariatePolynomial) => a NIL diff --git a/src/interp/i-syscmd.boot b/src/interp/i-syscmd.boot index 90c4073d..0df1c81c 100644 --- a/src/interp/i-syscmd.boot +++ b/src/interp/i-syscmd.boot @@ -312,7 +312,7 @@ clearCmdAll() == $previousBindings := nil $variableNumberAlist := nil untraceMapSubNames _/TRACENAMES - $InteractiveFrame := LIST LIST NIL + $InteractiveFrame := [[NIL]] resetInCoreHist() if $useInternalHistoryTable then $internalHistoryTable := NIL @@ -1360,7 +1360,7 @@ frameEnvironment fname == -- is returned fname = frameName first $interpreterFrameRing => $InteractiveFrame ifr := rest $interpreterFrameRing - e := LIST LIST NIL + e := [[NIL]] while ifr repeat [f,:ifr] := ifr if fname = frameName f then @@ -1402,8 +1402,8 @@ addNewInterpreterFrame(name) == _$ERASE histFileName() emptyInterpreterFrame(name) == - LIST(name, -- frame name - LIST LIST NIL, -- environment + [name, -- frame name + [[NIL]], -- environment 1, -- $IOindex $HiFiAccess, -- $HiFiAccess $HistList, -- $HistList @@ -1412,7 +1412,7 @@ emptyInterpreterFrame(name) == $HistRecord, -- $HistRecord NIL, -- $internalHistoryTable COPY_-SEQ $localExposureDataDefault -- $localExposureData - ) + ] closeInterpreterFrame(name) == -- if name = NIL then it means the current frame @@ -1448,7 +1448,7 @@ nextInterpreterFrame() == createCurrentInterpreterFrame() == - LIST($interpreterFrameName, -- frame name + [$interpreterFrameName, -- frame name $InteractiveFrame, -- environment $IOindex, -- $IOindex $HiFiAccess, -- $HiFiAccess @@ -1458,7 +1458,7 @@ createCurrentInterpreterFrame() == $HistRecord, -- $HistRecord $internalHistoryTable, -- $internalHistoryTable $localExposureData -- $localExposureData - ) + ] updateFromCurrentInterpreterFrame() == @@ -1598,7 +1598,7 @@ initHistList() == -- creates $HistList as a circular list of length $HistListLen -- and $HistRecord $HistListLen:= 20 - $HistList:= LIST NIL + $HistList:= [NIL] li:= $HistList for i in 1..$HistListLen repeat li:= [NIL,:li] $HistList.rest := li diff --git a/src/interp/i-toplev.boot b/src/interp/i-toplev.boot index cc0a6e03..4003151f 100644 --- a/src/interp/i-toplev.boot +++ b/src/interp/i-toplev.boot @@ -152,7 +152,7 @@ processInteractive(form, posnForm) == $domPvar: local := NIL $inRetract: local := NIL object := processInteractive1(form, posnForm) - --object := ERRORSET(LIST('processInteractive1,LIST('QUOTE,form),LIST('QUOTE,posnForm)),'t,'t) + --object := ERRORSET(['processInteractive1,LIST('QUOTE,form),['QUOTE,posnForm]],'t,'t) if not($ProcessInteractiveValue) then if $reportInstantiations = true then reportInstantiations() diff --git a/src/interp/interop.boot b/src/interp/interop.boot index e8da2cd9..be8354c3 100644 --- a/src/interp/interop.boot +++ b/src/interp/interop.boot @@ -84,7 +84,7 @@ DNameToSExpr dname == rest dname sx := DNameToSExpr1 dname cons? sx => sx - LIST sx + [sx] DNameFixEnum arg == CompStrToString rest arg diff --git a/src/interp/lisplib.boot b/src/interp/lisplib.boot index 94d1bdd1..20373477 100644 --- a/src/interp/lisplib.boot +++ b/src/interp/lisplib.boot @@ -383,7 +383,7 @@ compDefineLisplib(df:=["DEF",[op,:.],:.],m,e,prefix,fal,fn) == FRESH_-LINE $algebraOutputStream sayMSG fillerSpaces(72,'"-") unloadOneConstructor(op,libName) - LOCALDATABASE(LIST SYMBOL_-NAME getConstructorAbbreviationFromDB op,NIL) + LOCALDATABASE([SYMBOL_-NAME getConstructorAbbreviationFromDB op],NIL) $newConlist := [op, :$newConlist] ----------> bound in function "compiler" res diff --git a/src/interp/msg.boot b/src/interp/msg.boot index 455b3248..4ef144e7 100644 --- a/src/interp/msg.boot +++ b/src/interp/msg.boot @@ -168,7 +168,7 @@ processChPosesForOneLine msgList == setMsgPrefix (msg,strconc(oldPre,_ MAKE_-FULL_-CVEC ($preLength - 4 - SIZE oldPre),posLetter) ) leaderMsg := makeLeaderMsg chPosList - NCONC(msgList,LIST leaderMsg) --a back cons + NCONC(msgList,[leaderMsg]) --a back cons posPointers msgList == --gets all the char posns for msgs on one line diff --git a/src/interp/msgdb.boot b/src/interp/msgdb.boot index 446ccd09..b4bb9930 100644 --- a/src/interp/msgdb.boot +++ b/src/interp/msgdb.boot @@ -234,7 +234,7 @@ addBlanks msg == blanksOff := true msg1 := [] else - msg1 := LIST x + msg1 := [x] blank := '" " for y in rest msg repeat member(y,'("%n" %n)) => blanksOff := true @@ -766,7 +766,7 @@ brightPrintCenter(x,out == $OutputStream) == wid := STRINGLENGTH x if wid < $LINELENGTH then f := DIVIDE($LINELENGTH - wid,2) - x := LIST(fillerSpaces(f.0,'" "),x) + x := [fillerSpaces(f.0,'" "),x] for y in x repeat brightPrint0(y,out) NIL y := NIL @@ -811,7 +811,7 @@ brightPrintRightJustify(x, out == $OutputStream) == x := object2String x wid := STRINGLENGTH x wid < $LINELENGTH => - x := LIST(fillerSpaces($LINELENGTH-wid,'" "),x) + x := [fillerSpaces($LINELENGTH-wid,'" "),x] for y in x repeat brightPrint0(y,out) NIL brightPrint0(x,out) diff --git a/src/interp/newfort.boot b/src/interp/newfort.boot index c42e63cd..3c0296fb 100644 --- a/src/interp/newfort.boot +++ b/src/interp/newfort.boot @@ -704,7 +704,7 @@ fortFormatTypes1(typeName,names) == insertEntry(size,el,aList) == entry := assoc(size,aList) - null entry => [[size,:LIST el],:aList] + null entry => [[size,:[el]],:aList] entry.rest := [el,:rest entry] aList diff --git a/src/interp/nruncomp.boot b/src/interp/nruncomp.boot index b9fbe98b..948b7b0d 100644 --- a/src/interp/nruncomp.boot +++ b/src/interp/nruncomp.boot @@ -454,7 +454,7 @@ buildFunctor($definition is [name,:args],sig,code,$locals,$e) == $catvecList:= [domainShell,:[emptyVector for u in second domainShell.4]] $catNames := ['$] -- for DescendCode -- to be changed below for slot 4 $SetFunctions:= newShell SIZE domainShell - $catNames:= ['$,:[GENVAR() for u in rest catvecListMaker]] + $catNames:= ['$,:[genvar() for u in rest catvecListMaker]] domname:='dv_$ -- Do this now to create predicate vector; then DescendCode can refer diff --git a/src/interp/pspad1.boot b/src/interp/pspad1.boot index 62703b9f..75c0d97c 100644 --- a/src/interp/pspad1.boot +++ b/src/interp/pspad1.boot @@ -129,7 +129,7 @@ formatOutput x == (y:= strconc(nBlanks $m,y); extraLines:= [y,:extraLines]; x) [line,y] consLineBuffer x - for y in extraLines repeat consLineBuffer LIST y + for y in extraLines repeat consLineBuffer [y] if after then putOut after $commentsToPrint:= nil @@ -142,7 +142,7 @@ putOut x == eject n == for i in 2..n repeat consLineBuffer nil addComment u == - for x in mkCommentLines u repeat consLineBuffer LIST x + for x in mkCommentLines u repeat consLineBuffer [x] mkCommentLines [.,n,.,s] == lines:= breakComments s @@ -153,8 +153,8 @@ mkCommentLines [.,n,.,s] == breakComments s == n:= containsString(s,PNAME "ENDOFLINECHR") => #s>n+12 => [SUBSTRING(s,0,n),:breakComments SUBSTRING(s,n+12,NIL)] - LIST SUBSTRING(s,0,n) - LIST s + [SUBSTRING(s,0,n)] + [s] containsString(x,y) == --if string x contains string y, return start index @@ -179,7 +179,7 @@ consBuffer item == --is true except within try formatOutput reverse $lineFragmentBuffer $c:= REMAINDER($m+2*($numberOfSpills:= $numberOfSpills+1), $lineLength) - $lineFragmentBuffer:= LIST nBlanks $c + $lineFragmentBuffer:= [nBlanks $c] consBuffer item nil $lineFragmentBuffer:= @@ -205,7 +205,7 @@ newLine() == null $autoLine => nil $newLineWritten := true formatOutput reverse $lineFragmentBuffer - $lineFragmentBuffer:= LIST nBlanks $m + $lineFragmentBuffer:= [nBlanks $m] $c:= $m optNewLine() == @@ -216,7 +216,7 @@ spillLine() == null $autoLine => nil formatOutput reverse $lineFragmentBuffer $c:= $m+2*($numberOfSpills:= $numberOfSpills+1) - $lineFragmentBuffer:= LIST nBlanks $c + $lineFragmentBuffer:= [nBlanks $c] $c indent() == diff --git a/src/interp/setvars.boot b/src/interp/setvars.boot index 22b723a4..cd5cfacb 100644 --- a/src/interp/setvars.boot +++ b/src/interp/setvars.boot @@ -670,7 +670,7 @@ validateOutputDirectory x == describeSetFortTmpDir() == - sayBrightly LIST ( + sayBrightly [ '%b,'")set fortran calling tempfile",'%d,_ '" is used to tell AXIOM where",'%l,_ '" to place intermediate FORTRAN data files . This must be the ",'%l,_ @@ -678,7 +678,7 @@ describeSetFortTmpDir() == '" to write (including the final slash).",'%l,'%l,_ '" Syntax:",'%l,_ '" )set fortran calling tempfile DIRECTORYNAME",'%l,'%l,_ - '" The current setting is",'%b,$fortranTmpDir,'%d) + '" The current setting is",'%b,$fortranTmpDir,'%d] setFortDir arg == @@ -727,7 +727,7 @@ setLinkerArgs arg == describeSetLinkerArgs() == - sayBrightly LIST ( + sayBrightly [ '%b,'")set fortran calling linkerargs",'%d,_ '" is used to pass arguments to the linker",'%l,_ '" when using ",'%b,'"mkFort",'%d,_ @@ -737,7 +737,7 @@ describeSetLinkerArgs() == '" The string is passed verbatim, so must be the correct syntax for",'%l,_ '" the particular linker being used.",'%l,'%l,_ '" Example: )set fortran calling linker _"-lxlf_"",'%l,'%l,_ - '" The current setting is",'%b,$fortranLibraries,'%d) + '" The current setting is",'%b,$fortranLibraries,'%d] -- See the section functions in setvart.boot -- @@ -785,7 +785,7 @@ countCache n == describeSetFunctionsCache() == - sayBrightly LIST( + sayBrightly [ '%b,'")set functions cache",'%d,'"is used to tell AXIOM how many",'%l,_ '" values computed by interpreter functions should be saved. This can save ",'%l, _ '" quite a bit of time in recursive functions, though one must consider that",'%l,_ @@ -795,7 +795,7 @@ describeSetFunctionsCache() == '" integer. This may be followed by any number of function names whose cache",'%l,_ '" sizes you wish to so set. If no functions are given, the default cache",'%l,_ '" size is set.",'%l,'" Examples:",_ - '" )set fun cache all )set fun cache 10 f g Legendre") + '" )set fun cache all )set fun cache 10 f g Legendre"] sayAllCacheCounts () == @@ -883,14 +883,14 @@ setHistory arg == describeProtectedSymbolsWarning() == - sayBrightly LIST( + sayBrightly [ '"Some AXIOM library functions are compiled into the kernel for efficiency",_ '%l,'"reasons. To prevent them being re-defined when loaded from a library",_ '%l,'"they are specially protected. If a user wishes to know when an attempt",_ '%l,'"is made to re-define such a function, he or she should issue the command:",_ '%l,'" )set kernel warn on",_ '%l,'"To restore the default behaviour, he or she should issue the command:",_ - '%l,'" )set kernel warn off") + '%l,'" )set kernel warn off"] protectedSymbolsWarning arg == @@ -910,14 +910,14 @@ PROTECTED_-SYMBOL_-WARN flag == flag describeProtectSymbols() == - sayBrightly LIST( + sayBrightly [ '"Some AXIOM library functions are compiled into the kernel for efficiency",_ '%l,'"reasons. To prevent them being re-defined when loaded from a library",_ '%l,'"they are specially protected. If a user wishes to re-define these",_ '%l,'"functions, he or she should issue the command:",_ '%l,'" )set kernel protect off",_ '%l,'"To restore the default behaviour, he or she should issue the command:",_ - '%l,'" )set kernel protect on") + '%l,'" )set kernel protect on"] protectSymbols arg == @@ -1023,7 +1023,7 @@ setOutputAlgebra arg == describeSetOutputAlgebra() == - sayBrightly LIST ('%b,'")set output algebra",'%d,_ + sayBrightly ['%b,'")set output algebra",'%d,_ '"is used to tell AXIOM to turn algebra-style output",'%l,_ '"printing on and off, and where to place the output. By default, the",'%l,_ '"destination for the output is the screen but printing is turned off.",'%l,_ @@ -1045,7 +1045,7 @@ describeSetOutputAlgebra() == '%l,_ '"The output is placed in the directory from which you invoked AXIOM or",'%l,_ '"the one you set with the )cd system command.",'%l,_ - '"The current setting is: ",'%b,setOutputAlgebra "%display%",'%d) + '"The current setting is: ",'%b,setOutputAlgebra "%display%",'%d] -- See the subsection output characters in setvart.boot @@ -1211,7 +1211,7 @@ setOutputFortran arg == describeSetOutputFortran() == - sayBrightly LIST ('%b,'")set output fortran",'%d,_ + sayBrightly ['%b,'")set output fortran",'%d,_ '"is used to tell AXIOM to turn FORTRAN-style output",'%l,_ '"printing on and off, and where to place the output. By default, the",'%l,_ '"destination for the output is the screen but printing is turned off.",'%l,_ @@ -1235,7 +1235,7 @@ describeSetOutputFortran() == '%l,_ '"The output is placed in the directory from which you invoked AXIOM or",'%l,_ '"the one you set with the )cd system command.",'%l,_ - '"The current setting is: ",'%b,setOutputFortran "%display%",'%d) + '"The current setting is: ",'%b,setOutputFortran "%display%",'%d] -- See the section mathml in setvart.boot.pamphlet @@ -1322,7 +1322,7 @@ setOutputMathml arg == describeSetOutputMathml() describeSetOutputMathml() == - sayBrightly LIST ('%b,'")set output mathml",'%d,_ + sayBrightly ['%b,'")set output mathml",'%d,_ '"is used to tell AXIOM to turn MathML-style output",'%l,_ '"printing on and off, and where to place the output. By default, the",'%l,_ '"destination for the output is the screen but printing is turned off.",'%l,_ ' @@ -1344,7 +1344,7 @@ describeSetOutputMathml() == '%l,_ '"The output is placed in the directory from which you invoked OpenAxiom or",'%l,_ '"the one you set with the )cd system command.",'%l,_ - '"The current setting is: ",'%b,setOutputMathml "%display%",'%d) + '"The current setting is: ",'%b,setOutputMathml "%display%",'%d] -- See the subsection output openmath in setvart.boot @@ -1432,7 +1432,7 @@ setOutputOpenMath arg == describeSetOutputOpenMath() == - sayBrightly LIST ('%b,'")set output openmath",'%d,_ + sayBrightly ['%b,'")set output openmath",'%d,_ '"is used to tell AXIOM to turn OpenMath output",'%l,_ '"printing on and off, and where to place the output. By default, the",'%l,_ '"destination for the output is the screen but printing is turned off.",'%l,_ @@ -1454,7 +1454,7 @@ describeSetOutputOpenMath() == '%l,_ '"The output is placed in the directory from which you invoked AXIOM or",'%l,_ '"the one you set with the )cd system command.",'%l,_ - '"The current setting is: ",'%b,setOutputOpenMath "%display%",'%d) + '"The current setting is: ",'%b,setOutputOpenMath "%display%",'%d] -- See the subsection output script in setvart.boot -- @@ -1544,7 +1544,7 @@ setOutputFormula arg == describeSetOutputFormula() == - sayBrightly LIST ('%b,'")set output script",'%d,_ + sayBrightly ['%b,'")set output script",'%d,_ '"is used to tell AXIOM to turn IBM Script formula-style",'%l,_ '"output printing on and off, and where to place the output. By default, the",'%l,_ '"destination for the output is the screen but printing is turned off.",'%l,_ @@ -1566,7 +1566,7 @@ describeSetOutputFormula() == '%l,_ '"The output is placed in the directory from which you invoked AXIOM or",'%l,_ '"the one you set with the )cd system command.",'%l,_ - '"The current setting is: ",'%b,setOutputFormula "%display%",'%d) + '"The current setting is: ",'%b,setOutputFormula "%display%",'%d] -- See the section tex in setvart.boot @@ -1655,7 +1655,7 @@ setOutputTex arg == describeSetOutputTex() == - sayBrightly LIST ('%b,'")set output tex",'%d,_ + sayBrightly ['%b,'")set output tex",'%d,_ '"is used to tell AXIOM to turn TeX-style output",'%l,_ '"printing on and off, and where to place the output. By default, the",'%l,_ '"destination for the output is the screen but printing is turned off.",'%l,_ @@ -1677,7 +1677,7 @@ describeSetOutputTex() == '%l,_ '"The output is placed in the directory from which you invoked AXIOM or",'%l,_ '"the one you set with the )cd system command.",'%l,_ - '"The current setting is: ",'%b,setOutputTex "%display%",'%d) + '"The current setting is: ",'%b,setOutputTex "%display%",'%d] -- See the section streams in setvart.boot -- Current Values of streams Variables diff --git a/src/interp/trace.boot b/src/interp/trace.boot index ea1d65fe..bae545c0 100644 --- a/src/interp/trace.boot +++ b/src/interp/trace.boot @@ -142,10 +142,10 @@ trace1 l == LASSOC("ops",optionList) => throwKeyedMsg("S2IT0004",NIL) opList:= - traceList => LIST ["ops",:traceList] + traceList => [["ops",:traceList]] nil varList:= - y:= LASSOC("vars",optionList) => LIST ["vars",:y] + y:= LASSOC("vars",optionList) => [["vars",:y]] nil [:domainList,:opList,:varList] optionList => [:traceList,:optionList] @@ -769,7 +769,7 @@ _?t() == null _/TRACENAMES => sayMSG bright '"nothing is traced" for x in _/TRACENAMES | atom x and not IS__GENVAR x repeat if llm:= get(x,'localModemap,$InteractiveFrame) then - x:= (LIST (CADAR llm)) + x:= ([CADAR llm]) sayMSG ['"Function",:bright rassocSub(x,$mapSubNameAlist),'"traced"] for x in _/TRACENAMES | x is [d,:l] and isDomainOrPackage d repeat suffix:= @@ -809,7 +809,7 @@ breaklet(fn,vars) == pair:= ASSOC("BREAK",fnEntry) => union(vars,rest pair) vars $letAssoc:= - null fnEntry => [[fn,:LIST ["BREAK",:vars]],:$letAssoc] + null fnEntry => [[fn,:[["BREAK",:vars]]],:$letAssoc] pair => (pair.rest := vars; $letAssoc) if $letAssoc then SETLETPRINTFLAG true $QuickLet:local := false @@ -830,5 +830,5 @@ break msg == sayBrightly msg INTERRUPT() -compileBoot fn == _/D_,1(LIST fn,'(_/COMP),nil,nil) +compileBoot fn == _/D_,1([fn],'(_/COMP),nil,nil) diff --git a/src/interp/wi1.boot b/src/interp/wi1.boot index 759acbcf..c4ee9412 100644 --- a/src/interp/wi1.boot +++ b/src/interp/wi1.boot @@ -109,7 +109,7 @@ compJoin(["Join",:argl],m,e) == union("append"/[getParms(y,e) for y in rest x],parameters) where getParms(y,e) == atom y => - isDomainForm(y,e) => LIST y + isDomainForm(y,e) => [y] nil y is ['LENGTH,y'] => [y,y'] LIST y @@ -862,7 +862,7 @@ spadCompileOrSetq form == macform := ['XLAM,vl',body] LAM_,EVALANDFILEACTQ ['PUT,MKQ nam,MKQ 'SPADreplace,MKQ macform] sayBrightly ['" ",:bright nam,'"is replaced by",:bright body] - $insideCapsuleFunctionIfTrue => first backendCompile LIST form + $insideCapsuleFunctionIfTrue => first backendCompile [form] compileConstructor form coerceHard(T,m) == -- cgit v1.2.3