checkpoint

[sbp.git] / src / edu / berkeley / sbp / meta / MetaGrammarBindings.java

diff --git a/src/edu/berkeley/sbp/meta/MetaGrammarBindings.java b/src/edu/berkeley/sbp/meta/MetaGrammarBindings.java
index 50fd0b3..0fc7c71 100644 (file)
--- a/src/edu/berkeley/sbp/meta/MetaGrammarBindings.java
+++ b/src/edu/berkeley/sbp/meta/MetaGrammarBindings.java
@@ -172,8 +172,6 @@ public class MetaGrammarBindings {
             return ret;
         }
     }
-    public static   Seq  and(Seq s,         El[] elements) { return s.and(seq2(elements)); }
-    public static   Seq  andnot(Seq s,      El[] elements) { return s.andnot(seq2(elements)); }
     public static @bind.as("&")   Seq  and2(Seq s,        Seq a) { return s.and(a); }
     public static @bind.as("&~")  Seq  andnot2(Seq s,     Seq a) { return s.andnot(a); }
     public static @bind.as("->")  Seq  arrow(Seq s, El e)                { return s.follow(e); }
@@ -181,7 +179,7 @@ public class MetaGrammarBindings {
     public static @bind.as("/")   Seq  slash(Seq s, El e)                { return s.separate(e); }
 
     public static Seq  seq(El[] elements)               { return new Seq(elements); }
-    public static @bind.as("PS")  Seq  seq2(El[] elements)               { return new Seq(elements); }
+    public static @bind.as("Elements")  Seq  seq2(El[] elements)               { return new Seq(elements); }
     public static @bind.as        Seq  psx(Seq s)                        { return s; }
     public static @bind.as(":")   El   colon(String s, El e)             { return new Label(s, e); }
     public static @bind.as(")")   void close(String foo)                 { throw new Error("not supported"); }
@@ -272,7 +270,7 @@ public class MetaGrammarBindings {
     public static @bind.as("Word")    String word(String s) { return s; }
     public static @bind.as("Quoted")  String quoted(String s) { return s; }
     public static @bind.as("escaped") String c(char c) { return c+""; }
-    public static @bind.as("\"\"")    String emptystring() { return ""; }
+    public static @bind.as("EmptyString")    String emptystring() { return ""; }
     public static @bind.as("\n")      String retur() { return "\n"; }
     public static @bind.as("\r")      String lf() { return "\r"; }