From 9787870aa77b999e220b50e6d69953a3cbb6284f Mon Sep 17 00:00:00 2001 From: hellerve Date: Tue, 5 May 2020 13:56:22 +0200 Subject: [PATCH] update for new carp --- infix.carp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/infix.carp b/infix.carp index 1da0aa0..0fc1007 100644 --- a/infix.carp +++ b/infix.carp @@ -1,7 +1,7 @@ (defndynamic null? [l] (= (length l) 0)) (defndynamic infix-prec [op] - (if (Dynamic.or (= op '+) (= op '-)) 1 + (if (or (= op '+) (= op '-)) 1 (if (= 'pow op) 3 2))) @@ -19,8 +19,8 @@ (if (list? (car expr)) (infix:parse (cdr expr) operators (cons (infix:parse (car expr)) operands)) (if (symbol? (car expr)) - (if (Dynamic.or (null? operators) - (> (infix-prec (car expr)) (infix-prec (car operators)))) + (if (or (null? operators) + (> (infix-prec (car expr)) (infix-prec (car operators)))) (infix-parse (cdr expr) (cons (car expr) operators) operands) (infix-op expr operators operands)) (infix-parse (cdr expr) operators (cons (car expr) operands))))))