antelope 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c791a71ff3ecc84f17a84ccb5955122154b61361
-  data.tar.gz: ef9c05b620950ffe04782135adc6a71005528976
+  metadata.gz: 3063af6acee6ef27ff96efdec1aeaf8c51cda510
+  data.tar.gz: cc405e6635d9a2192f246687cf7ee55df8026753
 SHA512:
-  metadata.gz: 7be5f67f4f2198bc767b78664ba1764194e9d5f34037f5fa3327cd7de748e36a6af30f7fee0fad62d6d0776fc7fe988f4d0073786df3d5a19a3bad23171809d8
-  data.tar.gz: 64a61b82594d2dc2b78b36f392365842794a41c04aeca5569d15887e39ccd78bc1f02a817ac54f151c61ec9ec560bc4612924e8a135ddcccf16a14bb9d974e58
+  metadata.gz: 9f52610cdd27dd8946772314fe5afe57af9e982983d51abb51a627e488d64bfcb1eed894a66a6f653b85829315d73bb840bc094aa687938ada70df989ce18eb8
+  data.tar.gz: a0b91029a688a6312a592dae9f6ae8a2b95d7c8b0fc597df3bf6a5a3667dd575c7342a34a1c61c06541cba2fe84fc80b024ed07d463c2a2ac5f20377fda56a86

data/examples/deterministic.output

@@ -1,21 +1,10 @@
 Productions:
-  0 $start(0) → s(0:1) $ 
-  1 s(0:1) → e(0:2) 
-  2 e(0:2) → t(0:3) ";" 
-  3 e(0:2) → t(0:3) "+" e(8:10) 
-  4 t(0:3) → NUMBER 
-  5 t(0:3) → "(" e(5:9) ")" 
-  2 e(5:9) → t(5:3) ";" 
-  3 e(5:9) → t(5:3) "+" e(8:10) 
-  4 t(5:3) → NUMBER 
-  5 t(5:3) → "(" e(5:9) ")" 
-  2 e(8:10) → t(8:3) ";" 
-  3 e(8:10) → t(8:3) "+" e(8:10) 
-  4 t(8:3) → NUMBER 
-  5 t(8:3) → "(" e(5:9) ")" 
-
-Nontemrinals:
-["$start(0)", "s(0:1)", "e(0:2)", "t(0:3)", "e(5:9)", "t(5:3)", "e(8:10)", "t(8:3)"]
+  s → e 
+  e → t ";" 
+  e → t "+" e 
+  t → NUMBER 
+  t → "(" e ")" 
+  $start → s $ 
 
 Precedence:
   --- highest
@@ -27,116 +16,116 @@ Precedence:
 
   State 0:
     0/n0: $start →  • s $
-      {} ($start)
+      {}
     1/n1: s →  • e
-      {} (s)
+      {}
     2/n1: e →  • t ";"
-      {} (e)
+      {}
     3/n1: e →  • t "+" e
-      {} (e)
+      {}
     4/n1: t →  • NUMBER
-      {} (t)
+      {}
     5/n1: t →  • "(" e ")"
-      {} (t)
+      {}
     transitions:
       s: State 1
       e: State 2
       t: State 3
       NUMBER: State 4
-      LPAREN: State 5
+      "(": State 5
 
   State 1:
     6/n0: $start → s • $
-      {} ($start)
+      {}
     transitions:
       $: State 6
 
   State 2:
     7/n1: s → e • 
-      {$} (s)
+      {$}
     reductions:
       $: Rule 1
 
   State 3:
     8/n1: e → t • ";"
-      {} (e)
+      {}
     9/n1: e → t • "+" e
-      {} (e)
+      {}
     transitions:
-      SEMICOLON: State 7
-      ADD: State 8
+      ";": State 7
+      "+": State 8
 
   State 4:
     10/n1: t → NUMBER • 
-      {";", "+"} (t)
+      {";", "+"}
     reductions:
-      SEMICOLON: Rule 4
-      ADD: Rule 4
+      ";": Rule 4
+      "+": Rule 4
 
   State 5:
     11/n1: t → "(" • e ")"
-      {} (t)
+      {}
     12/n1: e →  • t ";"
-      {} (e)
+      {}
     13/n1: e →  • t "+" e
-      {} (e)
+      {}
     14/n1: t →  • NUMBER
-      {} (t)
+      {}
     15/n1: t →  • "(" e ")"
-      {} (t)
+      {}
     transitions:
       e: State 9
       t: State 3
       NUMBER: State 4
-      LPAREN: State 5
+      "(": State 5
 
   State 6:
     16/n0: $start → s $ • 
-      {} ($start)
+      {}
     accepting:
       $: Rule 0
 
   State 7:
     17/n1: e → t ";" • 
-      {$, ")"} (e)
+      {$, ")"}
     reductions:
       $: Rule 2
-      RPAREN: Rule 2
+      ")": Rule 2
 
   State 8:
     18/n1: e → t "+" • e
-      {} (e)
+      {}
     19/n1: e →  • t ";"
-      {} (e)
+      {}
     20/n1: e →  • t "+" e
-      {} (e)
+      {}
     21/n1: t →  • NUMBER
-      {} (t)
+      {}
     22/n1: t →  • "(" e ")"
-      {} (t)
+      {}
     transitions:
       e: State 10
       t: State 3
       NUMBER: State 4
-      LPAREN: State 5
+      "(": State 5
 
   State 9:
     23/n1: t → "(" e • ")"
-      {} (t)
+      {}
     transitions:
-      RPAREN: State 11
+      ")": State 11
 
   State 10:
     24/n1: e → t "+" e • 
-      {$, ")"} (e)
+      {$, ")"}
     reductions:
       $: Rule 3
-      RPAREN: Rule 3
+      ")": Rule 3
 
   State 11:
     25/n1: t → "(" e ")" • 
-      {";", "+"} (t)
+      {";", "+"}
     reductions:
-      SEMICOLON: Rule 5
-      ADD: Rule 5
+      ";": Rule 5
+      "+": Rule 5
 

data/examples/example.output

@@ -1,50 +1,12 @@
 Productions:
-  0 $start(0) → expression(0:1) $ 
-  1 expression(0:1) → NUMBER { |a| a[1]        }
-  2 expression(0:1) → expression(0:1) "+" expression(5:11) { |a, _, b| a + b }
-  3 expression(0:1) → expression(0:1) "-" expression(6:12) { |a, _, b| a - b }
-  4 expression(0:1) → expression(0:1) "*" expression(7:13) { |a, _, b| a * b }
-  5 expression(0:1) → expression(0:1) "/" expression(8:14) { |a, _, b| a / b }
-  6 expression(0:1) → "(" expression(3:9) ")" { |_, a, _| a     }
-  7 expression(0:1) → "(" $error ")" 
-  1 expression(3:9) → NUMBER { |a| a[1]        }
-  2 expression(3:9) → expression(3:9) "+" expression(5:11) { |a, _, b| a + b }
-  3 expression(3:9) → expression(3:9) "-" expression(6:12) { |a, _, b| a - b }
-  4 expression(3:9) → expression(3:9) "*" expression(7:13) { |a, _, b| a * b }
-  5 expression(3:9) → expression(3:9) "/" expression(8:14) { |a, _, b| a / b }
-  6 expression(3:9) → "(" expression(3:9) ")" { |_, a, _| a     }
-  7 expression(3:9) → "(" $error ")" 
-  1 expression(5:11) → NUMBER { |a| a[1]        }
-  2 expression(5:11) → expression(5:11) "+" expression(5:11) { |a, _, b| a + b }
-  3 expression(5:11) → expression(5:11) "-" expression(6:12) { |a, _, b| a - b }
-  4 expression(5:11) → expression(5:11) "*" expression(7:13) { |a, _, b| a * b }
-  5 expression(5:11) → expression(5:11) "/" expression(8:14) { |a, _, b| a / b }
-  6 expression(5:11) → "(" expression(3:9) ")" { |_, a, _| a     }
-  7 expression(5:11) → "(" $error ")" 
-  1 expression(6:12) → NUMBER { |a| a[1]        }
-  2 expression(6:12) → expression(6:12) "+" expression(5:11) { |a, _, b| a + b }
-  3 expression(6:12) → expression(6:12) "-" expression(6:12) { |a, _, b| a - b }
-  4 expression(6:12) → expression(6:12) "*" expression(7:13) { |a, _, b| a * b }
-  5 expression(6:12) → expression(6:12) "/" expression(8:14) { |a, _, b| a / b }
-  6 expression(6:12) → "(" expression(3:9) ")" { |_, a, _| a     }
-  7 expression(6:12) → "(" $error ")" 
-  1 expression(7:13) → NUMBER { |a| a[1]        }
-  2 expression(7:13) → expression(7:13) "+" expression(5:11) { |a, _, b| a + b }
-  3 expression(7:13) → expression(7:13) "-" expression(6:12) { |a, _, b| a - b }
-  4 expression(7:13) → expression(7:13) "*" expression(7:13) { |a, _, b| a * b }
-  5 expression(7:13) → expression(7:13) "/" expression(8:14) { |a, _, b| a / b }
-  6 expression(7:13) → "(" expression(3:9) ")" { |_, a, _| a     }
-  7 expression(7:13) → "(" $error ")" 
-  1 expression(8:14) → NUMBER { |a| a[1]        }
-  2 expression(8:14) → expression(8:14) "+" expression(5:11) { |a, _, b| a + b }
-  3 expression(8:14) → expression(8:14) "-" expression(6:12) { |a, _, b| a - b }
-  4 expression(8:14) → expression(8:14) "*" expression(7:13) { |a, _, b| a * b }
-  5 expression(8:14) → expression(8:14) "/" expression(8:14) { |a, _, b| a / b }
-  6 expression(8:14) → "(" expression(3:9) ")" { |_, a, _| a     }
-  7 expression(8:14) → "(" $error ")" 
-
-Nontemrinals:
-["$start(0)", "expression(0:1)", "expression(3:9)", "expression(5:11)", "expression(6:12)", "expression(7:13)", "expression(8:14)"]
+  expression → NUMBER { |a| a[1]        }
+  expression → expression "+" expression { |a, _, b| a + b }
+  expression → expression "-" expression { |a, _, b| a - b }
+  expression → expression "*" expression { |a, _, b| a * b }
+  expression → expression "/" expression { |a, _, b| a / b }
+  expression → "(" expression ")" { |_, a, _| a     }
+  expression → "(" $error ")" 
+  $start → expression $ 
 
 Precedence:
   --- highest
@@ -62,295 +24,295 @@ Precedence:
 
   State 0:
     0/n0: $start →  • expression $
-      {} ($start)
+      {}
     1/n1: expression →  • NUMBER
-      {} (expression)
+      {}
     2/l2: expression →  • expression "+" expression
-      {} (expression)
+      {}
     3/l2: expression →  • expression "-" expression
-      {} (expression)
+      {}
     4/l3: expression →  • expression "*" expression
-      {} (expression)
+      {}
     5/l3: expression →  • expression "/" expression
-      {} (expression)
+      {}
     6/n4: expression →  • "(" expression ")"
-      {} (expression)
+      {}
     7/n4: expression →  • "(" $error ")"
-      {} (expression)
+      {}
     transitions:
       expression: State 1
       NUMBER: State 2
-      LPAREN: State 3
+      "(": State 3
 
   State 1:
     8/n0: $start → expression • $
-      {} ($start)
+      {}
     9/l2: expression → expression • "+" expression
-      {} (expression)
+      {}
     10/l2: expression → expression • "-" expression
-      {} (expression)
+      {}
     11/l3: expression → expression • "*" expression
-      {} (expression)
+      {}
     12/l3: expression → expression • "/" expression
-      {} (expression)
+      {}
     transitions:
       $: State 4
-      ADD: State 5
-      SUBTRACT: State 6
-      MULTIPLY: State 7
-      DIVIDE: State 8
+      "+": State 5
+      "-": State 6
+      "*": State 7
+      "/": State 8
 
   State 2:
     13/n1: expression → NUMBER • 
-      {$, "+", "-", "*", "/", ")"} (expression)
+      {$, "+", "-", "*", "/", ")"}
     reductions:
       $: Rule 1
-      ADD: Rule 1
-      SUBTRACT: Rule 1
-      MULTIPLY: Rule 1
-      DIVIDE: Rule 1
-      RPAREN: Rule 1
+      "+": Rule 1
+      "-": Rule 1
+      "*": Rule 1
+      "/": Rule 1
+      ")": Rule 1
 
   State 3:
     14/n4: expression → "(" • expression ")"
-      {} (expression)
+      {}
     15/n1: expression →  • NUMBER
-      {} (expression)
+      {}
     16/l2: expression →  • expression "+" expression
-      {} (expression)
+      {}
     17/l2: expression →  • expression "-" expression
-      {} (expression)
+      {}
     18/l3: expression →  • expression "*" expression
-      {} (expression)
+      {}
     19/l3: expression →  • expression "/" expression
-      {} (expression)
+      {}
     20/n4: expression →  • "(" expression ")"
-      {} (expression)
+      {}
     21/n4: expression →  • "(" $error ")"
-      {} (expression)
+      {}
     22/n4: expression → "(" • $error ")"
-      {} (expression)
+      {}
     transitions:
       expression: State 9
       NUMBER: State 2
-      LPAREN: State 3
+      "(": State 3
       $error: State 10
 
   State 4:
     23/n0: $start → expression $ • 
-      {} ($start)
+      {}
     accepting:
       $: Rule 0
 
   State 5:
     24/l2: expression → expression "+" • expression
-      {} (expression)
+      {}
     25/n1: expression →  • NUMBER
-      {} (expression)
+      {}
     26/l2: expression →  • expression "+" expression
-      {} (expression)
+      {}
     27/l2: expression →  • expression "-" expression
-      {} (expression)
+      {}
     28/l3: expression →  • expression "*" expression
-      {} (expression)
+      {}
     29/l3: expression →  • expression "/" expression
-      {} (expression)
+      {}
     30/n4: expression →  • "(" expression ")"
-      {} (expression)
+      {}
     31/n4: expression →  • "(" $error ")"
-      {} (expression)
+      {}
     transitions:
       expression: State 11
       NUMBER: State 2
-      LPAREN: State 3
+      "(": State 3
 
   State 6:
     32/l2: expression → expression "-" • expression
-      {} (expression)
+      {}
     33/n1: expression →  • NUMBER
-      {} (expression)
+      {}
     34/l2: expression →  • expression "+" expression
-      {} (expression)
+      {}
     35/l2: expression →  • expression "-" expression
-      {} (expression)
+      {}
     36/l3: expression →  • expression "*" expression
-      {} (expression)
+      {}
     37/l3: expression →  • expression "/" expression
-      {} (expression)
+      {}
     38/n4: expression →  • "(" expression ")"
-      {} (expression)
+      {}
     39/n4: expression →  • "(" $error ")"
-      {} (expression)
+      {}
     transitions:
       expression: State 12
       NUMBER: State 2
-      LPAREN: State 3
+      "(": State 3
 
   State 7:
     40/l3: expression → expression "*" • expression
-      {} (expression)
+      {}
     41/n1: expression →  • NUMBER
-      {} (expression)
+      {}
     42/l2: expression →  • expression "+" expression
-      {} (expression)
+      {}
     43/l2: expression →  • expression "-" expression
-      {} (expression)
+      {}
     44/l3: expression →  • expression "*" expression
-      {} (expression)
+      {}
     45/l3: expression →  • expression "/" expression
-      {} (expression)
+      {}
     46/n4: expression →  • "(" expression ")"
-      {} (expression)
+      {}
     47/n4: expression →  • "(" $error ")"
-      {} (expression)
+      {}
     transitions:
       expression: State 13
       NUMBER: State 2
-      LPAREN: State 3
+      "(": State 3
 
   State 8:
     48/l3: expression → expression "/" • expression
-      {} (expression)
+      {}
     49/n1: expression →  • NUMBER
-      {} (expression)
+      {}
     50/l2: expression →  • expression "+" expression
-      {} (expression)
+      {}
     51/l2: expression →  • expression "-" expression
-      {} (expression)
+      {}
     52/l3: expression →  • expression "*" expression
-      {} (expression)
+      {}
     53/l3: expression →  • expression "/" expression
-      {} (expression)
+      {}
     54/n4: expression →  • "(" expression ")"
-      {} (expression)
+      {}
     55/n4: expression →  • "(" $error ")"
-      {} (expression)
+      {}
     transitions:
       expression: State 14
       NUMBER: State 2
-      LPAREN: State 3
+      "(": State 3
 
   State 9:
     56/n4: expression → "(" expression • ")"
-      {} (expression)
+      {}
     57/l2: expression → expression • "+" expression
-      {} (expression)
+      {}
     58/l2: expression → expression • "-" expression
-      {} (expression)
+      {}
     59/l3: expression → expression • "*" expression
-      {} (expression)
+      {}
     60/l3: expression → expression • "/" expression
-      {} (expression)
+      {}
     transitions:
-      RPAREN: State 15
-      ADD: State 5
-      SUBTRACT: State 6
-      MULTIPLY: State 7
-      DIVIDE: State 8
+      ")": State 15
+      "+": State 5
+      "-": State 6
+      "*": State 7
+      "/": State 8
 
   State 10:
     61/n4: expression → "(" $error • ")"
-      {} (expression)
+      {}
     transitions:
-      RPAREN: State 16
+      ")": State 16
 
   State 11:
     62/l2: expression → expression "+" expression • 
-      {$, "+", "-", "*", "/", ")"} (expression)
+      {$, "+", "-", "*", "/", ")"}
     63/l2: expression → expression • "+" expression
-      {} (expression)
+      {}
     64/l2: expression → expression • "-" expression
-      {} (expression)
+      {}
     65/l3: expression → expression • "*" expression
-      {} (expression)
+      {}
     66/l3: expression → expression • "/" expression
-      {} (expression)
+      {}
     transitions:
-      MULTIPLY: State 7
-      DIVIDE: State 8
+      "*": State 7
+      "/": State 8
     reductions:
-      ADD: Rule 2
-      SUBTRACT: Rule 2
+      "+": Rule 2
+      "-": Rule 2
       $: Rule 2
-      RPAREN: Rule 2
+      ")": Rule 2
 
   State 12:
     67/l2: expression → expression "-" expression • 
-      {$, "+", "-", "*", "/", ")"} (expression)
+      {$, "+", "-", "*", "/", ")"}
     68/l2: expression → expression • "+" expression
-      {} (expression)
+      {}
     69/l2: expression → expression • "-" expression
-      {} (expression)
+      {}
     70/l3: expression → expression • "*" expression
-      {} (expression)
+      {}
     71/l3: expression → expression • "/" expression
-      {} (expression)
+      {}
     transitions:
-      MULTIPLY: State 7
-      DIVIDE: State 8
+      "*": State 7
+      "/": State 8
     reductions:
-      ADD: Rule 3
-      SUBTRACT: Rule 3
+      "+": Rule 3
+      "-": Rule 3
       $: Rule 3
-      RPAREN: Rule 3
+      ")": Rule 3
 
   State 13:
     72/l3: expression → expression "*" expression • 
-      {$, "+", "-", "*", "/", ")"} (expression)
+      {$, "+", "-", "*", "/", ")"}
     73/l2: expression → expression • "+" expression
-      {} (expression)
+      {}
     74/l2: expression → expression • "-" expression
-      {} (expression)
+      {}
     75/l3: expression → expression • "*" expression
-      {} (expression)
+      {}
     76/l3: expression → expression • "/" expression
-      {} (expression)
+      {}
     reductions:
-      ADD: Rule 4
-      SUBTRACT: Rule 4
-      MULTIPLY: Rule 4
-      DIVIDE: Rule 4
+      "+": Rule 4
+      "-": Rule 4
+      "*": Rule 4
+      "/": Rule 4
       $: Rule 4
-      RPAREN: Rule 4
+      ")": Rule 4
 
   State 14:
     77/l3: expression → expression "/" expression • 
-      {$, "+", "-", "*", "/", ")"} (expression)
+      {$, "+", "-", "*", "/", ")"}
     78/l2: expression → expression • "+" expression
-      {} (expression)
+      {}
     79/l2: expression → expression • "-" expression
-      {} (expression)
+      {}
     80/l3: expression → expression • "*" expression
-      {} (expression)
+      {}
     81/l3: expression → expression • "/" expression
-      {} (expression)
+      {}
     reductions:
-      ADD: Rule 5
-      SUBTRACT: Rule 5
-      MULTIPLY: Rule 5
-      DIVIDE: Rule 5
+      "+": Rule 5
+      "-": Rule 5
+      "*": Rule 5
+      "/": Rule 5
       $: Rule 5
-      RPAREN: Rule 5
+      ")": Rule 5
 
   State 15:
     82/n4: expression → "(" expression ")" • 
-      {$, "+", "-", "*", "/", ")"} (expression)
+      {$, "+", "-", "*", "/", ")"}
     reductions:
       $: Rule 6
-      ADD: Rule 6
-      SUBTRACT: Rule 6
-      MULTIPLY: Rule 6
-      DIVIDE: Rule 6
-      RPAREN: Rule 6
+      "+": Rule 6
+      "-": Rule 6
+      "*": Rule 6
+      "/": Rule 6
+      ")": Rule 6
 
   State 16:
     83/n4: expression → "(" $error ")" • 
-      {$, "+", "-", "*", "/", ")"} (expression)
+      {$, "+", "-", "*", "/", ")"}
     reductions:
       $: Rule 7
-      ADD: Rule 7
-      SUBTRACT: Rule 7
-      MULTIPLY: Rule 7
-      DIVIDE: Rule 7
-      RPAREN: Rule 7
+      "+": Rule 7
+      "-": Rule 7
+      "*": Rule 7
+      "/": Rule 7
+      ")": Rule 7
 

data/examples/simple.output

@@ -1,19 +1,10 @@
 Productions:
-  0 $start(0) → e(0:1) $ 
-  1 e(0:1) → l(0:2) "=" r(7:10) 
-  2 e(0:1) → r(0:3) 
-  3 l(0:2) → IDENT 
-  4 l(0:2) → "*" r(5:8) 
-  5 r(0:3) → l(0:2) 
-  5 r(5:8) → l(5:9) 
-  3 l(5:9) → IDENT 
-  4 l(5:9) → "*" r(5:8) 
-  5 r(7:10) → l(7:9) 
-  3 l(7:9) → IDENT 
-  4 l(7:9) → "*" r(5:8) 
-
-Nontemrinals:
-["$start(0)", "e(0:1)", "l(0:2)", "r(0:3)", "r(5:8)", "l(5:9)", "r(7:10)", "l(7:9)"]
+  e → l "=" r 
+  e → r 
+  l → IDENT 
+  l → "*" r 
+  r → l 
+  $start → e $ 
 
 Precedence:
   --- highest
@@ -25,106 +16,106 @@ Precedence:
 
   State 0:
     0/n0: $start →  • e $
-      {} ($start)
+      {}
     1/n1: e →  • l "=" r
-      {} (e)
+      {}
     2/n1: e →  • r
-      {} (e)
+      {}
     3/n1: l →  • IDENT
-      {} (l)
+      {}
     4/n1: l →  • "*" r
-      {} (l)
+      {}
     5/n1: r →  • l
-      {} (r)
+      {}
     transitions:
       e: State 1
       l: State 2
       r: State 3
       IDENT: State 4
-      STAR: State 5
+      "*": State 5
 
   State 1:
     6/n0: $start → e • $
-      {} ($start)
+      {}
     transitions:
       $: State 6
 
   State 2:
     7/n1: e → l • "=" r
-      {} (e)
+      {}
     8/n1: r → l • 
-      {$} (r)
+      {$}
     transitions:
-      EQUALS: State 7
+      "=": State 7
     reductions:
       $: Rule 5
 
   State 3:
     9/n1: e → r • 
-      {$} (e)
+      {$}
     reductions:
       $: Rule 2
 
   State 4:
     10/n1: l → IDENT • 
-      {"=", $} (l)
+      {"=", $}
     reductions:
-      EQUALS: Rule 3
+      "=": Rule 3
       $: Rule 3
 
   State 5:
     11/n1: l → "*" • r
-      {} (l)
+      {}
     12/n1: r →  • l
-      {} (r)
+      {}
     13/n1: l →  • IDENT
-      {} (l)
+      {}
     14/n1: l →  • "*" r
-      {} (l)
+      {}
     transitions:
       r: State 8
       l: State 9
       IDENT: State 4
-      STAR: State 5
+      "*": State 5
 
   State 6:
     15/n0: $start → e $ • 
-      {} ($start)
+      {}
     accepting:
       $: Rule 0
 
   State 7:
     16/n1: e → l "=" • r
-      {} (e)
+      {}
     17/n1: r →  • l
-      {} (r)
+      {}
     18/n1: l →  • IDENT
-      {} (l)
+      {}
     19/n1: l →  • "*" r
-      {} (l)
+      {}
     transitions:
       r: State 10
       l: State 9
       IDENT: State 4
-      STAR: State 5
+      "*": State 5
 
   State 8:
     20/n1: l → "*" r • 
-      {"=", $} (l)
+      {"=", $}
     reductions:
-      EQUALS: Rule 4
+      "=": Rule 4
       $: Rule 4
 
   State 9:
     21/n1: r → l • 
-      {"=", $} (r)
+      {"=", $}
     reductions:
-      EQUALS: Rule 5
+      "=": Rule 5
       $: Rule 5
 
   State 10:
     22/n1: e → l "=" r • 
-      {$} (e)
+      {$}
     reductions:
       $: Rule 1
 

data/lib/antelope/ace/compiler.rb

@@ -151,7 +151,7 @@ module Antelope
         require_state! :first
         name = name.intern
         case name
-        when :terminal
+        when :terminal, :token
           @options[:terminals] << [args[0].intern, args[1]]
         when :require
           compare_versions(args[0])

data/lib/antelope/generation/tableizer.rb

@@ -91,19 +91,26 @@ module Antelope
 
             terminal = grammar.precedence_for(on)
 
-            state_part = data.select { |(t, d)| t == :state }.first
-            rule_part  = data.select { |(t, d)| t == :reduce}.first
+            rule_part, other_part = data.sort_by { |(t, d)| t }
+
+            unless other_part[0] == :state
+              $stderr.puts \
+                "Could not determine move for #{on} in state " \
+                "#{state} (reduce/reduce conflict)"
+              next
+            end
 
             result = @rules[rule_part[1]].prec <=> terminal
 
             case result
             when 0
               $stderr.puts \
-                "Could not determine move for #{on} in state #{state}"
+                "Could not determine move for #{on} in state " \
+                "#{state} (shift/reduce conflict)"
             when 1
               @table[state][on] = rule_part
             when -1
-              @table[state][on] = state_part
+              @table[state][on] = other_part
             end
           end
         end

data/lib/antelope/generator/templates/output.erb

@@ -22,9 +22,9 @@ Precedence:
     <%= rule %>
       {<%= rule.lookahead.to_a.join(", ") %>}
 %   end
-%   transitions = v.each.select { |_, a| a[0] == :state      }
-%   reductions  = v.each.select { |_, a| a[0] == :reduce     }
-%   accepting   = v.each.select { |_, a| a[0] == :accept     }
+%   transitions = v.each.select { |_, a| a && a[0] == :state }
+%   reductions  = v.each.select { |_, a| a && a[0] == :reduce}
+%   accepting   = v.each.select { |_, a| a && a[0] == :accept}
 %   conflicts   = v.each.select { |_, (a, b)| a.is_a?(Array) }
 %   thing = [:transitions, :reductions, :accepting]
 %   num_type = {transitions: "State", reductions: "Rule", accepting: "Rule"}
@@ -33,7 +33,8 @@ Precedence:
 %     next unless value.any?
     <%= key %>:
 %     value.each do |token, (_, name)|
-      <%= token %>: <%= num_type[key] %> <%= name %>
+%     token_value = grammar.terminals.find { |_| _.name == token } || token
+      <%= token_value %>: <%= num_type[key] %> <%= name %>
 %     end
 %   end
 %   if conflicts.any?

data/lib/antelope/generator.rb

@@ -74,7 +74,9 @@ module Antelope
       src_file  = self.class.source_root + source
       src       = src_file.open("r")
       context   = instance_eval('binding')
-      content   = ERB.new(src.read, nil, "%").result(context)
+      erb       = ERB.new(src.read, nil, "%")
+      erb.filename = source
+      content   = erb.result(context)
       content   = yield content if block_given?
       dest_file = grammar.output + destination
       dest_file.open("w") do |f|

data/lib/antelope/version.rb

@@ -2,5 +2,5 @@
 
 module Antelope
   # The current running version of antelope.
-  VERSION = "0.1.5".freeze
+  VERSION = "0.1.6".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: antelope
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Jeremy Rodi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-24 00:00:00.000000000 Z
+date: 2014-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie