diff options
Diffstat (limited to 'src/interp/i-funsel.boot')
-rw-r--r-- | src/interp/i-funsel.boot | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/interp/i-funsel.boot b/src/interp/i-funsel.boot index 29f33844..b75f710a 100644 --- a/src/interp/i-funsel.boot +++ b/src/interp/i-funsel.boot @@ -909,13 +909,13 @@ matchMmCond(cond) == -- cond is 'T or a list, but I hate to test for 'T (ALBI) $domPvar: local := nil atom cond or - cond.op in '(AND _and %and) => + cond.op in '(AND and %and) => and/[matchMmCond c for c in cond.args] - cond.op in '(OR _or %or) => + cond.op in '(OR or %or) => or/[matchMmCond c for c in cond.args] cond is ["has",dom,x] => hasCaty(dom,x,NIL) ~= 'failed - cond is [op,cond1] and op in '(_not NOT %not) => not matchMmCond cond1 + cond is [op,cond1] and op in '(not NOT %not) => not matchMmCond cond1 keyedSystemError("S2GE0016", ['"matchMmCond",'"unknown form of condition"]) @@ -1165,9 +1165,9 @@ evalMmFreeFunction(op,tar,sig,mmC) == evalMmStack(mmC) == -- translates the modemap condition mmC into a list of stacks - mmC is [op,:a] and op in '(AND _and %and) => + mmC is [op,:a] and op in '(AND and %and) => ["NCONC"/[evalMmStackInner cond for cond in a]] - mmC is [op,:args] and op in '(OR _or %or) => + mmC is [op,:args] and op in '(OR or %or) => [:evalMmStack a for a in args] mmC is ['partial,:mmD] => evalMmStack mmD mmC is ['ofCategory,pvar,cat] and cat is ['Join,:args] => @@ -1180,7 +1180,7 @@ evalMmStack(mmC) == [[mmC]] evalMmStackInner(mmC) == - mmC is [op,:args] and op in '(OR _or %or) => + mmC is [op,:args] and op in '(OR or %or) => keyedSystemError("S2GE0016", ['"evalMmStackInner",'"OR condition nested inside an AND"]) mmC is ['partial,:mmD] => evalMmStackInner mmD @@ -1523,7 +1523,7 @@ hasCaty1(cond,SL) == -- SL is augmented, if cond is true, otherwise the result is 'failed $domPvar: local := NIL cond is ["has",a,b] => hasCate(a,b,SL) - cond is [op,:args] and op in '(AND _and %and) => + cond is [op,:args] and op in '(AND and %and) => for x in args while not (S='failed) repeat S:= x is ["has",a,b] => hasCate(a,b, SL) -- next line is for an obscure bug in the table @@ -1531,7 +1531,7 @@ hasCaty1(cond,SL) == --'failed hasCaty1(x, SL) S - cond is [op,:args] and op in '(OR _or %or) => + cond is [op,:args] and op in '(OR or %or) => for x in args until not (S='failed) repeat S:= x is ["has",a,b] => hasCate(a,b,copy SL) -- next line is for an obscure bug in the table @@ -1573,7 +1573,7 @@ hasSigOr(orCls, S0, SL) == atom cls => copy SL cls is ["has",a,b] => hasCate(subCopy(a,S0),subCopy(b,S0),copy SL) - cls is [op,:andCls] and op in '(AND _and %and) => + cls is [op,:andCls] and op in '(AND and %and) => hasSigAnd(andCls, S0, SL) keyedSystemError("S2GE0016", ['"hasSigOr",'"unexpected condition for signature"]) @@ -1592,9 +1592,9 @@ hasSig(dom,foo,sig,SL) == atom cond => copy SL cond is ["has",a,b] => hasCate(subCopy(a,S0),subCopy(b,S0),copy SL) - cond is [op,:andCls] and op in '(AND _and %and) => + cond is [op,:andCls] and op in '(AND and %and) => hasSigAnd(andCls, S0, SL) - cond is [op,:orCls] and op in '(OR _or %or) => + cond is [op,:orCls] and op in '(OR or %or) => hasSigOr(orCls, S0, SL) keyedSystemError("S2GE0016", ['"hasSig",'"unexpected condition for signature"]) @@ -1623,9 +1623,9 @@ hasAtt(dom,att,SL) == 'failed hasCatExpression(cond,SL) == - cond is [op,:l] and op in '(OR _or %or) => + cond is [op,:l] and op in '(OR or %or) => or/[(y:=hasCatExpression(x,SL)) ~= 'failed for x in l] => y - cond is [op,:l] and op in '(AND _and %and) => + cond is [op,:l] and op in '(AND and %and) => and/[(SL:= hasCatExpression(x,SL)) ~= 'failed for x in l] => SL cond is ["has",a,b] => hasCate(a,b,SL) keyedSystemError("S2GE0016", |