Merge pull request #90 from triskaj/issue/89

Changed unfolding of arithmetics from right to left
takagi · Nov 25, 2017 · 7b4d9a2 · 7b4d9a2
2 parents da575f2 + f524e5a
commit 7b4d9a2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/lang/compiler/compile-expression.lisp b/src/lang/compiler/compile-expression.lisp
@@ -224,10 +224,10 @@
         (operands (arithmetic-operands form)))
     (if (<= (length operands) 2)
         (compile-function form var-env func-env)
-        (let ((operand-head (car operands))
-              (operand-tail (cdr operands)))
-          (let ((form1 `(,operator ,operand-head
-                                   (,operator ,@operand-tail))))
+        (let ((operand-head (butlast operands))
+              (operand-tail (car (last operands))))
+          (let ((form1 `(,operator (,operator ,@operand-head)
+                                   ,operand-tail)))
             (compile-expression form1 var-env func-env))))))
 
 

diff --git a/t/lang/compiler/compile-expression.lisp b/t/lang/compiler/compile-expression.lisp
@@ -180,7 +180,7 @@
 
 (let ((var-env (empty-variable-environment))
       (func-env (empty-function-environment)))
-  (is (compile-arithmetic '(+ 1 1 1) var-env func-env) "(1 + (1 + 1))"
+  (is (compile-arithmetic '(+ 1 1 1) var-env func-env) "((1 + 1) + 1)"
       "basic case 1"))