From: adam <adam@megacz.com>
Date: Thu, 15 Dec 2005 01:07:03 +0000 (-0500)
Subject: checkpoint
X-Git-Tag: tag_for_25-Mar~529
X-Git-Url: http://git.megacz.com/?p=sbp.git;a=commitdiff_plain;h=80602d89ede55b9ca1669b6222a1bf80fc0c41d2;ds=sidebyside

checkpoint

darcs-hash:20051215010703-5007d-400c7649248d07b8e6644cdd8488a945f6bc338d.gz
---

diff --git a/src/edu/berkeley/sbp/misc/MetaGrammar.java b/src/edu/berkeley/sbp/misc/MetaGrammar.java
index 6eab9ed..889e2bc 100644
--- a/src/edu/berkeley/sbp/misc/MetaGrammar.java
+++ b/src/edu/berkeley/sbp/misc/MetaGrammar.java
@@ -33,11 +33,10 @@ public class MetaGrammar extends ReflectiveWalker {
     private String startSymbol;
     private boolean strings;
 
-    private Element  set(Range.Set r) { return CharToken.set(r); }
-    private Element  string(String s) { return CharToken.string(s); }
-    private Topology top()            { return CharToken.top(); }
-    private Atom     leftBrace()      { return CharToken.leftBrace; }
-    private Atom     rightBrace()     { return CharToken.rightBrace; }
+    private Element  set(Range.Set r) { if (strings) throw new Error(); return CharToken.set(r); }
+    private Element  string(String s) { return strings ? StringToken.string(s) : CharToken.string(s); }
+    private Atom     leftBrace()      { return strings ? StringToken.leftBrace : CharToken.leftBrace; }
+    private Atom     rightBrace()     { return strings ? StringToken.rightBrace : CharToken.rightBrace; }
 
     public MetaGrammar() { this("s", false); }
     public MetaGrammar(String s) { this(s, false); }