carpentry/infix
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update for new carp

Browse Source
This commit is contained in:
Veit Heller
2020-05-05 13:56:22 +02:00
parent fa8991082a
commit 9787870aa7
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
infix.carp
View File

@@ -1,7 +1,7 @@
(defndynamic null? [l] (= (length l) 0)) (defndynamic null? [l] (= (length l) 0))
(defndynamic infix-prec [op] (defndynamic infix-prec [op]
(if (Dynamic.or (= op '+) (= op '-)) 1 (if (or (= op '+) (= op '-)) 1
(if (= 'pow op) 3 (if (= 'pow op) 3
2))) 2)))
@@ -19,8 +19,8 @@
(if (list? (car expr)) (if (list? (car expr))
(infix:parse (cdr expr) operators (cons (infix:parse (car expr)) operands)) (infix:parse (cdr expr) operators (cons (infix:parse (car expr)) operands))
(if (symbol? (car expr)) (if (symbol? (car expr))
(if (Dynamic.or (null? operators) (if (or (null? operators)
(> (infix-prec (car expr)) (infix-prec (car operators)))) (> (infix-prec (car expr)) (infix-prec (car operators))))
(infix-parse (cdr expr) (cons (car expr) operators) operands) (infix-parse (cdr expr) (cons (car expr) operators) operands)
(infix-op expr operators operands)) (infix-op expr operators operands))
(infix-parse (cdr expr) operators (cons (car expr) operands)))))) (infix-parse (cdr expr) operators (cons (car expr) operands))))))