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 6b12da9..0fc7c71 100644 (file)
--- a/src/edu/berkeley/sbp/meta/MetaGrammarBindings.java
+++ b/src/edu/berkeley/sbp/meta/MetaGrammarBindings.java
@@ -172,27 +172,26 @@ public class MetaGrammarBindings {
             return ret;
         }
     }
-    public static @bind.as("&")   Seq  and(Seq s,         El[] elements) { return s.and(seq(elements)); }
-    public static @bind.as("&~")  Seq  andnot(Seq s,      El[] elements) { return s.andnot(seq(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); }
     public static @bind.as("::")  Seq  tag(String tagname, Seq s)        { return s.tag(tagname); }
     public static @bind.as("/")   Seq  slash(Seq s, El e)                { return s.separate(e); }
 
-    public static @bind.as("ps")  Seq  seq(El[] elements)                { return new Seq(elements); }
+    public static Seq  seq(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"); }
     public static @bind.as("()")  El   epsilon()                         { return new Constant(Union.epsilon); }
 
-    public static @bind.as("nonTerminal") class NonTerminalReference extends El {
+    public static @bind class NonTerminalReference extends El {
         public @bind.arg String nonTerminal;
-        public Element build(MetaGrammar.Context cx) {
-            return cx.get(nonTerminal);
-        }
+        public Element build(MetaGrammar.Context cx) { return cx.get(nonTerminal); }
     }
 
-    public static class StringLiteral        extends Constant {
-        public @bind.as("literal") StringLiteral(String string) { super(CharRange.string(string)); }
+    public static class Literal extends Constant {
+        public @bind Literal(@bind.arg String string) { super(CharRange.string(string)); }
         public boolean drop() { return true; }
     }
 
@@ -271,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"; }