diff options
Diffstat (limited to 'src/interp/newaux.lisp')
-rw-r--r-- | src/interp/newaux.lisp | 43 |
1 files changed, 16 insertions, 27 deletions
diff --git a/src/interp/newaux.lisp b/src/interp/newaux.lisp index 182e6135..a3d2ef79 100644 --- a/src/interp/newaux.lisp +++ b/src/interp/newaux.lisp @@ -101,17 +101,17 @@ (|quo| 800 801) (|div| 800 801) (/ 800 801) (** 900 901) (^ 900 901) (|exquo| 800 801) (+ 700 701) - (\- 700 701) (\-\> 1001 1002) (\<\- 1001 1002) + (- 700 701) (-> 1001 1002) (<- 1001 1002) (\: 996 997) (\:\: 996 997) (\@ 996 997) (|pretend| 995 996) (\.) (\! \! 1002 1001) (\, 110 111) (\; 81 82 (|PARSE-SemiColon|)) - (\< 400 400) (\> 400 400) - (\<\< 400 400) (\>\> 400 400) - (\<= 400 400) (\>= 400 400) + (< 400 400) (> 400 400) + (<< 400 400) (>> 400 400) + (<= 400 400) (>= 400 400) (= 400 400) (^= 400 400) - (\~= 400 400) + (~= 400 400) (|in| 400 400) (|case| 400 400) (|add| 400 120) (|with| 2000 400 (|PARSE-InfixWith|)) (|has| 400 400) @@ -121,10 +121,10 @@ (|and| 250 251) (|or| 200 201) (/\\ 250 251) (\\/ 200 201) (\.\. SEGMENT 401 699 (|PARSE-Seg|)) - (=\> 123 103) - (+-\> 998 112) + (=> 123 103) + (+-> 998 112) (== DEF 122 121) - (==\> MDEF 122 121) + (==> MDEF 122 121) (\| 108 111) ;was 190 190 (\:- LETD 125 124) (\:= %LET 125 124))) @@ -139,19 +139,18 @@ (|add| 900 120) (|with| 1000 300 (|PARSE-With|)) (|has| 400 400) - (\- 701 700) ; right-prec. wants to be -1 + left-prec + (- 701 700) ; right-prec. wants to be -1 + left-prec ;; (\+ 701 700) (\# 999 998) (\! 1002 1001) (\' 999 999 (|PARSE-Data|)) - (\<\< 122 120 (|PARSE-LabelExpr|)) - (\>\>) - (^ 260 259 NIL) - (\-\> 1001 1002) + (<< 122 120 (|PARSE-LabelExpr|)) + (>>) + (-> 1001 1002) (\: 194 195) (|not| 260 259 NIL) - (\~ 260 259 nil) - (\= 400 700) + (~ 260 259 nil) + (= 400 700) (|return| 202 201 (|PARSE-Return|)) (|leave| 202 201 (|PARSE-Leave|)) (|exit| 202 201 (|PARSE-Exit|)) @@ -175,13 +174,13 @@ `( ( \| (\)) (]) ) ( * (*) ) - ( \( (<) (\|) ) + ( \( (\|) ) ( + (- (>)) ) ( - (>) ) ( < (=) (<) ) ( / (\\) ) ( \\ (/) ) - ( > (=) (>) (\))) + ( > (=) (>) ) ( = (= (>)) (>) ) ( \. (\.) ) ( ^ (=) ) @@ -189,16 +188,6 @@ ( [ (\|) ) ( \: (=) (-) (\:)))) -;; RENAMETOK defines alternate token strings which can be used for different -;; keyboards which define equivalent tokens. - -(mapcar - #'(lambda (x) (MAKEPROP (CAR X) 'RENAMETOK (CADR X)) (MAKENEWOP X NIL)) - '((\(\| \[) ; (| |) means [] - (\|\) \]) - (\(< \{) ; (< >) means {} - (>\) \}))) - ;; GENERIC operators be suffixed by `$' qualifications in SPAD code. ;; `$' is then followed by a domain label, such as I for Integer, which ;; signifies which domain the operator refers to. For example `+$Integer' |