add "with" to tokens. clean up match syntax. think about apply.

oconnor0 · Mar 26, 2012 · 95eca3b · 95eca3b
1 parent bfb8f8a
commit 95eca3b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/zero-compiler/src/main/java/zero/compiler/parser/Precedence.java b/zero-compiler/src/main/java/zero/compiler/parser/Precedence.java
@@ -1,8 +1,11 @@
 /* (C) 2012 Matt O'Connor <thegreendragon@gmail.com> */
 package zero.compiler.parser;
 
-public class Precedence {
+public final class Precedence {
   public static final int VAL   = 0;
 	public static final int PLUS  = 3;
 	public static final int TIMES = 4;
+  public static final int APPLY = 9;
+
+  private Precedence() {}
 }
diff --git a/zero-compiler/src/main/java/zero/compiler/parser/Token.java b/zero-compiler/src/main/java/zero/compiler/parser/Token.java
@@ -16,6 +16,7 @@ public enum Type {
     ELSE,
     END,
     MATCH,
+    WITH,
     TYPE,
     EQUALS,
     PLUS,
@@ -47,6 +48,7 @@ public static Type fromString(final String s) {
         case "end":   return END;
         case "type":  return TYPE;
         case "match": return MATCH;
+        case "with":  return WITH;
         case "=":     return EQUALS;
         case "+":     return PLUS;
         case "-":     return MINUS;

diff --git a/zero-compiler/src/test/zero/fib.z b/zero-compiler/src/test/zero/fib.z
@@ -9,6 +9,5 @@ val fib = fn n ->
 	match n with
 	| 0 -> 0
 	| 1 -> 1
-	| _ ->
 	else fib (n-1) + fib (n-2)
-	end
+	end