diff options
| author | dos-reis <gdr@axiomatics.org> | 2011-10-18 01:27:42 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2011-10-18 01:27:42 +0000 |
| commit | 630b6f25ff2900a31326141b67a187a685e7e9b8 (patch) | |
| tree | f87d21c2387137ff8500e0e0ede9f2dbcabac64a /src/interp/i-intern.boot | |
| parent | 16111656afaa94a382d61de6c3ec37a9bdca05ef (diff) | |
| download | open-axiom-630b6f25ff2900a31326141b67a187a685e7e9b8.tar.gz | |
* interp/spad-parser.boot (parseSegmentTail): Tidy.
* interp/postpar.boot (postSEGMENT): Remove.
(postTupleCollect): Likewise.
(postBootNotEqual): Likewise.
* interp/parsing.lisp (CHAR-EQ): Remove.
(CHAR-NE): Likewise.
(getToken): Likewise.
* interp/newaux.lisp: Remove "^=" as legitimate operator.
* interp/lexing.boot (geToken): Rename from getSpadToken.
* interp/i-intern.boot (mkAtree3): Check for new form of universal
segment.
* interp/parse.boot (parseSegment): Likewise.
* algebra/seg.spad.pamphlet (Segment): Use .. instead of SEGMENT.
(SegmentFunctions2): Likewise.
(UniversalSegment): Likewise.
Diffstat (limited to 'src/interp/i-intern.boot')
| -rw-r--r-- | src/interp/i-intern.boot | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/interp/i-intern.boot b/src/interp/i-intern.boot index b8be53f7..61533d39 100644 --- a/src/interp/i-intern.boot +++ b/src/interp/i-intern.boot @@ -195,10 +195,10 @@ mkAtree3(x,op,argl) == op="=" => [mkAtreeNode "equation",:[mkAtree1 arg for arg in argl]] op="not" and argl is [["=",lhs,rhs]] => [mkAtreeNode "not",[mkAtreeNode "=",mkAtree1 lhs,mkAtree1 rhs]] - op="in" and argl is [var ,["SEGMENT",lb,ul]] => + op="in" and argl is [var ,["SEGMENT",lb,:ul]] => upTest:= - null ul => nil - mkLessOrEqual(var,ul) + ul = nil => nil + mkLessOrEqual(var,first ul) lowTest:=mkLessOrEqual(lb,var) z := ul => ['and,lowTest,upTest] |