diff options
| author | dos-reis <gdr@axiomatics.org> | 2010-05-07 15:16:57 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2010-05-07 15:16:57 +0000 |
| commit | c9c4d89aa7cc261a19ac29c7d74a43f1369f1773 (patch) | |
| tree | f4ec2476d730b9c24cb0930a13c087666f16cbe3 /src | |
| parent | 57cc9e7ab4606e72a6a12fd73fc4cc3cf0e10a83 (diff) | |
| download | open-axiom-c9c4d89aa7cc261a19ac29c7d74a43f1369f1773.tar.gz | |
* interp/as.boot: Miscellaneous cleanup.
* interp/ax.boot: Likewise.
* interp/br-con.boot: Likewise.
* interp/br-prof.boot: Likewise.
* interp/br-saturn.boot: Likewise.
* interp/br-search.boot: Likewise.
* interp/br-util.boot: Likewise.
* interp/c-doc.boot: Likewise.
* interp/clammed.boot: Likewise.
* interp/compiler.boot: Likewise.
* interp/database.boot: Likewise.
* interp/cstream.boot: Likewise.
* interp/define.boot: Likewise.
* interp/diagnostics.boot: Likewise.
* interp/format.boot: Likewise.
* interp/fortcall.boot: Likewise.
* interp/functor.boot: Likewise.
* interp/g-boot.boot: Likewise.
* interp/g-opt.boot: Likewise.
* interp/g-util.boot: Likewise.
* interp/ht-util.boot: Likewise.
* interp/htsetvar.boot: Likewise.
* interp/i-analy.boot: Likewise.
* interp/i-coerce.boot: Likewise.
* interp/i-funsel.boot: Likewise.
* interp/i-intern.boot: Likewise.
* interp/i-map.boot: Likewise.
* interp/i-output.boot: Likewise.
* interp/i-spec1.boot: Likewise.
* interp/i-syscmd.boot: Likewise.
* interp/interop.boot: Likewise.
* interp/lisplib.boot: Likewise.
* interp/mark.boot: Likewise.
* interp/msgdb.boot: Likewise.
* interp/newfort.boot: Likewise.
* interp/nrunfast.boot: Likewise.
* interp/nrungo.boot: Likewise.
* interp/pathname.boot: Likewise.
* interp/pf2atree.boot: Likewise.
* interp/pf2sex.boot: Likewise.
* interp/pspad1.boot: Likewise.
* interp/record.boot: Likewise.
* interp/setvars.boot: Likewise.
* interp/trace.boot: Likewise.
* interp/wi1.boot: Likewise.
* interp/wi2.boot: Likewise.
Diffstat (limited to 'src')
47 files changed, 222 insertions, 173 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index c2f2568b..ba5b34b1 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,52 @@ +2010-05-07 Gabriel Dos Reis <gdr@cse.tamu.edu> + + * interp/as.boot: Miscellaneous cleanup. + * interp/ax.boot: Likewise. + * interp/br-con.boot: Likewise. + * interp/br-prof.boot: Likewise. + * interp/br-saturn.boot: Likewise. + * interp/br-search.boot: Likewise. + * interp/br-util.boot: Likewise. + * interp/c-doc.boot: Likewise. + * interp/clammed.boot: Likewise. + * interp/compiler.boot: Likewise. + * interp/database.boot: Likewise. + * interp/cstream.boot: Likewise. + * interp/define.boot: Likewise. + * interp/diagnostics.boot: Likewise. + * interp/format.boot: Likewise. + * interp/fortcall.boot: Likewise. + * interp/functor.boot: Likewise. + * interp/g-boot.boot: Likewise. + * interp/g-opt.boot: Likewise. + * interp/g-util.boot: Likewise. + * interp/ht-util.boot: Likewise. + * interp/htsetvar.boot: Likewise. + * interp/i-analy.boot: Likewise. + * interp/i-coerce.boot: Likewise. + * interp/i-funsel.boot: Likewise. + * interp/i-intern.boot: Likewise. + * interp/i-map.boot: Likewise. + * interp/i-output.boot: Likewise. + * interp/i-spec1.boot: Likewise. + * interp/i-syscmd.boot: Likewise. + * interp/interop.boot: Likewise. + * interp/lisplib.boot: Likewise. + * interp/mark.boot: Likewise. + * interp/msgdb.boot: Likewise. + * interp/newfort.boot: Likewise. + * interp/nrunfast.boot: Likewise. + * interp/nrungo.boot: Likewise. + * interp/pathname.boot: Likewise. + * interp/pf2atree.boot: Likewise. + * interp/pf2sex.boot: Likewise. + * interp/pspad1.boot: Likewise. + * interp/record.boot: Likewise. + * interp/setvars.boot: Likewise. + * interp/trace.boot: Likewise. + * interp/wi1.boot: Likewise. + * interp/wi2.boot: Likewise. + 2010-05-06 Gabriel Dos Reis <gdr@cs.tamu.edu> * boot/ast.boot: Miscellaneous cleanup. diff --git a/src/interp/as.boot b/src/interp/as.boot index cfb7ce97..114696ba 100644 --- a/src/interp/as.boot +++ b/src/interp/as.boot @@ -138,8 +138,8 @@ asMakeAlist con == record := HGET($conHash,con) [form,sig,predlist,kind,exposure,comments,typeCode,:filename] := first record --TTT in case we put the wrong thing in for niladic catgrs ---if ATOM(form) and kind='category then form:=[form] - if ATOM(form) then form:=[form] +--if atom(form) and kind='category then form:=[form] + if atom(form) then form:=[form] kind = 'function => asMakeAlistForFunction con abb := asyAbbreviation(con,#(KDR sig)) if null KDR form then PUT(opOf form,'NILADIC,'T) diff --git a/src/interp/ax.boot b/src/interp/ax.boot index 57831a7c..2effa6b6 100644 --- a/src/interp/ax.boot +++ b/src/interp/ax.boot @@ -109,7 +109,7 @@ modemapToAx(modemap) == categoryInfo := getConstructorCategoryFromDB constructor categoryInfo := SUBLISLIS($FormalMapVariableList, $TriangleVariableList, categoryInfo) - NULL args => + null args => ['Define,['Declare, constructor,'Category], addDefaults(constructor, axFormatType categoryInfo)] ['Define, @@ -118,7 +118,7 @@ modemapToAx(modemap) == ['Label, constructor, addDefaults(constructor, axFormatType categoryInfo)]]] constructor in $extendedDomains => - NULL args => + null args => ['Extend, ['Define, ['Declare, constructor, resultType], ['Add, ['PretendTo, ['Add, [], []], resultType], []]]] conscat := INTERN(STRCONC(SYMBOL_-NAME(constructor), "ExtendCategory"),"BOOT") @@ -137,7 +137,7 @@ modemapToAx(modemap) == ['Lambda, argdecls, rtype, ['Label, constructor, ['Add, ['PretendTo, ['Add, [], []], rtype], []]]]]]] - NULL args => + null args => ['Export, ['Declare, constructor, resultType],[],[]] -- if resultType is ['With,a,b] then -- if not(b is ['Sequence,:withseq]) then withseq := [b] @@ -242,7 +242,7 @@ axFormatType(typeform) == axFormatOpList ops == ['Sequence,:[axFormatOp o for o in ops]] axOpTran(name) == - ATOM name => + atom name => name = 'elt => 'apply name = 'setelt => 'set_! name = 'SEGMENT => ".." @@ -287,7 +287,7 @@ axFormatCondOp op == axFormatOp op == op is ['IF, pred, trueops, falseops] => - NULL(trueops) or trueops='%noBranch => + null(trueops) or trueops='%noBranch => ['If, ['Test,['Not, axFormatPred pred]], axFormatCondOp falseops, axFormatCondOp trueops] diff --git a/src/interp/br-con.boot b/src/interp/br-con.boot index b4360039..7560ac0c 100644 --- a/src/interp/br-con.boot +++ b/src/interp/br-con.boot @@ -707,7 +707,7 @@ mkConform(kind,name,argString) == sayBrightlyNT '"Won't parse: " pp form systemError '"Keywords in argument list?" - ATOM parse => [parse] + atom parse => [parse] parse [INTERN name,:rest ncParseFromString STRCONC(char 'd,argString)] --& case @@ -885,7 +885,7 @@ dbGetDocTable(op,$sig,docTable,$which,aux) == main where or/[gn x for x in HGET(docTable,op)] gn u == --u is [origin,entry1,...,:code] $conform := first u --origin - if ATOM $conform then $conform := [$conform] + if atom $conform then $conform := [$conform] code := LASTATOM u --optional topic code comments := or/[p for entry in rest u | p := hn entry] or return nil [$conform,first comments,:code] diff --git a/src/interp/br-prof.boot b/src/interp/br-prof.boot index 32979507..b67bb4a4 100644 --- a/src/interp/br-prof.boot +++ b/src/interp/br-prof.boot @@ -1,6 +1,6 @@ -- Copyright (c) 1991-2002, The Numerical Algorithms Group Ltd. -- All rights reserved. --- Copyright (C) 2007-2009, Gabriel Dos Reis. +-- Copyright (C) 2007-2010, Gabriel Dos Reis. -- All rights reserved. -- -- Redistribution and use in source and binary forms, with or without @@ -247,7 +247,7 @@ hasNewInfoAlist conname == (u := getInfoAlist conname) and hasNewInfoText u hasNewInfoText u == - and/[ATOM op and "and"/[item is [sig,:alist] and + and/[atom op and "and"/[item is [sig,:alist] and null sig or null atom sig and null atom alist for item in items] for [op,:items] in u] getInfoAlist conname == diff --git a/src/interp/br-saturn.boot b/src/interp/br-saturn.boot index 83933fd5..e5bcb8b6 100644 --- a/src/interp/br-saturn.boot +++ b/src/interp/br-saturn.boot @@ -556,7 +556,7 @@ htpAddToPageDescription(htPage, pageDescrip) == htProcessBcStrings strings == for [numChars, default, stringName, spadType, :filter] in strings repeat mess2 := '"" - if NULL LASSOC(stringName, htpInputAreaAlist page()) then + if null LASSOC(stringName, htpInputAreaAlist page()) then setUpDefault(stringName, ['string, default, spadType, filter]) if htpLabelErrorMsg(page(), stringName) then iht ['"\centerline{{\em ", htpLabelErrorMsg(page(), stringName), '"}}"] diff --git a/src/interp/br-search.boot b/src/interp/br-search.boot index 0fefccb3..18448cb4 100644 --- a/src/interp/br-search.boot +++ b/src/interp/br-search.boot @@ -340,7 +340,7 @@ aPage(a,:b) == --called by \spadatt{a} arg := IFCAR b or a s := pmParseFromString STRINGIMAGE arg searchOn := - ATOM s => s + atom s => s IFCAR s $attributeArgs : local := IFCAR IFCDR s aSearch searchOn diff --git a/src/interp/br-util.boot b/src/interp/br-util.boot index 0a6c06d4..2f976504 100644 --- a/src/interp/br-util.boot +++ b/src/interp/br-util.boot @@ -184,7 +184,7 @@ unMkEvalable u == lisp2HT u == ['"_'",:fn u] where fn u == IDENTP u => escapeSpecialIds PNAME u string? u => escapeString u - ATOM u => systemError() + atom u => systemError() ['"_(",:"append"/[fn x for x in u],'")"] args2HtString(x,:options) == diff --git a/src/interp/c-doc.boot b/src/interp/c-doc.boot index bee36a7f..a2423913 100644 --- a/src/interp/c-doc.boot +++ b/src/interp/c-doc.boot @@ -107,7 +107,7 @@ recordDocumentation(key,lineno) == recordHeaderDocumentation lineno == if $maxSignatureLineNumber = 0 then al := [p for (p := [n,:u]) in $COMBLOCKLIST - | NULL n or NULL lineno or n < lineno] + | null n or null lineno or n < lineno] $COMBLOCKLIST := SETDIFFERENCE($COMBLOCKLIST,al) $headerDocumentation := ASSOCRIGHT al if $headerDocumentation then $maxSignatureLineNumber := 1 --see postDef diff --git a/src/interp/clammed.boot b/src/interp/clammed.boot index 9cf3d5c4..a1798e3a 100644 --- a/src/interp/clammed.boot +++ b/src/interp/clammed.boot @@ -164,7 +164,7 @@ isLegitimateMode(t,hasPolyMode,polyVarList) == null t => true -- a terminating condition with underDomainOf t = $EmptyMode => true string? t => true - ATOM t => false + atom t => false badDoubles := CONS($QuotientField, '(Gaussian Complex Polynomial Expression)) t is [T1, [T2, :.]] and T1 = T2 and member(T1, badDoubles) => false diff --git a/src/interp/compiler.boot b/src/interp/compiler.boot index bb50ac19..fdc81fe7 100644 --- a/src/interp/compiler.boot +++ b/src/interp/compiler.boot @@ -257,7 +257,7 @@ applyMapping([op,:argl],m,e,ml) == -- if argl'="failed" then return nil -- mappingHasCategoryTarget => convert([form,first ml,e],m) -- form:= --- not MEMQ(op,$formalArgList) and ATOM op => +-- not MEMQ(op,$formalArgList) and atom op => -- [op',:argl',"$"] where -- op':= INTERN STRCONC(STRINGIMAGE $prefix,";",STRINGIMAGE op) -- ["%Call",["applyFun",op],:argl'] diff --git a/src/interp/cstream.boot b/src/interp/cstream.boot index 5ada55f1..941faef6 100644 --- a/src/interp/cstream.boot +++ b/src/interp/cstream.boot @@ -1,6 +1,6 @@ -- Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd. -- All rights reserved. --- Copyright (C) 2007-2009, Gabriel Dos Reis. +-- Copyright (C) 2007-2010, Gabriel Dos Reis. -- All rights reserved. -- -- Redistribution and use in source and binary forms, with or without @@ -56,7 +56,7 @@ incRgen s==Delay(function incRgen1,[s]) incRgen1(:z)== [s]:=z a:=shoeread_-line s - if NULL a + if null a then (CLOSE s;StreamNil) else cons(a,incRgen s) diff --git a/src/interp/database.boot b/src/interp/database.boot index f30bceec..93c1b632 100644 --- a/src/interp/database.boot +++ b/src/interp/database.boot @@ -749,7 +749,7 @@ dropPrefix(fn) == --++ x := dropLeadingBlanks x --++ -- should be two tokens on the line --++ p := STRPOS('" ",x,1,NIL) ---++ NULL p => +--++ null p => --++ throwKeyedMsg("S2IZ0069B",[namestring egFile,x]) --++ n := object2Identifier SUBSTRING(x,0,p) --++ x := dropLeadingBlanks SUBSTRING(x,p+1,NIL) diff --git a/src/interp/define.boot b/src/interp/define.boot index bdaf06d6..e1fe1ebf 100644 --- a/src/interp/define.boot +++ b/src/interp/define.boot @@ -1537,8 +1537,8 @@ doItIf(item is [.,p,x,y],$predl,$e) == -- of functorLocalParameters that were added during the -- conditional compilation nils:=ans:=[] - for u in flp1 repeat -- is =u form always an ATOM? - if ATOM u or (or/[v is [.,=u,:.] for v in $getDomainCode]) + for u in flp1 repeat -- is =u form always an atom? + if atom u or (or/[v is [.,=u,:.] for v in $getDomainCode]) then nils:=[u,:nils] else @@ -1622,7 +1622,7 @@ DomainSubstitutionFunction(parameters,body) == if parameters then (body:= Subst(parameters,body)) where Subst(parameters,body) == - ATOM body => + atom body => MEMQ(body,parameters) => MKQ body body member(body,parameters) => diff --git a/src/interp/diagnostics.boot b/src/interp/diagnostics.boot index 600244f8..21e15092 100644 --- a/src/interp/diagnostics.boot +++ b/src/interp/diagnostics.boot @@ -83,7 +83,7 @@ MESSAGEPRINT_-1 x == x = "%l" or x = '"%l" => TERPRI() string? x => PRINC x IDENTP x => PRINC x - ATOM x => PRINC x + atom x => PRINC x PRINC '"(" MESSAGEPRINT_-1 car x MESSAGEPRINT_-2 cdr x diff --git a/src/interp/format.boot b/src/interp/format.boot index f2f45437..4dce8583 100644 --- a/src/interp/format.boot +++ b/src/interp/format.boot @@ -385,7 +385,7 @@ constructorName con == con form2String1 u == - ATOM u => + atom u => u=$EmptyMode or u=$quadSymbol => formWrapId specialChar 'quad IDENTP u => constructor? u => app2StringWrap(formWrapId u, [u]) @@ -544,7 +544,7 @@ tuple2String argl == if member(string, '("failed" "nil" "prime" "sqfr" "irred")) then string := STRCONC('"_"",string,'"_"") else string := - ATOM string => object2String string + atom string => object2String string [f x for x in string] for x in rest argl repeat if member(x,'("failed" "nil" "prime" "sqfr" "irred")) then @@ -553,7 +553,7 @@ tuple2String argl == string where f x == - ATOM x => object2String x + atom x => object2String x -- [f first x,:f rest x] [f y for y in x] @@ -733,7 +733,7 @@ mathObject2String x == object2String x == string? x => x IDENTP x => PNAME x - NULL x => '"" + null x => '"" cons? x => STRCONC(object2String first x, object2String rest x) WRITE_-TO_-STRING x diff --git a/src/interp/fortcall.boot b/src/interp/fortcall.boot index 52179838..7c4ba4e4 100644 --- a/src/interp/fortcall.boot +++ b/src/interp/fortcall.boot @@ -619,7 +619,7 @@ writeData(tmpFile,indata) == -- the two Boolean values v = "T" => xdrWrite(xstr,1) - NULL v => + null v => xdrWrite(xstr,0) -- characters string? v => diff --git a/src/interp/functor.boot b/src/interp/functor.boot index 13dc8c96..bd435cab 100644 --- a/src/interp/functor.boot +++ b/src/interp/functor.boot @@ -192,8 +192,8 @@ CategoriesFromGDC x == x is ['QUOTE,a] and a is [b] => [a] compCategories u == - ATOM u => u - not ATOM first u => + atom u => u + not atom first u => error ['"compCategories: need an atom in operator position", first u] first u = "Record" => -- There is no modemap property for these guys so do it by hand. @@ -203,7 +203,7 @@ compCategories u == [first u, :[compCategories1(a,'(SetCategory)) for a in rest u]] u is ['SubDomain,D,.] => compCategories D v:=get(first u,'modemap,$e) - ATOM v => + atom v => error ['"compCategories: could not get proper modemap for operator",first u] if rest v then sayBrightly ['"compCategories: ", '%b, '"Warning", '%d, @@ -211,7 +211,7 @@ compCategories u == pp rest v -- the next line "fixes" a bad modemap which sometimes appears .... -- - if rest v and NULL CAAAR v then v:=rest v + if rest v and null CAAAR v then v:=rest v v:= CDDAAR v v:=resolvePatternVars(v, rest u) -- replaces #n forms -- select the modemap part of the first entry, and skip result etc. @@ -220,7 +220,7 @@ compCategories u == compCategories1(u,v) == -- v is the mode of u - ATOM u => u + atom u => u isCategoryForm(v,$e) => compCategories u [c,:.] := comp(macroExpand(u,$e),v,$e) => c error 'compCategories1 @@ -325,7 +325,7 @@ setVector12 args == freeof($domainShell.4,args1) => nil [['SetDomainSlots124,'$,['QUOTE,args1],['LIST,:args2]]] where freeof(a,b) == - ATOM a => NULL MEMQ(a,b) + atom a => null MEMQ(a,b) freeof(first a,b) => freeof(rest a,b) false @@ -528,7 +528,7 @@ DescendCodeAdd1(base,flag,target,formalArgs,formalArgModes) == (for u in code repeat if update(u,copyvec,[]) then code:=delete(u,code)) where update(code,copyvec,sofar) == - ATOM code =>nil + atom code =>nil QCAR code in '(getShellEntry ELT QREFELT) => copyvec.(third code):=union(copyvec.(third code), sofar) true diff --git a/src/interp/g-boot.boot b/src/interp/g-boot.boot index a38ad917..77d99e9e 100644 --- a/src/interp/g-boot.boot +++ b/src/interp/g-boot.boot @@ -52,7 +52,7 @@ $isGenVarCounter := 1 $LET := 'SPADLET -- LET is a standard macro in Common Lisp nakedEXIT? c == - ATOM c => NIL + atom c => NIL [a,:d] := c IDENTP a => a = 'EXIT => true @@ -62,7 +62,7 @@ nakedEXIT? c == nakedEXIT?(a) or nakedEXIT?(d) mergeableCOND x == - ATOM(x) or x isnt ['COND,:cls] => NIL + atom(x) or x isnt ['COND,:cls] => NIL -- to be mergeable, every result must be an EXIT and the last -- predicate must be a pair ok := true @@ -70,8 +70,8 @@ mergeableCOND x == [[p,:r],:cls] := cls cons? QCDR r => ok := NIL first(r) isnt ['EXIT,.] => ok := NIL - NULL(cls) and ATOM(p) => ok := NIL - NULL(cls) and (p = ''T) => ok := NIL + null(cls) and atom(p) => ok := NIL + null(cls) and (p = ''T) => ok := NIL ok mergeCONDsWithEXITs l == @@ -79,7 +79,7 @@ mergeCONDsWithEXITs l == -- (COND (foo (EXIT a))) -- (COND (bar (EXIT b))) -- into one COND - NULL l => NIL + null l => NIL atom l => l atom QCDR l => l a := QCAR l @@ -111,14 +111,14 @@ removeEXITFromCOND c == -- c is '(COND ...) z := NIL for cl in rest c repeat - ATOM cl => z := CONS(cl,z) + atom cl => z := CONS(cl,z) cond := QCAR cl length1? cl => cond is ["EXIT",:.] => z := CONS(QCDR cond,z) z := CONS(cl,z) cl' := reverse cl lastSE := QCAR cl' - ATOM lastSE => z := CONS(cl,z) + atom lastSE => z := CONS(cl,z) lastSE is ["EXIT",:.] => z := CONS(reverse CONS(second lastSE,rest cl'),z) z := CONS(cl,z) @@ -149,7 +149,7 @@ bootIF c == bootCOND c == -- handles COND expressions: c is ['COND,:.] cls := rest c - NULL cls => NIL + null cls => NIL cls is [[''T,r],:.] => r [:icls,fcls] := cls ncls := NIL @@ -197,17 +197,17 @@ tryToRemoveSEQ e == bootAbsorbSEQsAndPROGNs e == -- assume e is a list from a SEQ or a PROGN - ATOM e => e + atom e => e [:cls,lcl] := e g := [:flatten(f) for f in cls] where flatten x == - NULL x => NIL + null x => NIL IDENTP x => MEMQ(x,$labelsForGO) => [x] NIL - ATOM x => NIL + atom x => NIL x is ['PROGN,:pcls,lpcl] => - ATOM lpcl => pcls + atom lpcl => pcls rest x -- next usually comes about from if foo then bar := zap x is ['COND,y,[''T,'NIL]] => [['COND,y]] @@ -240,7 +240,7 @@ bootSEQ e == bootPROGN e == e := ['PROGN,:bootAbsorbSEQsAndPROGNs rest e] [.,:cls] := e - NULL cls => NIL + null cls => NIL cls is [body] => body e @@ -277,12 +277,12 @@ defLET1(lhs,rhs) == defLET2(lhs,rhs) == IDENTP lhs => defLetForm(lhs,rhs) - NULL lhs => NIL + null lhs => NIL lhs is ['FLUID,id] => defLetForm(lhs,rhs) lhs is [=$LET,a,b] => a := defLET2(a,rhs) null (b := defLET2(b,rhs)) => a - ATOM b => [a,b] + atom b => [a,b] cons? QCAR b => CONS(a,b) [a,b] lhs is ['CONS,var1,var2] => @@ -290,11 +290,11 @@ defLET2(lhs,rhs) == defLET2(var2,addCARorCDR('CDR,rhs)) l1 := defLET2(var1,addCARorCDR('CAR,rhs)) var2 in '(NIL _.) => l1 - if cons? l1 and ATOM first l1 then l1 := cons(l1,nil) + if cons? l1 and atom first l1 then l1 := cons(l1,nil) IDENTP var2 => [:l1,defLetForm(var2,addCARorCDR('CDR,rhs))] l2 := defLET2(var2,addCARorCDR('CDR,rhs)) - if cons? l2 and ATOM first l2 then l2 := cons(l2,nil) + if cons? l2 and atom first l2 then l2 := cons(l2,nil) append(l1,l2) lhs is ['APPEND,var1,var2] => patrev := defISReverse(var2,var1) @@ -302,7 +302,7 @@ defLET2(lhs,rhs) == g := INTERN STRCONC('"LETTMP#",STRINGIMAGE $letGenVarCounter) $letGenVarCounter := $letGenVarCounter + 1 l2 := defLET2(patrev,g) - if cons? l2 and ATOM first l2 then l2 := cons(l2,nil) + if cons? l2 and atom first l2 then l2 := cons(l2,nil) var1 = "." => [[$LET,g,rev],:l2] last l2 is [=$LET, =var1, val1] => [[$LET,g,rev],:reverse rest reverse l2, @@ -343,20 +343,20 @@ defISReverse(x,a) == -- reverses forms coming from APPENDs in patterns -- pretty much just a translation of DEF-IS-REV x is ['CONS,:.] => - NULL third x => ['CONS,second x, a] + null third x => ['CONS,second x, a] y := defISReverse(third x, NIL) RPLAC(third y,['CONS,second x,a]) y ERRHUH() defIS1(lhs,rhs) == - NULL rhs => + null rhs => ['NULL,lhs] string? rhs => ['EQ,lhs,['QUOTE,INTERN rhs]] NUMBERP rhs => ['EQUAL,lhs,rhs] - ATOM rhs => + atom rhs => ['PROGN,defLetForm(rhs,lhs),''T] rhs is ['QUOTE,a] => IDENTP a => ['EQ,lhs,rhs] @@ -374,12 +374,12 @@ defIS1(lhs,rhs) == MKPROGN [[$LET,g,lhs],defIS1(g,rhs)] rhs is ['CONS,a,b] => a = "." => - NULL b => + null b => ['AND,['CONSP,lhs], ['EQ,['QCDR,lhs],'NIL]] ['AND,['CONSP,lhs], defIS1(['QCDR,lhs],b)] - NULL b => + null b => ['AND,['CONSP,lhs], ['EQ,['QCDR,lhs],'NIL],_ defIS1(['QCAR,lhs],a)] @@ -396,7 +396,7 @@ defIS1(lhs,rhs) == $isGenVarCounter := $isGenVarCounter + 1 rev := ['AND,['CONSP,lhs],['PROGN,[$LET,g,['REVERSE,lhs]],''T]] l2 := defIS1(g,patrev) - if cons? l2 and ATOM first l2 then l2 := cons(l2,nil) + if cons? l2 and atom first l2 then l2 := cons(l2,nil) a = "." => ['AND,rev,:l2] ['AND,rev,:l2,['PROGN,defLetForm(a,['NREVERSE,a]),''T]] SAY '"WARNING (defIS1): possibly bad IS code being generated" @@ -412,8 +412,8 @@ defIS(lhs,rhs) == bootOR e == -- flatten any contained ORs. cls := rest e - NULL cls => NIL - NULL rest cls => first cls + null cls => NIL + null rest cls => first cls ncls := [:flatten(c) for c in cls] where flatten x == x is ['OR,:.] => QCDR x @@ -423,8 +423,8 @@ bootOR e == bootAND e == -- flatten any contained ANDs. cls := rest e - NULL cls => 'T - NULL rest cls => first cls + null cls => 'T + null rest cls => first cls ncls := [:flatten(c) for c in cls] where flatten x == x is ['AND,:.] => QCDR x @@ -434,7 +434,7 @@ bootAND e == --% Main Transformation Functions bootLabelsForGO e == - ATOM e => NIL + atom e => NIL [head,:tail] := e IDENTP head => head = 'GO => $labelsForGO := CONS(first tail,$labelsForGO) @@ -444,7 +444,7 @@ bootLabelsForGO e == bootLabelsForGO tail bootTran e == - ATOM e => e + atom e => e [head,:tail] := e head = 'QUOTE => e tail := [bootTran t for t in tail] @@ -460,7 +460,7 @@ bootTran e == [bootTran head,:QCDR e] bootTransform e == ---NULL $BOOT => e +--null $BOOT => e $labelsForGO : local := NIL bootLabelsForGO e bootTran e diff --git a/src/interp/g-opt.boot b/src/interp/g-opt.boot index 3b9976f2..c7dba6e2 100644 --- a/src/interp/g-opt.boot +++ b/src/interp/g-opt.boot @@ -235,7 +235,7 @@ optSpecialCall(x,y,n) == emitIndirectCall(fn,a,x) compileTimeBindingOf u == - NULL(name:= BPINAME u) => keyedSystemError("S2OO0001",[u]) + null(name:= BPINAME u) => keyedSystemError("S2OO0001",[u]) name="Undef" => MOAN "optimiser found unknown function" name diff --git a/src/interp/g-util.boot b/src/interp/g-util.boot index 97e4e45c..cb4099c1 100644 --- a/src/interp/g-util.boot +++ b/src/interp/g-util.boot @@ -309,7 +309,7 @@ getTypeOfSyntax t == -- Convert an arbitrary lisp object to canonical boolean. bool: %Thing -> %Boolean bool x == - NULL NULL x + null null x TruthP x == --True if x is a predicate that's always true @@ -525,9 +525,9 @@ removeZeroOneDestructively t == flattenSexpr s == null s => s - ATOM s => s + atom s => s [f,:r] := s - ATOM f => [f,:flattenSexpr r] + atom f => [f,:flattenSexpr r] [:flattenSexpr f,:flattenSexpr r] isLowerCaseLetter c == @@ -554,7 +554,7 @@ update() == listSort(pred,list,:optional) == NOT functionp pred => error "listSort: first arg must be a function" NOT LISTP list => error "listSort: second argument must be a list" - NULL optional => mergeSort(pred,function Identity,list,LENGTH list) + null optional => mergeSort(pred,function Identity,list,LENGTH list) key := first optional NOT functionp key => error "listSort: last arg must be a function" mergeSort(pred,key,list,LENGTH list) @@ -573,16 +573,16 @@ orderList l == listSort(function _?ORDER, COPY_-LIST l) mergeInPlace(f,g,p,q) == -- merge the two sorted lists p and q - if NULL p then return p - if NULL q then return q + if null p then return p + if null q then return q if FUNCALL(f,FUNCALL(g, QCAR p),FUNCALL(g, QCAR q)) then (r := t := p; p := QCDR p) else (r := t := q; q := QCDR q) - while not NULL p and not NULL q repeat + while not null p and not null q repeat if FUNCALL(f,FUNCALL(g,QCAR p),FUNCALL(g,QCAR q)) then (QRPLACD(t,p); t := p; p := QCDR p) else (QRPLACD(t,q); t := q; q := QCDR q) - if NULL p then QRPLACD(t,q) else QRPLACD(t,p) + if null p then QRPLACD(t,q) else QRPLACD(t,p) r mergeSort(f,g,p,n) == diff --git a/src/interp/ht-util.boot b/src/interp/ht-util.boot index 79543cfc..924110d8 100644 --- a/src/interp/ht-util.boot +++ b/src/interp/ht-util.boot @@ -219,7 +219,7 @@ bcIssueHt line == iht line mapStringize l == - ATOM l => l + atom l => l RPLACA(l, basicStringize first l) RPLACD(l, mapStringize rest l) l @@ -254,7 +254,7 @@ htQuote s == htProcessToggleButtons buttons == iht '"\newline\indent{5}\beginitems " for [message, info, defaultValue, buttonName] in buttons repeat - if NULL LASSOC(buttonName, htpInputAreaAlist $curPage) then + if null LASSOC(buttonName, htpInputAreaAlist $curPage) then setUpDefault(buttonName, ['button, defaultValue]) iht ['"\item{\em\inputbox[", htpLabelDefault($curPage, buttonName), '"]{", buttonName, '"}{\htbmfile{pick}}{\htbmfile{unpick}}\space{}"] @@ -265,7 +265,7 @@ htProcessToggleButtons buttons == htProcessBcButtons buttons == for [defaultValue, buttonName] in buttons repeat - if NULL LASSOC(buttonName, htpInputAreaAlist $curPage) then + if null LASSOC(buttonName, htpInputAreaAlist $curPage) then setUpDefault(buttonName, ['button, defaultValue]) k := htpLabelDefault($curPage,buttonName) k = 0 => iht ['"\off{",buttonName,'"}"] @@ -309,7 +309,7 @@ htRadioButtons [groupName, :buttons] == '"}{\htbmfile{pick}}{\htbmfile{unpick}}\beginitems "] defaultValue := '"1" for [message, info, buttonName] in buttons repeat - if NULL LASSOC(buttonName, htpInputAreaAlist $curPage) then + if null LASSOC(buttonName, htpInputAreaAlist $curPage) then setUpDefault(buttonName, ['button, defaultValue]) defaultValue := '"0" iht ['"\item{\em\radiobox[", htpLabelDefault($curPage, buttonName), '"]{", @@ -327,7 +327,7 @@ htBcRadioButtons [groupName, :buttons] == '"}{\htbmfile{pick}}{\htbmfile{unpick}} "] defaultValue := '"1" for [message, info, buttonName] in buttons repeat - if NULL LASSOC(buttonName, htpInputAreaAlist $curPage) then + if null LASSOC(buttonName, htpInputAreaAlist $curPage) then setUpDefault(buttonName, ['button, defaultValue]) defaultValue := '"0" iht ['"{\em\radiobox[", htpLabelDefault($curPage, buttonName), '"]{", @@ -343,7 +343,7 @@ htInputStrings strings == iht '"\newline\indent{5}\beginitems " for [mess1, mess2, numChars, default, stringName, spadType, :filter] in strings repeat - if NULL LASSOC(stringName, htpInputAreaAlist $curPage) then + if null LASSOC(stringName, htpInputAreaAlist $curPage) then setUpDefault(stringName, ['string, default, spadType, filter]) if htpLabelErrorMsg($curPage, stringName) then iht ['"\centerline{{\em ", htpLabelErrorMsg($curPage, stringName), '"}}"] @@ -397,7 +397,7 @@ pvarCondList1(pvarList, activeConds, condList) == pvarCondList1(pvarList, activeConds, restConds) pvarsOfPattern pattern == - NULL LISTP pattern => nil + null LISTP pattern => nil [pvar for pvar in rest pattern | pvar in $PatternVariableList] htMakeTemplates(templateList, numLabels) == @@ -409,7 +409,7 @@ htMakeTemplates(templateList, numLabels) == template templateParts template == - NULL string? template => template + null string? template => template i := SEARCH('"%l", template) null i => template [SUBSEQ(template, 0, i), : SUBSEQ(template, i+2)] diff --git a/src/interp/htsetvar.boot b/src/interp/htsetvar.boot index 1f82625b..ab5e9a6b 100644 --- a/src/interp/htsetvar.boot +++ b/src/interp/htsetvar.boot @@ -320,7 +320,7 @@ chkNonNegativeInteger s == chkRange s == (u := ncParseFromString s) and integer? u - and u >= $htInitial and (NULL $htFinal or u <= $htFinal) + and u >= $htInitial and (null $htFinal or u <= $htFinal) => u null $htFinal => STRCONC('"Please enter an integer greater than ",stringize ($htInitial - 1)) diff --git a/src/interp/i-analy.boot b/src/interp/i-analy.boot index 44bf2b28..29319472 100644 --- a/src/interp/i-analy.boot +++ b/src/interp/i-analy.boot @@ -580,7 +580,7 @@ printableArgModeSetList() == amsl := nil for a in reverse $origArgModeSetList repeat b := prefix2String first a - if ATOM b then b := [b] + if atom b then b := [b] amsl := ['%l,:b,:amsl] if amsl then amsl := rest amsl amsl diff --git a/src/interp/i-coerce.boot b/src/interp/i-coerce.boot index a1dad5ea..92828a74 100644 --- a/src/interp/i-coerce.boot +++ b/src/interp/i-coerce.boot @@ -311,7 +311,7 @@ retractByFunction(object,u) == fun := --+ compiledLookup(funName,[target,t],dcVector) - NULL fun => NIL + null fun => NIL first(fun) = function Undef => NIL --+ $: fluid := dcVector @@ -634,8 +634,8 @@ canCoercePermute(t1,t2) == -- to t2 in the sense that the components of t1 are in the same order -- as in t2. If length towers = 2 and t2 = last towers, we quit to -- avoid an infinte loop. - NULL towers or NULL rest towers => NIL - NULL CDDR towers and t2 = second towers => NIL + null towers or null rest towers => NIL + null CDDR towers and t2 = second towers => NIL -- do the coercions successively, quitting if any fail ok := true for t in rest towers while ok repeat @@ -671,7 +671,7 @@ absolutelyCanCoerceByCheating(t1,t2) == -- difference is a subdomain isEqualOrSubDomain(t1,t2) => true typeIsASmallInteger(t1) and t2 = $Integer => true - ATOM(t1) or ATOM(t2) => false + atom(t1) or atom(t2) => false [tl1,:u1] := deconstructT t1 [tl2,:u2] := deconstructT t2 tl1 = '(Stream) and tl2 = '(InfiniteTuple) => @@ -684,7 +684,7 @@ absolutelyCanCoerceByCheating(t1,t2) == absolutelyCannotCoerce(t1,t2) == -- response of true means "definitely cannot coerce" -- this is largely an efficiency hack - ATOM(t1) or ATOM(t2) => NIL + atom(t1) or atom(t2) => NIL t2 = $None => true n1 := first t1 n2 := first t2 @@ -1048,7 +1048,7 @@ coerceIntByMap(triple,t2) == [[dc,:sig],slot,.]:= first mms fun := compiledLookup('map,sig,evalDomain(dc)) - NULL fun => NIL + null fun => NIL [fn,:d]:= fun fn = function Undef => NIL -- now compile a function to do the coercion @@ -1186,8 +1186,8 @@ coerceIntPermute(object,t2) == -- to t2 in the sense that the components of t1 are in the same order -- as in t2. If length towers = 2 and t2 = last towers, we quit to -- avoid an infinte loop. - NULL towers or NULL rest towers => NIL - NULL CDDR towers and t2 = second towers => NIL + null towers or null rest towers => NIL + null CDDR towers and t2 = second towers => NIL -- do the coercions successively, quitting if any fail ok := true for t in rest towers while ok repeat @@ -1233,15 +1233,15 @@ computeTTTranspositions(t1,t2) == nreverse towers decomposeTypeIntoTower t == - ATOM t => [t] + atom t => [t] d := deconstructT t - NULL rest d => [t] + null rest d => [t] rd := reverse t [reverse QCDR rd,:decomposeTypeIntoTower QCAR rd] reassembleTowerIntoType tower == - ATOM tower => tower - NULL rest tower => first tower + atom tower => tower + null rest tower => first tower [:top,t,s] := tower reassembleTowerIntoType [:top,[:t,s]] diff --git a/src/interp/i-funsel.boot b/src/interp/i-funsel.boot index 8818d7c8..7bb306f4 100644 --- a/src/interp/i-funsel.boot +++ b/src/interp/i-funsel.boot @@ -228,7 +228,7 @@ selectMms2(op,tar,args1,args2,$Coerce) == while a repeat x:= first a a:= rest a - ATOM x => 'iterate + atom x => 'iterate mmS := append(mmS, findFunctionInDomain(op,x,tar,args1,args2,NIL,NIL)) -- step 2. if we didn't get one, trying coercing (if we are @@ -239,7 +239,7 @@ selectMms2(op,tar,args1,args2,$Coerce) == while a repeat x:= first a a:= rest a - ATOM x => 'iterate + atom x => 'iterate mmS := append(mmS, findFunctionInDomain(op,x,tar,args1,args2,$Coerce,NIL)) @@ -274,7 +274,7 @@ defaultTarget(opNode,op,nargs,args) == target a1 := first args - ATOM a1 => target + atom a1 => target a1f := QCAR a1 nargs = 1 => @@ -528,7 +528,7 @@ argCouldBelongToSubdomain(op, nargs) == CONTAINEDisDomain(symbol,cond) == -- looks for [isSubDomain,symbol,[domain]] in cond: returning T or NIL -- with domain being one of PositiveInteger and NonNegativeInteger - ATOM cond => false + atom cond => false QCAR cond in '(AND OR and or) => or/[CONTAINEDisDomain(symbol, u) for u in QCDR cond] EQ(QCAR cond,'isDomain) => @@ -1238,7 +1238,7 @@ replaceSharpCalls t == doReplaceSharpCalls t doReplaceSharpCalls t == - ATOM t => t + atom t => t t is ['_#, l] => #l t is ['construct,: l] => EVAL ['LIST,:l] [first t,:[ doReplaceSharpCalls u for u in rest t]] diff --git a/src/interp/i-intern.boot b/src/interp/i-intern.boot index b12bc1f2..8278d1af 100644 --- a/src/interp/i-intern.boot +++ b/src/interp/i-intern.boot @@ -63,7 +63,7 @@ transferSrcPosInfo(pf, atree) == -- following is a hack because parser code for getting filename -- seems wrong. fn := lnPlaceOfOrigin poGetLineObject(pos) - if NULL fn or fn = '"strings" then fn := '"console" + if null fn or fn = '"strings" then fn := '"console" putSrcPos(atree, fn, pfSourceText(pf), pfLinePosn(pos), pfCharPosn(pos)) atree diff --git a/src/interp/i-map.boot b/src/interp/i-map.boot index 5ca3e726..41026051 100644 --- a/src/interp/i-map.boot +++ b/src/interp/i-map.boot @@ -431,7 +431,7 @@ simplifyMapPattern (x,alias) == simplifyMapConstructorRefs form == -- try to linear format constructor names - ATOM form => form + atom form => form [op,:args] := form op in '(exit SEQ) => [op,:[simplifyMapConstructorRefs a for a in args]] @@ -440,11 +440,11 @@ simplifyMapConstructorRefs form == op in '(_: _:_: _@) => args is [obj,dom] => dom' := prefix2String dom - --if ATOM dom' then dom' := [dom'] + --if atom dom' then dom' := [dom'] --[op,obj,APPLY('CONCAT,dom')] dom'' := - ATOM dom' => dom' - NULL rest dom' => first dom' + atom dom' => dom' + null rest dom' => first dom' APPLY('CONCAT, dom') [op,obj, dom''] form @@ -1001,10 +1001,10 @@ findLocalVars1(op,form) == mkFreeVar($mapName,form) form is ['local, :vars] => for x in vars repeat - ATOM x => mkLocalVar(op, x) + atom x => mkLocalVar(op, x) form is ['free, :vars] => for x in vars repeat - ATOM x => mkFreeVar(op, x) + atom x => mkFreeVar(op, x) form is ["%LET",a,b] => (a is ["tuple",:vars]) and (b is ["tuple",:vals]) => for var in vars for val in vals repeat diff --git a/src/interp/i-output.boot b/src/interp/i-output.boot index 84e22ba6..21a3c31a 100644 --- a/src/interp/i-output.boot +++ b/src/interp/i-output.boot @@ -1139,7 +1139,7 @@ maprin0 x == maprinChk x == null $MatrixList => maPrin x - ATOM x and (u:= assoc(x,$MatrixList)) => + atom x and (u:= assoc(x,$MatrixList)) => $MatrixList := delete(u,$MatrixList) maPrin deMatrix rest u x is ["=",arg,y] => --case for tracing with )math and printing matrices @@ -1189,7 +1189,7 @@ LargeMatrixp(u,width, dist) == -- sees if there is a matrix wider than 'width' in the next 'dist' -- part of u, a sized charybdis structure. -- NIL if not, first such matrix if there is one - ATOM u => nil + atom u => nil CDAR u <= width => nil --CDAR is the width of a charybdis structure op:=CAAR u @@ -1254,7 +1254,7 @@ SubstWhileDesizing(u,m) == -- arg. m is always nil (historical: EU directive to increase argument lists 1991/XGII) --Replaces all occurrences of matrix m by name in u --Taking out any outdated size information as it goes - ATOM u => u + atom u => u [[op,:n],:l]:=u --name := RASSOC(u,$MatrixList) => name -- doesn't work since RASSOC seems to use an EQ test, and returns the @@ -1268,7 +1268,7 @@ SubstWhileDesizing(u,m) == PushMatrix u l':=SubstWhileDesizingList(l,m) -- [op,:l'] - ATOM op => [op,:l'] + atom op => [op,:l'] [SubstWhileDesizing(op,m),:l'] --;SubstWhileDesizingList(u,m) == @@ -1284,11 +1284,11 @@ SubstWhileDesizing(u,m) == SubstWhileDesizingList(u,m) == u is [a,:b] => res:= - ATOM a => [a] + atom a => [a] [SubstWhileDesizing(a,m)] tail:=res for i in b repeat - if ATOM i then RPLACD(tail,[i]) else RPLACD(tail,[SubstWhileDesizing(i,m)]) + if atom i then RPLACD(tail,[i]) else RPLACD(tail,[SubstWhileDesizing(i,m)]) tail:=rest tail res u diff --git a/src/interp/i-spec1.boot b/src/interp/i-spec1.boot index 562b10ac..8e1a4480 100644 --- a/src/interp/i-spec1.boot +++ b/src/interp/i-spec1.boot @@ -346,7 +346,7 @@ upcase t == if first unionDoms is [":",.,.] then for i in 0.. for d in unionDoms repeat if d is [":",=rhs,.] then rhstag := i - if NULL rhstag then error '"upcase: bad Union form" + if null rhstag then error '"upcase: bad Union form" $genValue => rhstag = first unwrap objVal triple => code := wrap true code := wrap false @@ -797,7 +797,7 @@ checkForFreeVariables(v,locals) == -- bound variables, the parameter locals contains local variables which might -- be free, or the token ALL, which means that any parameter is a candidate -- to be free. - NULL v => v + null v => v symbol? v => v="$$$" => v -- Placeholder for mini-vector MEMQ(v,$boundVariables) => v @@ -932,7 +932,7 @@ mkIterZippedFun(indexList,funBody,zipType,$localVars) == vec subVecNodes(new,old,form) == - ATOM form => + atom form => (VECP form) and (form.0 = old) => new form [subVecNodes(new,old,first form), :subVecNodes(new,old,rest form)] diff --git a/src/interp/i-syscmd.boot b/src/interp/i-syscmd.boot index 6a9ab627..54e57973 100644 --- a/src/interp/i-syscmd.boot +++ b/src/interp/i-syscmd.boot @@ -1252,7 +1252,7 @@ displayType($op,u,omitVariableNameIfTrue) == sayMSG ['" Type of value of ", fixObjectForPrinting PNAME $op,'": (none)"] type := prefix2String objMode(u) - if ATOM type then type := [type] + if atom type then type := [type] sayMSG concat ['" Type of value of ",fixObjectForPrinting PNAME $op,'": ",:type] NIL @@ -1268,7 +1268,7 @@ displayValue($op,u,omitVariableNameIfTrue) == rhs := '": " STRCONC('"Value of ", PNAME $op,'": ") labmode := prefix2String objMode(u) - if ATOM labmode then labmode := [labmode] + if atom labmode then labmode := [labmode] IDENTP expr and getConstructorKindFromDB expr = "domain" => sayMSG concat('" ",label,labmode,rhs,form2String expr) mathprint ['CONCAT,label,:labmode,rhs, @@ -1335,7 +1335,7 @@ newHelpSpad2Cmd args == filestream := MAKE_-INSTREAM(helpFile) repeat line := read_-line(filestream,false) - NULL line => + null line => SHUT filestream return true SAY line @@ -1375,7 +1375,7 @@ frameSpad2Cmd args == arg := selectOptionLC(first args,frameArgs,'optionError) args := rest args if args is [a] then args := a - if ATOM args then args := object2Identifier args + if atom args then args := object2Identifier args arg = 'drop => args and cons?(args) => throwKeyedMsg("S2IZ0017",[args]) closeInterpreterFrame(args) @@ -1719,7 +1719,7 @@ resetInCoreHist() == changeHistListLen(n) == -- changes the length of $HistList. n must be nonnegative - NULL integer? n => sayKeyedMsg("S2IH0015",[n]) + null integer? n => sayKeyedMsg("S2IH0015",[n]) dif:= n-$HistListLen $HistListLen:= n l:= rest $HistList @@ -1989,7 +1989,7 @@ readHiFi(n) == if $useInternalHistoryTable then pair := assoc(n,$internalHistoryTable) - ATOM pair => keyedSystemError("S2IH0034",NIL) + atom pair => keyedSystemError("S2IH0034",NIL) vec := QCDR pair else HiFi:= RDEFIOSTREAM ['(MODE . INPUT),['FILE,:histFileName()]] @@ -2420,7 +2420,7 @@ reportOperations(oldArg,u) == sayKeyedMsg("S2IZ0064",NIL) u isnt ['Record,:.] and u isnt ['Union,:.] and null(isNameOfType u) and u isnt ['typeOf,.] => - if ATOM oldArg then oldArg := [oldArg] + if atom oldArg then oldArg := [oldArg] sayKeyedMsg("S2IZ0063",NIL) for op in oldArg repeat sayKeyedMsg("S2IZ0062",[opOf op]) diff --git a/src/interp/interop.boot b/src/interp/interop.boot index 36d8c28b..9e9b6581 100644 --- a/src/interp/interop.boot +++ b/src/interp/interop.boot @@ -61,7 +61,7 @@ DNameTupleID := 2 DNameOtherID := 3 DNameToSExpr1 dname == - NULL dname => error "unexpected domain name" + null dname => error "unexpected domain name" first dname = DNameStringID => INTERN(CompStrToString rest dname) name0 := DNameToSExpr1 second dname @@ -201,7 +201,7 @@ quoteCatOp cat == oldAxiomCategoryLookupExport(catenv, self, op, sig, box, env) == [catform,hash, pack,:.] := catenv opIsHasCat op => if EQL(sig, hash) then [self] else nil - NULL(pack) => nil + null(pack) => nil if not VECP pack then pack:=apply(pack, CONS(self, rest catform)) RPLACA(CDDR catenv, pack) diff --git a/src/interp/lisplib.boot b/src/interp/lisplib.boot index 9cd82943..3f2653f9 100644 --- a/src/interp/lisplib.boot +++ b/src/interp/lisplib.boot @@ -1,6 +1,6 @@ -- Copyright (c) 1991-2002, The Numerical Algorithms Group Ltd. -- All rights reserved. --- Copyright (C) 2007-2009, Gabriel Dos Reis. +-- Copyright (C) 2007-2010, Gabriel Dos Reis. -- All rights reserved. -- -- Redistribution and use in source and binary forms, with or without @@ -102,7 +102,7 @@ hasFilePropertyNoCache(p,id,abbrev) == -- it is assumed that the file exists and is a proper pathname -- startTimingProcess 'diskread fnStream:= readLibPathFast p - NULL fnStream => NIL + null fnStream => NIL -- str:= object2String id val:= rread(id,fnStream, nil) RSHUT fnStream @@ -482,8 +482,8 @@ mergeSignatureAndLocalVarAlists(signatureAlist, localVarAlist) == [funcName, :signature] in signatureAlist] Operators u == - ATOM u => [] - ATOM first u => + atom u => [] + atom first u => answer:="union"/[Operators v for v in rest u] MEMQ(first u,answer) => answer [first u,:answer] diff --git a/src/interp/mark.boot b/src/interp/mark.boot index 7ba9df49..2ce85383 100644 --- a/src/interp/mark.boot +++ b/src/interp/mark.boot @@ -299,7 +299,7 @@ markImport(d,:option) == --from compFormWithModemap/genDeltaEntry/compImport if IFCAR option then $globalDeclareStack := insert(dom,$globalDeclareStack) markMacroTran name == --called by markImport - ATOM name => name + atom name => name u := or/[x for [x,:y] in $globalMacroStack | y = name] => u u := or/[x for [x,:y] in $localMacroStack | y = name] => u [op,:argl] := name @@ -1263,7 +1263,7 @@ changeToEqualEqual lines == sayMessage x == u := - ATOM x => ['">> ", x] + atom x => ['">> ", x] ['">> ",: x] sayBrightly u @@ -1335,7 +1335,7 @@ diff(x,y) == diff1(x,y) == x = y => nil - ATOM x or ATOM y => [[x,y]] + atom x or atom y => [[x,y]] #x ~= #y => [x,y] "APPEND"/[diff1(u,v) for u in x for v in y] diff --git a/src/interp/msgdb.boot b/src/interp/msgdb.boot index 3798484f..b048b07a 100644 --- a/src/interp/msgdb.boot +++ b/src/interp/msgdb.boot @@ -118,7 +118,7 @@ getKeyedMsg key == fetchKeyedMsg(key,false) segmentKeyedMsg(msg) == string2Words msg segmentedMsgPreprocess x == - ATOM x => x + atom x => x [head,:tail] := x center := rightJust := NIL if member(head, '(%ceon "%ceon")) then center := true @@ -132,7 +132,7 @@ segmentedMsgPreprocess x == member(t, '(%ceoff "%ceoff" %rjoff "%rjoff")) => ok := NIL y := CONS(segmentedMsgPreprocess t,y) head1 := [(center => '"%ce"; '"%rj"),:nreverse y] - NULL tail => [head1] + null tail => [head1] [head1,:segmentedMsgPreprocess tail] head1 := segmentedMsgPreprocess head tail1 := segmentedMsgPreprocess tail @@ -571,8 +571,8 @@ throwKeyedMsgCannotCoerceWithValue(val,t1,t2) == --% Some Standard Message Printing Functions -bright x == ['"%b",:(cons?(x) and NULL rest LASTNODE x => x; [x]),'"%d"] ---bright x == ['%b,:(ATOM x => [x]; x),'%d] +bright x == ['"%b",:(cons?(x) and null rest LASTNODE x => x; [x]),'"%d"] +--bright x == ['%b,:(atom x => [x]; x),'%d] mkMessage msg == msg and (cons? msg) and member((first msg),'(%l "%l")) and @@ -706,7 +706,7 @@ brightPrintHighlight(x, out == $OutputStream) == -- following line helps find certain bugs that slip through -- also see sayBrightlyLength1 VECP x => sayString('"UNPRINTABLE",out) - ATOM x => sayString(object2String x,out) + atom x => sayString(object2String x,out) [key,:rst] := x if IDENTP key then key:=PNAME key key = '"%m" => mathprint(rst,out) @@ -730,7 +730,7 @@ brightPrintHighlightAsTeX(x, out == $OutputStream) == IDENTP x => pn := PNAME x sayString(pn,out) - ATOM x => sayString(object2String x,out) + atom x => sayString(object2String x,out) VECP x => sayString('"UNPRINTABLE",out) [key,:rst] := x key = '"%m" => mathprint(rst,out) @@ -761,7 +761,7 @@ tabber num == brightPrintCenter(x,out == $OutputStream) == $texFormatting => brightPrintCenterAsTeX(x,out) -- centers rst within $LINELENGTH, checking for %l's - ATOM x => + atom x => x := object2String x wid := STRINGLENGTH x if wid < $LINELENGTH then @@ -787,7 +787,7 @@ brightPrintCenter(x,out == $OutputStream) == NIL brightPrintCenterAsTeX(x, out == $OutputStream) == - ATOM x => + atom x => sayString('"\centerline{",out) sayString(x,out) sayString('"}",out) @@ -807,7 +807,7 @@ brightPrintCenterAsTeX(x, out == $OutputStream) == brightPrintRightJustify(x, out == $OutputStream) == -- right justifies rst within $LINELENGTH, checking for %l's - ATOM x => + atom x => x := object2String x wid := STRINGLENGTH x wid < $LINELENGTH => @@ -841,7 +841,7 @@ sayBrightlyLength l == sayBrightlyLength1 x == member(x,'("%b" "%d" %b %d)) => - NULL $highlightAllowed => 1 + null $highlightAllowed => 1 1 member(x,'("%l" %l)) => 0 string? x and STRINGLENGTH x > 2 and x.0 = '"%" and x.1 = '"x" => @@ -851,7 +851,7 @@ sayBrightlyLength1 x == -- following line helps find certain bugs that slip through -- also see brightPrintHighlight VECP x => STRINGLENGTH '"UNPRINTABLE" - ATOM x => STRINGLENGTH STRINGIMAGE x + atom x => STRINGLENGTH STRINGIMAGE x 2 + sayBrightlyLength x sayAsManyPerLineAsPossible l == diff --git a/src/interp/newfort.boot b/src/interp/newfort.boot index 21f90651..4fafac33 100644 --- a/src/interp/newfort.boot +++ b/src/interp/newfort.boot @@ -712,7 +712,7 @@ fortFormatCharacterTypes(names) == sortedByLength := [] genuineArrays := [] for u in names repeat - ATOM u => sortedByLength := insertEntry(0,u,sortedByLength) + atom u => sortedByLength := insertEntry(0,u,sortedByLength) #u=2 => sortedByLength := insertEntry(second u,first u,sortedByLength) genuineArrays := [u,:genuineArrays] for u in sortedByLength repeat diff --git a/src/interp/nrunfast.boot b/src/interp/nrunfast.boot index 38a7bd47..0b9ea020 100644 --- a/src/interp/nrunfast.boot +++ b/src/interp/nrunfast.boot @@ -497,7 +497,7 @@ lazyMatchArgDollarCheck(s,d,dollarName,domainName) == x is ['elt,someDomain,opname] => lookupInDomainByName(opname,evalDomain someDomain,arg) x = '$ and (arg = dollarName or arg = domainName) => true x = dollarName and arg = domainName => true - ATOM x or ATOM arg => false + atom x or atom arg => false xt and first x = first arg => lazyMatchArgDollarCheck(x,arg,dollarName,domainName) false @@ -541,7 +541,7 @@ newExpandTypeSlot(slot, dollar, domain) == newExpandLocalType(lazyt,dollar,domain) == VECP lazyt => lazyt.0 - ATOM lazyt => lazyt + atom lazyt => lazyt lazyt is [vec,.,:lazyForm] and VECP vec => --old style newExpandLocalTypeForm(lazyForm,dollar,domain) newExpandLocalTypeForm(lazyt,dollar,domain) --new style @@ -647,7 +647,7 @@ newHasTest(domform,catOrAtt) == for [aCat,:cond] in [:ancestorsOf(domform,NIL),:SUBLISLIS (rest domform,$FormalMapVariableList,getConstructorAttributesFromDB(opOf domform))] | aCat = catOrAtt repeat return evalCond cond where evalCond x == - ATOM x => x + atom x => x [pred,:l] := x pred = "has" => l is [ w1,['ATTRIBUTE,w2]] => newHasTest(w1,w2) diff --git a/src/interp/nrungo.boot b/src/interp/nrungo.boot index 3c5e9026..ad16cbd2 100644 --- a/src/interp/nrungo.boot +++ b/src/interp/nrungo.boot @@ -168,7 +168,7 @@ lookupInTable(op,sig,dollar,[domain,table]) == slot is ["goGet",:.] => lookupDisplay(op,sig,domain,'" !! goGet found, will ignore") lookupInAddChain(op,sig,domain,dollar) or 'failed - NULL slot => + null slot => lookupDisplay(op,sig,domain,'" !! null slot entry, continuing") lookupInAddChain(op,sig,domain,dollar) or 'failed lookupDisplay(op,sig,domain,'" !! found in NEW table!!") @@ -285,7 +285,7 @@ lazyCompareSigEqual(s,tslot,dollar,domain) == compareSigEqual(s,t,dollar,domain) == EQUAL(s,t) => true - ATOM t => + atom t => u := t='$ => dollar isSharpVar t => @@ -297,7 +297,7 @@ compareSigEqual(s,t,dollar,domain) == u => compareSigEqual(s,u,dollar,domain) EQUAL(s,u) s='$ => compareSigEqual(dollar,t,dollar,domain) - ATOM s => nil + atom s => nil #s ~= #t => nil match := true for u in s for v in t repeat @@ -318,7 +318,7 @@ NRTcompiledLookup(op,sig,dom) == compiledLookupCheck(op,sig,dom) NRTtypeHack t == - ATOM t => t + atom t => t first t = '_# => # second t [first t,:[NRTtypeHack tt for tt in rest t]] diff --git a/src/interp/pathname.boot b/src/interp/pathname.boot index 0fcd0b64..3b0bca5c 100644 --- a/src/interp/pathname.boot +++ b/src/interp/pathname.boot @@ -1,6 +1,6 @@ -- Copyright (c) 1991-2002, The Numerical Algorithms Group Ltd. -- All rights reserved. --- Copyright (C) 2007-2008, Gabriel Dos Reis. +-- Copyright (C) 2007-2010, Gabriel Dos Reis. -- All rights reserved. -- -- Redistribution and use in source and binary forms, with or without @@ -105,7 +105,7 @@ isSystemDirectory dir == _/MKINFILENAM(infile) == CATCH('FILNAM, newMKINFILENAM infile) newMKINFILENAM(infile) == - NULL infile => nil + null infile => nil file := infile := pathname infile repeat fn := pathnameName file diff --git a/src/interp/pf2atree.boot b/src/interp/pf2atree.boot index d9236313..9f9fd30d 100644 --- a/src/interp/pf2atree.boot +++ b/src/interp/pf2atree.boot @@ -523,8 +523,8 @@ pfCollect2Atree pf == -- patternVarsOf1(expr, nil) -- -- patternVarsOf1(expr, varList) == --- NULL expr => varList --- ATOM expr => +-- null expr => varList +-- atom expr => -- null symbol? expr => varList -- SymMemQ(expr, varList) => varList -- [expr, :varList] diff --git a/src/interp/pf2sex.boot b/src/interp/pf2sex.boot index d760baa4..bdc6b70f 100644 --- a/src/interp/pf2sex.boot +++ b/src/interp/pf2sex.boot @@ -461,8 +461,8 @@ patternVarsOf expr == patternVarsOf1(expr, nil) patternVarsOf1(expr, varList) == - NULL expr => varList - ATOM expr => + null expr => varList + atom expr => null symbol? expr => varList SymMemQ(expr, varList) => varList [expr, :varList] diff --git a/src/interp/pspad1.boot b/src/interp/pspad1.boot index 15bf093e..0af4b345 100644 --- a/src/interp/pspad1.boot +++ b/src/interp/pspad1.boot @@ -297,7 +297,7 @@ formatDollar(name,p,argl) == or (indent() and format "$__" and formatForcePren name and undent())) formatMacroCheck name == - ATOM name => name + atom name => name u := or/[x for [x,:y] in $globalMacroStack | y = name] => u u := or/[x for [x,:y] in $localMacroStack | y = name] => u [op,:argl] := name @@ -434,7 +434,7 @@ formatApplication2 x == formatDot ["dot",a,x] == tryLine (formatOp a and format ".") and - ATOM x => format x + atom x => format x formatPren x formatSelection u == @@ -442,7 +442,7 @@ formatSelection u == formatSpill("formatSelection1",u) formatSelection1 [f,x] == formatSelectionOp f and format "." and - ATOM x => format x + atom x => format x formatPren x formatSelectionOp op == @@ -453,7 +453,7 @@ formatSelectionOp op == formatSelectionOp1 f == f is [op,:argl] => argl is [a] => - not ATOM op and ATOM a => formatSelection1 [op,a] + not atom op and atom a => formatSelection1 [op,a] formatPren f format f formatOp f diff --git a/src/interp/record.boot b/src/interp/record.boot index d987b802..023f985c 100644 --- a/src/interp/record.boot +++ b/src/interp/record.boot @@ -104,7 +104,7 @@ printRecordFile(pathname,:option) == $printTypeIfTrue: local := true stream := DEFIOSTREAM([['FILE,:pathname], '(MODE . INPUT)],80,0) repeat - NULL (PEEK_-CHAR ( true, stream , nil, nil )) => return nil + null (PEEK_-CHAR ( true, stream , nil, nil )) => return nil [i,t,:o] := dewritify VMREAD stream sayNewLine() for x in i repeat sayBrightly x @@ -151,7 +151,7 @@ verifyRecordFile(pathname) == clearCmdAll() result := 'ok for j in 1.. repeat - NULL (PEEK_-CHAR ( true, stream ,nil,nil ))=>return nil + null (PEEK_-CHAR ( true, stream ,nil,nil ))=>return nil [i,t,:o] := dewritify VMREAD stream null i => return nil t = 'ForSystemCommands => diff --git a/src/interp/setvars.boot b/src/interp/setvars.boot index 911fe2ff..8de73e17 100644 --- a/src/interp/setvars.boot +++ b/src/interp/setvars.boot @@ -775,7 +775,7 @@ countCache n == $options => $options is [["vars",:l]] => for x in l repeat - NULL IDENTP x => sayKeyedMsg("S2IF0007",[x]) + null IDENTP x => sayKeyedMsg("S2IF0007",[x]) $cacheAlist:= insertAlist(x,n,$cacheAlist) cacheCountName:= INTERNL(x,'";COUNT") setDynamicBinding(cacheCountName,n) diff --git a/src/interp/trace.boot b/src/interp/trace.boot index 765fc5bd..93adc5e4 100644 --- a/src/interp/trace.boot +++ b/src/interp/trace.boot @@ -337,7 +337,7 @@ coerceSpadArgs2E(args) == for arg in args for type in rest $tracedSpadModemap] subTypes(mm,sublist) == - ATOM mm => + atom mm => (s:= LASSOC(mm,sublist)) => s mm [subTypes(m,sublist) for m in mm] diff --git a/src/interp/wi1.boot b/src/interp/wi1.boot index 24236d61..bb772e94 100644 --- a/src/interp/wi1.boot +++ b/src/interp/wi1.boot @@ -857,7 +857,7 @@ spadCompileOrSetq form == if vl is [:vl',E] and body is [nam',: =vl'] then LAM_,EVALANDFILEACTQ ['PUT,MKQ nam,MKQ 'SPADreplace,MKQ nam'] sayBrightly ['" ",:bright nam,'"is replaced by",:bright nam'] - else if (ATOM body or and/[ATOM x for x in body]) + else if (atom body or and/[atom x for x in body]) and vl is [:vl',E] and not CONTAINED(E,body) then macform := ['XLAM,vl',body] LAM_,EVALANDFILEACTQ ['PUT,MKQ nam,MKQ 'SPADreplace,MKQ macform] diff --git a/src/interp/wi2.boot b/src/interp/wi2.boot index 80e63182..e0e3cef6 100644 --- a/src/interp/wi2.boot +++ b/src/interp/wi2.boot @@ -130,7 +130,7 @@ compDefineFunctor1(df, m,$e,$prefix,$formalArgList) == where FindRep cb == u:= while cb repeat - ATOM cb => return nil + atom cb => return nil cb is [["%LET",'Rep,v,:.],:.] => return (u:=v) cb:=rest cb u @@ -431,7 +431,7 @@ applyMapping([op,:argl],m,e,ml) == T() == [.,.,e]:= comp(x,m',e) or return "failed" if argl'="failed" then return nil form:= - not MEMQ(op,$formalArgList) and ATOM op and not get(op,'value,e) => + not MEMQ(op,$formalArgList) and atom op and not get(op,'value,e) => nprefix := $prefix or -- following needed for referencing local funs at capsule level getAbbreviation($op,#rest $form) @@ -989,8 +989,8 @@ doItIf(item is [.,p,x,y],$predl,$e) == -- of functorLocalParameters that were added during the -- conditional compilation nils:=ans:=[] - for u in flp1 repeat -- is =u form always an ATOM? - if ATOM u or (or/[v is [.,=u,:.] for v in $getDomainCode]) + for u in flp1 repeat -- is =u form always an atom? + if atom u or (or/[v is [.,=u,:.] for v in $getDomainCode]) then nils:=[u,:nils] else |