From cd78da3860f838c41aedc3a0c475cfc8c23eaad3 Mon Sep 17 00:00:00 2001 From: dos-reis Date: Mon, 17 Aug 2009 13:34:29 +0000 Subject: * boot/tokens.boot: Retire "^" as negation operator. * interp/br-search.boot: Use "not" instead of "^". * interp/br-util.boot: Likewise. * interp/database.boot: Likewise. * interp/define.boot: Likewise. * interp/format.boot: Likewise. * interp/g-error.boot: Likewise. * interp/i-analy.boot: Likewise. * interp/i-coerce.boot: Likewise. * interp/i-coerfn.boot: Likewise. * interp/i-funsel.boot: Likewise. * interp/i-map.boot: Likewise. * interp/i-output.boot: Likewise. * interp/i-resolv.boot: Likewise. * interp/i-spec1.boot: Likewise. * interp/i-spec2.boot: Likewise. * interp/i-syscmd.boot: Likewise. * interp/mark.boot: Likewise. * interp/modemap.boot: Likewise. * interp/pspad1.boot: Likewise. * interp/pspad2.boot: Likewise. * interp/spad-parser.boot: Likewise. * interp/trace.boot: Likewise. * interp/wi1.boot: Likewise. * interp/wi2.boot: Likewise. --- src/ChangeLog | 28 +++++++++++++++++++++++ src/boot/strap/tokens.clisp | 15 +++++++------ src/boot/tokens.boot | 2 +- src/interp/br-search.boot | 6 ++--- src/interp/br-util.boot | 2 +- src/interp/database.boot | 6 ++--- src/interp/define.boot | 4 ++-- src/interp/format.boot | 2 +- src/interp/g-error.boot | 2 +- src/interp/i-analy.boot | 10 ++++----- src/interp/i-coerce.boot | 6 ++--- src/interp/i-coerfn.boot | 2 +- src/interp/i-funsel.boot | 6 ++--- src/interp/i-map.boot | 2 +- src/interp/i-output.boot | 54 ++++++++++++++++++++++----------------------- src/interp/i-resolv.boot | 6 ++--- src/interp/i-spec1.boot | 2 +- src/interp/i-spec2.boot | 10 ++++----- src/interp/i-syscmd.boot | 42 +++++++++++++++++------------------ src/interp/i-util.boot | 2 +- src/interp/mark.boot | 4 ++-- src/interp/modemap.boot | 2 +- src/interp/pspad1.boot | 10 ++++----- src/interp/pspad2.boot | 2 +- src/interp/spad-parser.boot | 4 ++-- src/interp/trace.boot | 8 +++---- src/interp/wi1.boot | 2 +- src/interp/wi2.boot | 2 +- 28 files changed, 136 insertions(+), 107 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 8b31055d..1e24f248 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,31 @@ +2009-08-17 Gabriel Dos Reis + + * boot/tokens.boot: Retire "^" as negation operator. + * interp/br-search.boot: Use "not" instead of "^". + * interp/br-util.boot: Likewise. + * interp/database.boot: Likewise. + * interp/define.boot: Likewise. + * interp/format.boot: Likewise. + * interp/g-error.boot: Likewise. + * interp/i-analy.boot: Likewise. + * interp/i-coerce.boot: Likewise. + * interp/i-coerfn.boot: Likewise. + * interp/i-funsel.boot: Likewise. + * interp/i-map.boot: Likewise. + * interp/i-output.boot: Likewise. + * interp/i-resolv.boot: Likewise. + * interp/i-spec1.boot: Likewise. + * interp/i-spec2.boot: Likewise. + * interp/i-syscmd.boot: Likewise. + * interp/mark.boot: Likewise. + * interp/modemap.boot: Likewise. + * interp/pspad1.boot: Likewise. + * interp/pspad2.boot: Likewise. + * interp/spad-parser.boot: Likewise. + * interp/trace.boot: Likewise. + * interp/wi1.boot: Likewise. + * interp/wi2.boot: Likewise. + 2009-08-17 Gabriel Dos Reis * interp/c-util.boot (deltaContour): Fix thinko. diff --git a/src/boot/strap/tokens.clisp b/src/boot/strap/tokens.clisp index 618d4f4d..9e45927d 100644 --- a/src/boot/strap/tokens.clisp +++ b/src/boot/strap/tokens.clisp @@ -20,13 +20,14 @@ (LIST ";" 'SEMICOLON) (LIST "*" 'TIMES) (LIST "**" 'POWER) (LIST "/" 'SLASH) (LIST "+" 'PLUS) (LIST "-" 'MINUS) (LIST "<" 'LT) (LIST ">" 'GT) (LIST "<=" 'LE) (LIST ">=" 'GE) - (LIST "=" 'SHOEEQ) (LIST "^" 'NOT) (LIST "^=" 'SHOENERETIRED) - (LIST "~=" 'SHOENE) (LIST ".." 'SEG) (LIST "#" 'LENGTH) - (LIST "=>" 'EXIT) (LIST "->" 'ARROW) (LIST ":=" 'BEC) - (LIST "==" 'DEF) (LIST "==>" 'MDEF) (LIST "<=>" 'TDEF) - (LIST "(" 'OPAREN) (LIST ")" 'CPAREN) (LIST "(|" 'OBRACK) - (LIST "|)" 'CBRACK) (LIST "[" 'OBRACK) (LIST "]" 'CBRACK) - (LIST "suchthat" 'BAR) (LIST "'" 'QUOTE) (LIST "|" 'BAR))) + (LIST "=" 'SHOEEQ) (LIST "^" 'NOTRETIRED) + (LIST "^=" 'SHOENERETIRED) (LIST "~=" 'SHOENE) + (LIST ".." 'SEG) (LIST "#" 'LENGTH) (LIST "=>" 'EXIT) + (LIST "->" 'ARROW) (LIST ":=" 'BEC) (LIST "==" 'DEF) + (LIST "==>" 'MDEF) (LIST "<=>" 'TDEF) (LIST "(" 'OPAREN) + (LIST ")" 'CPAREN) (LIST "(|" 'OBRACK) (LIST "|)" 'CBRACK) + (LIST "[" 'OBRACK) (LIST "]" 'CBRACK) (LIST "suchthat" 'BAR) + (LIST "'" 'QUOTE) (LIST "|" 'BAR))) (DEFUN |shoeKeyTableCons| () (PROG (|KeyTable|) diff --git a/src/boot/tokens.boot b/src/boot/tokens.boot index 1623d61e..d03205fe 100644 --- a/src/boot/tokens.boot +++ b/src/boot/tokens.boot @@ -77,7 +77,7 @@ shoeKeyWords == [ _ ['"<=","LE" ], _ ['">=","GE" ], _ ['"=", "SHOEEQ"], _ - ['"^", "NOT"], _ + ['"^", "NOTRETIRED"], _ ['"^=","SHOENERETIRED" ], _ ['"~=","SHOENE" ], _ ['"..","SEG" ], _ diff --git a/src/interp/br-search.boot b/src/interp/br-search.boot index ef589edf..c3c997f0 100644 --- a/src/interp/br-search.boot +++ b/src/interp/br-search.boot @@ -871,8 +871,8 @@ mkDetailedGrepPattern(kind,name,nargs,argOrSig) == main where nottick := '"[^`]" name := replaceGrepStar name firstPart := - $saturn => STRCONC(char '_^,name) - STRCONC(char '_^,kind,name) + $saturn => STRCONC(char "^",name) + STRCONC(char "^",kind,name) nargsPart := replaceGrepStar nargs exposedPart := char '_. --always get exposed/unexposed patPart := replaceGrepStar argOrSig @@ -882,7 +882,7 @@ mkDetailedGrepPattern(kind,name,nargs,argOrSig) == main where STRCONC(a,$tick,b) simp a == m := MAXINDEX a - m > 6 and a.(m-5) = char '_[ and a.(m-4) = char '_^ + m > 6 and a.(m-5) = char '_[ and a.(m-4) = char "^" and a.(m-3) = $tick and a.(m-2) = char '_] and a.(m-1) = char '_* and a.m = $tick => simp SUBSTRING(a,0,m-5) diff --git a/src/interp/br-util.boot b/src/interp/br-util.boot index 6bd3b14a..92f05311 100644 --- a/src/interp/br-util.boot +++ b/src/interp/br-util.boot @@ -135,7 +135,7 @@ escapeString com == --this makes changes on single comment lines htPred2English(x,:options) == $emList :local := IFCAR options --list of identifiers to be emphasised $precList: local := '((OR 10 . "or") (AND 9 . "and") - (_< 5) (_<_= 5) (_> 5) (_>_= 5) (_= 5) (_^_= 5) (or 10) (and 9)) + (_< 5) (_<_= 5) (_> 5) (_>_= 5) (_= 5) (_~_= 5) (or 10) (and 9)) fn(x,100) where fn(x,prec) == x is [op,:l] => diff --git a/src/interp/database.boot b/src/interp/database.boot index 874db5ae..1f4b8c0f 100644 --- a/src/interp/database.boot +++ b/src/interp/database.boot @@ -298,8 +298,8 @@ orderPredTran(oldList,sig,skip) == ----- (isDomain *1 ..) for pred in oldList repeat ((pred is [op,pvar,.] and MEMQ(op,'(isDomain ofCategory)) - and pvar=first sig and ^(pvar in rest sig)) or - (^skip and pred is ['isDomain,pvar,.] and pvar="*1")) => + and pvar=first sig and not (pvar in rest sig)) or + (not skip and pred is ['isDomain,pvar,.] and pvar="*1")) => oldList:=delete(pred,oldList) lastPreds:=[pred,:lastPreds] --sayBrightlyNT "lastPreds=" @@ -449,7 +449,7 @@ substVars(pred,patternAlist,patternVarList) == pred := MSUBST(patVar,value,pred) patternAlist := nsubst(patVar,value,patternAlist) domainPredicates := MSUBST(patVar,value,domainPredicates) - if ^MEMQ(value,$FormalMapVariableList) then + if not MEMQ(value,$FormalMapVariableList) then domainPredicates := [["isDomain",patVar,value],:domainPredicates] everything := [pred,patternAlist,domainPredicates] for var in $FormalMapVariableList repeat diff --git a/src/interp/define.boot b/src/interp/define.boot index d0164940..0780dc52 100644 --- a/src/interp/define.boot +++ b/src/interp/define.boot @@ -1102,7 +1102,7 @@ checkAndDeclare(argl,form,sig,e) == for a in argl for m in rest sig repeat isQuasiquote m => nil -- we just built m from a. m1:= getArgumentMode(a,e) => - ^modeEqual(m1,m) => + not modeEqual(m1,m) => stack:= [" ",:bright a,'"must have type ",m, '" not ",m1,'%l,:stack] e:= put(a,'mode,m,e) @@ -1303,7 +1303,7 @@ compileConstructor1 (form:=[fn,[key,vl,:bodyl]]) == constructMacro: %Form -> %Form constructMacro (form is [nam,[lam,vl,body]]) == - ^(and/[atom x for x in vl]) => + not (and/[atom x for x in vl]) => stackSemanticError(["illegal parameters for macro: ",vl],nil) ["XLAM",vl':= [x for x in vl | IDENTP x],body] diff --git a/src/interp/format.boot b/src/interp/format.boot index cda5f73d..d3d974f9 100644 --- a/src/interp/format.boot +++ b/src/interp/format.boot @@ -720,7 +720,7 @@ pred2English x == concat(pred2English a,'" = ",form2String abbreviate b) x is [op,:.] and (translation := LASSOC(op,'( (_< . " < ") (_<_= . " <= ") - (_> . " > ") (_>_= . " >= ") (_= . " = ") (_^_= . " _^_= ")))) => + (_> . " > ") (_>_= . " >= ") (_= . " = ") (_~_= . " _~_= ")))) => concat(pred2English a,translation,pred2English b) x is ['ATTRIBUTE,form] => concat("attribute: ",form2String form) diff --git a/src/interp/g-error.boot b/src/interp/g-error.boot index 393e6b6e..f0774be7 100644 --- a/src/interp/g-error.boot +++ b/src/interp/g-error.boot @@ -144,7 +144,7 @@ returnToTopLevel() == TOPLEVEL() returnToReader() == - ^$ReadingFile => returnToTopLevel() + not $ReadingFile => returnToTopLevel() sayBrightly ['" Continuing to read the file...", '%l] THROW($SpadReaderTag, nil) diff --git a/src/interp/i-analy.boot b/src/interp/i-analy.boot index bcf01ce8..3f2ba6d3 100644 --- a/src/interp/i-analy.boot +++ b/src/interp/i-analy.boot @@ -253,7 +253,7 @@ bottomUp t == argModeSetList:= [bottomUp x for x in argl] - if ^tar and opName = "*" and nargs = 2 then + if null tar and opName = "*" and nargs = 2 then [[t1],[t2]] := argModeSetList tar := computeTypeWithVariablesTarget(t1, t2) tar => @@ -530,7 +530,7 @@ bottomUpForm2(t,op,opName,argl,argModeSetList) == -- modesets are the same $genValue and - ^(opName = "=" and argModeSetList is [[m],[=m]] and m is ['Union,:.]) and + not (opName = "=" and argModeSetList is [[m],[=m]] and m is ['Union,:.]) and (u := bottomUpFormUntaggedUnionRetract(t,op,opName,argl,argModeSetList)) => u lookForIt and (u := bottomUpFormTuple(t, op, opName, argl, argModeSetList)) => u @@ -849,15 +849,15 @@ bottomUpElt (form:=[op,:argl]) == newOps := [mkAtreeNode "elt", mkAtreeNode "apply"] u := nil - while ^u for newOp in newOps repeat + while null u for newOp in newOps repeat newArgs := [op,:argl] if selectMms(newOp, newArgs, target) then RPLAC(CDR form, newArgs) RPLAC(CAR form, newOp) u := bottomUp form - while ^u and ( "and"/[retractAtree(a) for a in newArgs] ) repeat - while ^u for newOp in newOps repeat + while null u and ( "and"/[retractAtree(a) for a in newArgs] ) repeat + while null u for newOp in newOps repeat newArgs := [op,:argl] if selectMms(newOp, newArgs, target) then RPLAC(CDR form, newArgs) diff --git a/src/interp/i-coerce.boot b/src/interp/i-coerce.boot index 663b1178..a6012574 100644 --- a/src/interp/i-coerce.boot +++ b/src/interp/i-coerce.boot @@ -974,7 +974,7 @@ coerceUnion2Branch(object) == val' := objValUnwrap object predicate := NIL targetType:= NIL - for typ in doms for pred in predList while ^targetType repeat + for typ in doms for pred in predList while null targetType repeat thisUnionBranch?(pred,val') => predicate := pred targetType := typ @@ -1027,7 +1027,7 @@ coerceIntByMap(triple,t2) == u1 := deconstructT t1 1 = #u1 => NIL CAAR u1 ~= CAAR u2 => nil -- constructors not equal - ^valueArgsEqual?(t1, t2) => NIL + not valueArgsEqual?(t1, t2) => NIL -- CAR u1 ~= CAR u2 => NIL top := CAAR u1 u1 := underDomainOf t1 @@ -1282,7 +1282,7 @@ coerceIntTest(t1,t2) == coerceByTable(fn,x,t1,t2,isTotalCoerce) == -- catch point for 'failure in boot coercions - t2 = $OutputForm and ^(newType? t1) => NIL + t2 = $OutputForm and not (newType? t1) => NIL isWrapped x => x:= unwrap x c:= CATCH('coerceFailure,FUNCALL(fn,x,t1,t2)) diff --git a/src/interp/i-coerfn.boot b/src/interp/i-coerfn.boot index 73ff0bad..3def27de 100644 --- a/src/interp/i-coerfn.boot +++ b/src/interp/i-coerfn.boot @@ -1527,7 +1527,7 @@ insertAlist(a,b,l) == Un2E(x,source,target) == ['Union,:branches] := source x = '_$fromCoerceable_$ => - and/[canCoerce(t, target) for t in branches | ^ STRINGP t] + and/[canCoerce(t, target) for t in branches | not STRINGP t] coerceUn2E(x,source) --% Variable diff --git a/src/interp/i-funsel.boot b/src/interp/i-funsel.boot index 719142de..acdf2bd1 100644 --- a/src/interp/i-funsel.boot +++ b/src/interp/i-funsel.boot @@ -1151,7 +1151,7 @@ evalMm(op,tar,sig,mmC) == not containsVars sig => isFreeFunctionFromMmCond mmC and (m := evalMmFreeFunction(op,tar,sig,mmC)) => mS:= nconc(m,mS) - "or"/[^isValidType(arg) for arg in sig] => nil + "or"/[not isValidType(arg) for arg in sig] => nil [dc,t,:args]:= sig $Coerce or null tar or tar=t => mS:= nconc(findFunctionInDomain(op,dc,t,args,args,NIL,'T),mS) @@ -1638,8 +1638,8 @@ unifyStruct(s1,s2,SL) == s1=s2 => SL if s1 is [":",x,.] then s1:= x if s2 is [":",x,.] then s2:= x - if ^atom s1 and CAR s1 = '_# then s1:= LENGTH CADR s1 - if ^atom s2 and CAR s2 = '_# then s2:= LENGTH CADR s2 + if not atom s1 and CAR s1 = '_# then s1:= LENGTH CADR s1 + if not atom s2 and CAR s2 = '_# then s2:= LENGTH CADR s2 s1=s2 => SL isPatternVar s1 => unifyStructVar(s1,s2,SL) isPatternVar s2 => unifyStructVar(s2,s1,SL) diff --git a/src/interp/i-map.boot b/src/interp/i-map.boot index 1fdc5b8f..e50f0b4e 100644 --- a/src/interp/i-map.boot +++ b/src/interp/i-map.boot @@ -407,7 +407,7 @@ displayMap(headingIfTrue,$op,map) == simplifyMapPattern (x,alias) == for a in alias - for m in $FormalMapVariableList | a and ^CONTAINED(a,x) repeat + for m in $FormalMapVariableList | a and not CONTAINED(a,x) repeat x:= substitute(a,m,x) [lhs,:rhs]:= x rhs := simplifyMapConstructorRefs rhs diff --git a/src/interp/i-output.boot b/src/interp/i-output.boot index 0a57b1f2..011ee11f 100644 --- a/src/interp/i-output.boot +++ b/src/interp/i-output.boot @@ -595,7 +595,7 @@ outputTran x == ['PAREN,["|",['AGGLST,:l],pred]] op="tuple" => ['PAREN,['AGGLST,:l]] op='LISTOF => ['AGGLST,:l] - IDENTP op and ^(op in '(_* _*_*) ) and char("*") = (PNAME op).0 => + IDENTP op and not (op in '(_* _*_*) ) and char("*") = (PNAME op).0 => mkSuperSub(op,l) [outputTran op,:l] @@ -761,7 +761,7 @@ timesApp(u,x,y,d) == firstTime:= true for arg in rest u repeat op:= keyp arg - if ^firstTime and (needBlankForRoot(lastOp,op,arg) or + if not firstTime and (needBlankForRoot(lastOp,op,arg) or needStar(wasSimple,wasQuotient,wasNumber,arg,op) or wasNumber and op = 'ROOT and subspan arg = 1) then d:= APP(BLANK,x,y,d) @@ -862,7 +862,7 @@ needStar(wasSimple,wasQuotient,wasNumber,cur,op) == wasQuotient or isQuotient op => true wasSimple => atom cur or keyp cur="SUB" or isRationalNumber cur or op="**" or op = "^" or - (atom op and ^NUMBERP op and ^GETL(op,"APP")) + (atom op and not NUMBERP op and null GETL(op,"APP")) wasNumber => NUMBERP(cur) or isRationalNumber cur or ((op="**" or op ="^") and NUMBERP(CADR cur)) @@ -876,7 +876,7 @@ timesWidth u == w:= 0 for arg in rest u repeat op:= keyp arg - if ^firstTime and needStar(wasSimple,wasQuotient,wasNumber,arg,op) then + if not firstTime and needStar(wasSimple,wasQuotient,wasNumber,arg,op) then w:= w+1 if infixArgNeedsParens(arg, rightPrec, "left") then w:= w+2 w:= w+WIDTH arg @@ -1162,20 +1162,20 @@ maprinChk x == -- deleteAssoc no longer exists $MatrixList := delete(u,$MatrixList) maPrin ['EQUATNUM,n,rest u] - if ^$collectOutput then TERPRI $algebraOutputStream + if not $collectOutput then TERPRI $algebraOutputStream maPrin x maPrin x -- above line added JHD 13/2/93 since otherwise x gets lost maprinRows matrixList == - if ^$collectOutput then TERPRI($algebraOutputStream) + if not $collectOutput then TERPRI($algebraOutputStream) while matrixList repeat y:=NREVERSE matrixList --Makes the matrices come out in order, since CONSed on backwards matrixList:=nil firstName := first first y for [name,:m] in y for n in 0.. repeat - if ^$collectOutput then TERPRI($algebraOutputStream) + if not $collectOutput then TERPRI($algebraOutputStream) andWhere := (name = firstName => '"where "; '"and ") line := STRCONC(andWhere, PNAME name) maprinChk ["=",line,m] @@ -1503,16 +1503,16 @@ splitConcat(list,maxWidth,firstTimeIfTrue) == spadPrint(x,m) == m = $NoValueMode => x - if ^$collectOutput then TERPRI $algebraOutputStream + if not $collectOutput then TERPRI $algebraOutputStream output(x,m) - if ^$collectOutput then TERPRI $algebraOutputStream + if not $collectOutput then TERPRI $algebraOutputStream formulaFormat expr == sff := '(ScriptFormulaFormat) formatFn := getFunctionFromDomain("coerce",sff,[$OutputForm]) displayFn := getFunctionFromDomain("display",sff,[sff]) SPADCALL(SPADCALL(expr,formatFn),displayFn) - if ^$collectOutput then + if not $collectOutput then TERPRI $algebraOutputStream FORCE_-OUTPUT $formulaOutputStream NIL @@ -1563,7 +1563,7 @@ output(expr,domain) == if $formulaFormat then formulaFormat x if $fortranFormat then dispfortexp x - if ^$collectOutput then TERPRI $fortranOutputStream + if not $collectOutput then TERPRI $fortranOutputStream FORCE_-OUTPUT $fortranOutputStream if $algebraFormat then mathprintWithNumber x @@ -1656,7 +1656,7 @@ printMap u == printMap1(x,initialFlag and x is [[n],:.] and n=1) for y in l repeat (printBasic " , "; printMap1(y,initialFlag)) printBasic specialChar 'rbrk - if ^$collectOutput then TERPRI $algebraOutputStream + if not $collectOutput then TERPRI $algebraOutputStream isInitialMap u == u is [[[n],.],:l] and INTEGERP n and @@ -1676,7 +1676,7 @@ printBasic x == PRIN1(x,$algebraOutputStream) charybdis(u,start,linelength) == - keyp u='EQUATNUM and ^(CDDR u) => + keyp u='EQUATNUM and null (CDDR u) => charybdis(['PAREN,u.1],start,linelength) charyTop(u,start,linelength) @@ -1806,7 +1806,7 @@ charySplit(u,v,start,linelength) == m:= rest v WIDTH v.1 > linelength-2 => charybdis(v.1,start+2,linelength-2) - ^(CDDR v) => '" " + null (CDDR v) => '" " dm:= CDDR v ddm:= rest dm split2(u,dm,ddm,start,linelength) @@ -1833,7 +1833,7 @@ split2(u,dm,ddm,start,linelength) == charyElse(u,v,start,linelength) == charybdis(v.1,start+3,linelength-3) - ^(CDDR u) => '" " + null (CDDR u) => '" " prnd(start,'",") charybdis(['ELSE,:CDDR v],start,linelength) '" " @@ -1856,7 +1856,7 @@ keyp(u) == absym x == (NUMBERP x) and (MINUSP x) => -x - ^(atom x) and (keyp(x) = '_-) => CADR x + not (atom x) and (keyp(x) = '_-) => CADR x x agg(n,u) == @@ -1924,7 +1924,7 @@ appargs1(u,x,y,d,s) == true => appargs(rest u, 1 + temp, y, temparg2) apprpar(x, y, y1, y2, d) == - (^(_*TALLPAR) or (y2 - y1 < 2)) => APP('")", x, y, d) + (null (_*TALLPAR) or (y2 - y1 < 2)) => APP('")", x, y, d) true => APP('")", x, y2, apprpar1(x, y, y1, y2 - 1, d)) apprpar1(x, y, y1, y2, d) == @@ -1932,7 +1932,7 @@ apprpar1(x, y, y1, y2, d) == true => APP('")", x, y2, apprpar1(x, y, y1, y2 - 1, d)) applpar(x, y, y1, y2, d) == - (^(_*TALLPAR) or (y2 - y1 < 2)) => APP('"(", x, y, d) + (null (_*TALLPAR) or (y2 - y1 < 2)) => APP('"(", x, y, d) true => APP('"(", x, y2, applpar1(x, y, y1, y2 - 1, d)) applpar1(x, y, y1, y2, d) == @@ -1964,7 +1964,7 @@ appext(u,x,y,d) == temp := 1 + WIDTH agg(2,u) + WIDTH agg(3,u) n := MAX(WIDTH CADR u, WIDTH agg(4,u), temp) if EQCAR(first(z := agg(5,u)), 'EXT) and - (n=3 or (n > 3 and ^(atom z)) ) then + (n=3 or (n > 3 and not (atom z)) ) then n := 1 + n d := APP(z, x + n, y, d) @@ -1974,7 +1974,7 @@ apphor(x1,x2,y,d,char) == syminusp x == NUMBERP x => MINUSP x - ^(atom x) and EQ(keyp x,'_-) + not (atom x) and EQ(keyp x,'_-) appsum(u, x, y, d) == null u => d @@ -2097,7 +2097,7 @@ longext(u, i, n) == y := first x u := remWidth(REVERSEWOC(CONS('" ", rest x))) charybdis(u, i, n) - if ^$collectOutput then TERPRI $algebraOutputStream + if not $collectOutput then TERPRI $algebraOutputStream charybdis(CONS('ELSE, LIST y), i, n) '" " @@ -2386,7 +2386,7 @@ sumWidth u == WIDTH u.1 + sumWidthA CDDR u sumWidthA u == - ^u => 0 + null u => 0 ( member(keyp absym first u,'(_+ _-)) => 5; true => 3) + WIDTH absym first u + sumWidthA rest u @@ -2554,7 +2554,7 @@ binomialSuper u == height u.1 + 1 binomialWidth u == 2 + MAX(WIDTH u.1, WIDTH u.2) mathPrint u == - if ^$collectOutput then TERPRI $algebraOutputStream + if not $collectOutput then TERPRI $algebraOutputStream (u := STRINGP mathPrint1(mathPrintTran u, nil) => PSTRING u; nil) @@ -2566,9 +2566,9 @@ mathPrintTran u == u mathPrint1(x,fg) == - if fg and ^$collectOutput then TERPRI $algebraOutputStream + if fg and not $collectOutput then TERPRI $algebraOutputStream maPrin x - if fg and ^$collectOutput then TERPRI $algebraOutputStream + if fg and not $collectOutput then TERPRI $algebraOutputStream maPrin u == null u => nil @@ -2581,11 +2581,11 @@ maPrin u == sayKeyedMsg("S2IX0009",NIL) u is ['EQUATNUM,num,form] or u is [['EQUATNUM,:.],num,form] => charybdis(['EQUATNUM,num], $MARGIN, $LINELENGTH) - if ^$collectOutput then + if not $collectOutput then TERPRI $algebraOutputStream PRETTYPRINT(form,$algebraOutputStream) form - if ^$collectOutput then PRETTYPRINT(u,$algebraOutputStream) + if not $collectOutput then PRETTYPRINT(u,$algebraOutputStream) nil diff --git a/src/interp/i-resolv.boot b/src/interp/i-resolv.boot index ccbb923b..31ff3c46 100644 --- a/src/interp/i-resolv.boot +++ b/src/interp/i-resolv.boot @@ -143,7 +143,7 @@ resolveTTUnion(t1 is ['Union,:doms],t2) == t2 isnt ['Union,:doms2] => ud := nil bad := nil - for d in doms while ^bad repeat + for d in doms while not bad repeat d = '"failed" => ud := [d,:ud] null (d' := resolveTT(d,t2)) => bad := true ud := [d',:ud] @@ -151,7 +151,7 @@ resolveTTUnion(t1 is ['Union,:doms],t2) == ['Union,:REMDUP reverse ud] ud := nil bad := nil - for d in doms2 while ^bad repeat + for d in doms2 while not bad repeat d = '"failed" => ud := append(ud,[d]) null (d' := resolveTTUnion(t1,d)) => bad := true ud := append(ud,CDR d') @@ -545,7 +545,7 @@ resolveTMUnion(t, m is ['Union,:ums]) == ums := REMDUP spliceTypeListForEmptyMode(uts,ums) bad := nil doms := nil - for ut in uts while ^bad repeat + for ut in uts while not bad repeat (m' := resolveTMUnion(ut,['Union,:ums])) => doms := append(CDR m',doms) bad := true diff --git a/src/interp/i-spec1.boot b/src/interp/i-spec1.boot index 2d3097f5..76ff6c4b 100644 --- a/src/interp/i-spec1.boot +++ b/src/interp/i-spec1.boot @@ -965,7 +965,7 @@ upconstruct t == tar is ['Record,:types] => upRecordConstruct(op,l,tar) isTaggedUnion tar => upTaggedUnionConstruct(op,l,tar) aggs := '(List) - if tar and PAIRP(tar) and ^isPartialMode(tar) then + if tar and PAIRP(tar) and not isPartialMode(tar) then CAR(tar) in aggs => ud := (l is [[realOp, :.]]) and (getUnname(realOp) = 'COLLECT) => tar diff --git a/src/interp/i-spec2.boot b/src/interp/i-spec2.boot index fc9ce28b..80595c9c 100644 --- a/src/interp/i-spec2.boot +++ b/src/interp/i-spec2.boot @@ -416,7 +416,7 @@ evalIsPredicate(value,pattern,mode) == --if the pattern matches then the bindings given in the pattern --are made pattern:= removeConstruct pattern - ^((valueAlist:=isPatternMatch(value,pattern))='failed) => + not ((valueAlist:=isPatternMatch(value,pattern))='failed) => for [id,:value] in valueAlist repeat evalLETchangeValue(id,objNewWrap(value,get(id,'mode,$env))) true @@ -682,12 +682,12 @@ altSeteltable args == form := NIL -- first look for exact matches for any of the possibilities - while ^form for newOp in newOps repeat + while null form for newOp in newOps repeat if selectMms(newOp, args, NIL) then form := [newOp, :args] -- now try retracting arguments after the first - while ^form and ( "and"/[retractAtree(a) for a in rest args] ) repeat - while ^form for newOp in newOps repeat + while null form and ( "and"/[retractAtree(a) for a in rest args] ) repeat + while null form for newOp in newOps repeat if selectMms(newOp, args, NIL) then form := [newOp, :args] form @@ -1074,7 +1074,7 @@ uptuple t == null l => upNullTuple(op,l,tar) isTaggedUnion tar => upTaggedUnionConstruct(op,l,tar) aggs := '(List) - if tar and PAIRP(tar) and ^isPartialMode(tar) then + if tar and PAIRP(tar) and not isPartialMode(tar) then CAR(tar) in aggs => ud := CADR tar for x in l repeat if not getTarget(x) then putTarget(x,ud) diff --git a/src/interp/i-syscmd.boot b/src/interp/i-syscmd.boot index 92db9407..6e179730 100644 --- a/src/interp/i-syscmd.boot +++ b/src/interp/i-syscmd.boot @@ -327,7 +327,7 @@ clearCmdAll() == clearCmdExcept(l is [opt,:vl]) == --clears elements of vl of all options EXCEPT opt for option in $clearOptions | - ^stringPrefix?(object2String opt,object2String option) + not stringPrefix?(object2String opt,object2String option) repeat clearCmdParts [option,:vl] clearCmdParts(l is [opt,:vl]) == @@ -355,7 +355,7 @@ clearCmdParts(l is [opt,:vl]) == for x in vl repeat clearDependencies(x,true) if option='properties and x in pmacs then clearParserMacro(x) - if option='properties and x in imacs and ^(x in pmacs) then + if option='properties and x in imacs and not (x in pmacs) then sayMessage ['" You cannot clear the definition of the system-defined macro ", fixObjectForPrinting x,"."] p1 := assoc(x,CAAR $InteractiveFrame) => @@ -428,7 +428,7 @@ compiler args == optlist := '(new old translate constructor) haveNew := nil haveOld := nil - for opt in $options while ^(haveNew and haveOld) repeat + for opt in $options while not (haveNew and haveOld) repeat [optname,:optargs] := opt fullopt := selectOptionLC(optname,optlist,nil) fullopt = 'new => haveNew := true @@ -516,7 +516,7 @@ compileAsharpCmd1 args == path := pathname args pathType := pathnameType path (pathType ~= '"as") and (pathType ~= '"ao") => throwKeyedMsg("S2IZ0083", nil) - ^PROBE_-FILE path => throwKeyedMsg("S2IL0003",[namestring args]) + null PROBE_-FILE path => throwKeyedMsg("S2IL0003",[namestring args]) SETQ(_/EDITFILE, path) updateSourceFiles path @@ -585,7 +585,7 @@ compileAsharpCmd1 args == s tempArgs - if ^beQuiet then sayKeyedMsg("S2IZ0038A",[namestring args, asharpArgs]) + if not beQuiet then sayKeyedMsg("S2IZ0038A",[namestring args, asharpArgs]) command := STRCONC(STRCONC(GETENV('"ALDORROOT"),'"/bin/"),_ @@ -595,16 +595,16 @@ compileAsharpCmd1 args == if (rc = 0) and doCompileLisp then lsp := fnameMake('".", pathnameName args, '"lsp") if fnameReadable?(lsp) then - if ^beQuiet then sayKeyedMsg("S2IZ0089", [namestring lsp]) + if not beQuiet then sayKeyedMsg("S2IZ0089", [namestring lsp]) compileFileQuietly(lsp) else sayKeyedMsg("S2IL0003", [namestring lsp]) if rc = 0 and doLibrary then -- do we need to worry about where the compilation output went? - if ^beQuiet then sayKeyedMsg("S2IZ0090", [ pathnameName path ]) + if not beQuiet then sayKeyedMsg("S2IZ0090", [ pathnameName path ]) withAsharpCmd [ pathnameName path ] - else if ^beQuiet then + else if not beQuiet then sayKeyedMsg("S2IZ0084", nil) if not $buildingSystemAlgebra then @@ -616,7 +616,7 @@ compileAsharpArchiveCmd args == -- the name is fully qualified. path := pathname args - ^PROBE_-FILE path => throwKeyedMsg("S2IL0003",[namestring args]) + null PROBE_-FILE path => throwKeyedMsg("S2IL0003",[namestring args]) -- here is the plan: -- 1. extract the file name and try to make a directory based @@ -672,7 +672,7 @@ compileAsharpLispCmd args == -- and is a file with file extension .lsp path := pathname args - ^PROBE_-FILE path => throwKeyedMsg("S2IL0003",[namestring args]) + null PROBE_-FILE path => throwKeyedMsg("S2IL0003",[namestring args]) optList := '( _ quiet _ @@ -698,16 +698,16 @@ compileAsharpLispCmd args == lsp := fnameMake(pathnameDirectory path, pathnameName path, pathnameType path) if fnameReadable?(lsp) then - if ^beQuiet then sayKeyedMsg("S2IZ0089", [namestring lsp]) + if not beQuiet then sayKeyedMsg("S2IZ0089", [namestring lsp]) compileFileQuietly(lsp) else sayKeyedMsg("S2IL0003", [namestring lsp]) if doLibrary then -- do we need to worry about where the compilation output went? - if ^beQuiet then sayKeyedMsg("S2IZ0090", [ pathnameName path ]) + if not beQuiet then sayKeyedMsg("S2IZ0090", [ pathnameName path ]) withAsharpCmd [ pathnameName path ] - else if ^beQuiet then + else if not beQuiet then sayKeyedMsg("S2IZ0084", nil) terminateSystemCommand() @@ -716,7 +716,7 @@ compileSpadLispCmd args == -- and is a file with file extension .NRLIB path := pathname fnameMake(first args, '"code", '"lsp") - ^PROBE_-FILE path => throwKeyedMsg("S2IL0003",[namestring args]) + null PROBE_-FILE path => throwKeyedMsg("S2IL0003",[namestring args]) optList := '( _ quiet _ @@ -742,7 +742,7 @@ compileSpadLispCmd args == lsp := fnameMake(pathnameDirectory path, pathnameName path, pathnameType path) if fnameReadable?(lsp) then - if ^beQuiet then sayKeyedMsg("S2IZ0089", [namestring lsp]) + if not beQuiet then sayKeyedMsg("S2IZ0089", [namestring lsp]) --compileFileQuietly(lsp) RECOMPILE_-LIB_-FILE_-IF_-NECESSARY lsp else @@ -750,9 +750,9 @@ compileSpadLispCmd args == if doLibrary then -- do we need to worry about where the compilation output went? - if ^beQuiet then sayKeyedMsg("S2IZ0090", [ pathnameName path ]) + if not beQuiet then sayKeyedMsg("S2IZ0090", [ pathnameName path ]) LOCALDATABASE([ pathnameName first args ],[]) - else if ^beQuiet then + else if not beQuiet then sayKeyedMsg("S2IZ0084", nil) terminateSystemCommand() @@ -763,7 +763,7 @@ compileSpad2Cmd args == path := pathname args pathnameType path ~= '"spad" => throwKeyedMsg("S2IZ0082", nil) - ^PROBE_-FILE path => throwKeyedMsg("S2IL0003",[namestring args]) + null PROBE_-FILE path => throwKeyedMsg("S2IL0003",[namestring args]) SETQ(_/EDITFILE, path) updateSourceFiles path @@ -1180,7 +1180,7 @@ displayProperties(option,l) == displayMacro v sayMSG '" none" propsSeen:= nil - for [prop,:val] in pl | ^MEMQ(prop,propsSeen) and val repeat + for [prop,:val] in pl | not MEMQ(prop,propsSeen) and val repeat prop in '(alias generatedCode IS_-GENSYM mapBody localVars) => nil prop = 'condition => @@ -1689,7 +1689,7 @@ writeInputLines(fn,initial) == while n > maxn repeat -- search backwards for a blank done := nil - for j in 1..maxn while ^done repeat + for j in 1..maxn while not done repeat k := 1 + maxn - j MEMQ(vec.k,breakChars) => svec := STRCONC(SUBSTRING(vec,0,k+1),UNDERBAR) @@ -1698,7 +1698,7 @@ writeInputLines(fn,initial) == vec := SUBSTRING(vec,k+1,NIL) n := SIZE vec -- in case we can't find a breaking point - if ^done then n := 0 + if not done then n := 0 lineList := [vec,:lineList] file := histInputFileName(fn) histFileErase file diff --git a/src/interp/i-util.boot b/src/interp/i-util.boot index 2fc2ab61..1c125f9e 100644 --- a/src/interp/i-util.boot +++ b/src/interp/i-util.boot @@ -129,7 +129,7 @@ Undef(:u) == u':= LAST u [[domain,slot],op,sig]:= u' domain':=eval mkEvalable domain - ^EQ(CAR ELT(domain',slot), function Undef) => + not EQ(CAR ELT(domain',slot), function Undef) => -- OK - thefunction is now defined [:u'',.]:=u if $reportBottomUpFlag then diff --git a/src/interp/mark.boot b/src/interp/mark.boot index 7ef254ec..87b66121 100644 --- a/src/interp/mark.boot +++ b/src/interp/mark.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-2009, Gabriel Dos Reis. -- All rights reserved. -- -- Redistribution and use in source and binary forms, with or without @@ -263,7 +263,7 @@ markRepeat(form, T) == [mkWi("repeat", 'WI,form,CAR T), :CDR T] markTran(form,form',[dc,:sig],env) == --from compElt/compFormWithModemap - dc ~= 'Rep or ^MEMQ('_$,sig) => mkWi('markTran,'WI,form,['call,:form']) + dc ~= 'Rep or not MEMQ('_$,sig) => mkWi('markTran,'WI,form,['call,:form']) argl := [u for t in rest sig for arg in rest form'] where u() == t='_$ => argSource := getSourceWI arg diff --git a/src/interp/modemap.boot b/src/interp/modemap.boot index d7f7f221..5da5e158 100644 --- a/src/interp/modemap.boot +++ b/src/interp/modemap.boot @@ -285,7 +285,7 @@ augModemapsFromCategory(domainName,domainView,functorForm,categoryForm,e) == [fnAlist,e]:= evalAndSub(domainName,domainView,functorForm,categoryForm,e) -- catform:= (isCategory categoryForm => categoryForm.(0); categoryForm) -- catform appears not to be used, so why set it? - --if ^$InteractiveMode then + --if not $InteractiveMode then compilerMessage('"Adding %1p modemaps",[domainName]) e:= putDomainsInScope(domainName,e) $base:= 4 diff --git a/src/interp/pspad1.boot b/src/interp/pspad1.boot index 15b5716d..eb3bc9b4 100644 --- a/src/interp/pspad1.boot +++ b/src/interp/pspad1.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-2009, Gabriel Dos Reis. -- All rights reserved. -- -- Redistribution and use in source and binary forms, with or without @@ -183,7 +183,7 @@ consBuffer item == consBuffer item nil $lineFragmentBuffer:= - ^item or IDENTP item => [PNAME item,:$lineFragmentBuffer] + null item or IDENTP item => [PNAME item,:$lineFragmentBuffer] NUMBERP item or CHARP item => [STRINGIMAGE item,:$lineFragmentBuffer] STRINGP item => ["_"",string2PrintImage item,"_"",:$lineFragmentBuffer] sayBrightly ['"Unexpected line buffer item: ", STRINGIMAGE item] @@ -498,7 +498,7 @@ formatPrefix(op,arg,lbp,rbp,:options) == formatPrefixOp(op,:options) == qualification := IFCAR options op=char '" " => format " =" - qualification or GETL(op,"Nud") and ^MEMQ(op,$spadTightList) => + qualification or GETL(op,"Nud") and not MEMQ(op,$spadTightList) => formatQual(op,qualification) and format " " format op @@ -560,7 +560,7 @@ formatOpBindingPower(op,key,leftOrRight) == MEMQ(op,'(_:)) and key = 'Led => leftOrRight = 'left => 195 196 - MEMQ(op,'(_^_= _>_=)) => 400 + MEMQ(op,'(_~_= _>_=)) => 400 op = "not" and key = "Nud" => leftOrRight = 'left => 1000 1001 @@ -572,7 +572,7 @@ formatOpBindingPower(op,key,leftOrRight) == formatInfixOp(op,:options) == qualification := IFCAR options qualification or - (op ~= '_$) and ^MEMQ(op,$spadTightList) => format " " and formatQual(op,qualification) and format " " + (op ~= '_$) and not MEMQ(op,$spadTightList) => format " " and formatQual(op,qualification) and format " " format op --====================================================================== diff --git a/src/interp/pspad2.boot b/src/interp/pspad2.boot index 0010b384..1441da4f 100644 --- a/src/interp/pspad2.boot +++ b/src/interp/pspad2.boot @@ -71,7 +71,7 @@ formatDeftran(u,SEQflag) == if b is [:.,c] and c = '(void) then b := DROP(-1, b) [:m,y] := [:a,:b] ['SEQ,:m,['exit,n,y]] --- u is ['not,arg] and (op := LASSOC(KAR arg,'((_= . _^_=) (_< . _>_=)))) => +-- u is ['not,arg] and (op := LASSOC(KAR arg,'((_= . _~_=) (_< . _>_=)))) => -- formatDeftran([op,:CDR arg],nil) u is ["^",a] => formatDeftran(['not,a],SEQflag) u is ["exquo",a,b] => formatDeftran(['xquo,a,b],SEQflag) diff --git a/src/interp/spad-parser.boot b/src/interp/spad-parser.boot index 68190dfc..e5f9919d 100644 --- a/src/interp/spad-parser.boot +++ b/src/interp/spad-parser.boot @@ -1,4 +1,4 @@ --- Copyright (C) 2007-2008, Gabriel Dos Reis. +-- Copyright (C) 2007-2009, Gabriel Dos Reis. -- All rights reserved. -- -- Redistribution and use in source and binary forms, with or without @@ -78,7 +78,7 @@ parseSpadFile sourceFile == -- gather parse trees for all toplevel expressions in sourceFile. asts := [] - while ^(_*EOF_* or FILE_-CLOSED) repeat + while not (_*EOF_* or FILE_-CLOSED) repeat BOOT_-LINE_-STACK : local := PREPARSE IN_-STREAM LINE : local := CDAR BOOT_-LINE_-STACK PARSE_-NewExpr() diff --git a/src/interp/trace.boot b/src/interp/trace.boot index fe279b93..eb7941e9 100644 --- a/src/interp/trace.boot +++ b/src/interp/trace.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-2009, Gabriel Dos Reis. -- All rights reserved. -- -- Redistribution and use in source and binary forms, with or without @@ -733,7 +733,7 @@ traceReply() == addTraceItem EVAL x; functionList:= [x,:functionList]) userError '"bad argument to trace" functionList:= "append"/[[rassocSub(x,$mapSubNameAlist),'" "] - for x in functionList | ^isSubForRedundantMapName x] + for x in functionList | not isSubForRedundantMapName x] if functionList then 2 = #functionList => sayMSG [" Function traced: ",:functionList] @@ -792,7 +792,7 @@ tracelet(fn,vars) == if $letAssoc then SETLETPRINTFLAG true $TRACELETFLAG : local := true $QuickLet : local := false - ^MEMQ(fn,$traceletFunctions) and ^IS__GENVAR fn and COMPILED_-FUNCTION_-P SYMBOL_-FUNCTION fn + not MEMQ(fn,$traceletFunctions) and not IS__GENVAR fn and COMPILED_-FUNCTION_-P SYMBOL_-FUNCTION fn and not stupidIsSpadFunction fn and not GENSYMP fn => ($traceletFunctions:= [fn,:$traceletFunctions]; compileBoot fn ; $traceletFunctions:= delete(fn,$traceletFunctions) ) @@ -813,7 +813,7 @@ breaklet(fn,vars) == pair => (RPLACD(pair,vars); $letAssoc) if $letAssoc then SETLETPRINTFLAG true $QuickLet:local := false - ^MEMQ(fn,$traceletFunctions) and not stupidIsSpadFunction fn + not MEMQ(fn,$traceletFunctions) and not stupidIsSpadFunction fn and not GENSYMP fn => $traceletFunctions:= [fn,:$traceletFunctions] compileBoot fn diff --git a/src/interp/wi1.boot b/src/interp/wi1.boot index 558bd60b..9b1f2411 100644 --- a/src/interp/wi1.boot +++ b/src/interp/wi1.boot @@ -958,7 +958,7 @@ comp3(x,m,$e) == m is ["Mapping",:.] => compWithMappingMode(x,m,e) m is ["QUOTE",a] => (x=a => [x,m,$e]; nil) STRINGP m => (atom x => (m=x or m=STRINGIMAGE x => [m,m,e]; nil); nil) - ^x or atom x => compAtom(x,m,e) + null x or atom x => compAtom(x,m,e) op:= first x getmode(op,e) is ["Mapping",:ml] and (u:= applyMapping(x,m,e,ml)) => u op=":" => compColon(x,m,e) diff --git a/src/interp/wi2.boot b/src/interp/wi2.boot index ef4eda87..ca28c739 100644 --- a/src/interp/wi2.boot +++ b/src/interp/wi2.boot @@ -581,7 +581,7 @@ compElt(origForm,m,E) == m := SUBST('Rep,'_$,m) ----------> new: <----------- [sig,[pred,val]]:= modemap - #sig~=2 and ^val is ["elt",:.] => nil --what does the second clause do ???? + #sig~=2 and val isnt ["CONST",:.] => nil --+ val := genDeltaEntry [opOf anOp,:modemap] x := markTran(origForm,[val],sig,[E]) -- cgit v1.2.3