handle unary arithmetic operations correctly

desugar.js

@@ -39,6 +39,11 @@ function desugar(stx) {
     case "Name":
       return stx;
     case "Application":
+      if ((stx.func.ident === "-" ||
+          stx.func.ident === "+") &&
+          stx.p) {
+            return new typ.UnaryOp(desugar(stx.func), desugar(stx.p));
+          }
       if (stx.p)
         return new typ.App(desugar(stx.func), desugar(stx.p));
       return new typ.App(stx.func);

fib.jl

@@ -0,0 +1,21 @@
+def (fib n)
+  if (n == 0)
+    then 0
+  else if (n == 1)
+    then 1
+  else
+    ((fib (n-1)) +
+     (fib (n-2)))
+
+def (fact n)
+  if (n == 0)
+    then 1
+  else
+    ((fact (n-1)) * n)
+
+def ns [1,2,3,4,5]
+
+def main
+  ((print (fib 19)) >>
+   (print (ns >>= (return . fact))))
+

optimize.js

@@ -0,0 +1,11 @@
+var typ = require("./representation.js");
+
+/*function simplify(stx) {
+  switch (stx.exprType) {
+    case "Application":
+
+  }
+}*/
+
+//function simplifyUnary(stx) {
+

pprint.js

@@ -53,6 +53,8 @@ function pprint(expr) {
     return pprintFunc(expr);
   else if (expr.exprType === "Nil")
     return "[]";
+  else if (expr.exprType === "Unary")
+    return "("+expr.op.ident+" "+pprint(expr.val)+")";
 }
 
 module.exports = {pprint : pprint};

representation.js

@@ -18,6 +18,12 @@ var Expression = {
 		}
 };
 
+function UnaryOp(op, v) {
+  this.exprType = "Unary";
+  this.val = v;
+  this.op = op;
+  return this;
+}
 
 function IntT(v) {
 	this.exprType = "Integer";
@@ -186,4 +192,5 @@ module.exports =
 	 makeApp : makeApp,
 	 If      : If,
    DefFunc : DefFunc,
-   Nil : Nil}
+   UnaryOp : UnaryOp,
+   Nil : Nil }

test.jl

@@ -5,7 +5,9 @@ def (add a b)
   (a + b)
 
 def (catstrs strs)
-  (foldr f (head strs) (tail strs))
+  (foldr f
+         (head strs)
+         (tail strs))
 
 def strs ["aa", "bb"]
 
@@ -14,16 +16,20 @@ def (mymap f xs)
     then
       xs
   else
-    (: (f (head xs))
+    ((f (head xs))
-     (mymap f (tail xs)))
+     : (mymap f (tail xs)))
 
 def empty []
 
 def getFile
   (readFile "./parse.js")
 
+def (testUnary n)
+  ((-n) + n)
+
 def main
+  ((print (testUnary 6)) >>
   if False
     then
       undefined
-    else getFile
+    else getFile)