checkpoint

[sbp.git] / src / edu / berkeley / sbp / misc / MetaGrammar.java

diff --git a/src/edu/berkeley/sbp/misc/MetaGrammar.java b/src/edu/berkeley/sbp/misc/MetaGrammar.java
index 03f8f97..7f4120f 100644 (file)
--- a/src/edu/berkeley/sbp/misc/MetaGrammar.java
+++ b/src/edu/berkeley/sbp/misc/MetaGrammar.java
@@ -40,9 +40,9 @@ public class MetaGrammar extends StringWalker {
     private boolean strings;
 
     private Element  set(Range.Set r) { if (strings) throw new Error(); return CharRange.set(r); }
-    private Element  string(String s) { return strings ? StringToken.string(s) : CharRange.string(s); }
-    private Atom     leftBrace()      { return strings ? StringToken.leftBrace : CharRange.leftBrace; }
-    private Atom     rightBrace()     { return strings ? StringToken.rightBrace : CharRange.rightBrace; }
+    private Element  string(String s) { return strings ? StringInput.string(s) : CharRange.string(s); }
+    private Atom     leftBrace()      { return strings ? StringInput.leftBrace : CharRange.leftBrace; }
+    private Atom     rightBrace()     { return strings ? StringInput.rightBrace : CharRange.rightBrace; }
 
     public MetaGrammar() { this("s", false); }
     public MetaGrammar(String s) { this(s, false); }