checkpoint

darcs-hash:20051214023103-5007d-3f876e644e0c0d9404a47d9f28a9674c3b940ea6.gz

diff --git a/src/edu/berkeley/sbp/misc/MetaGrammar.java b/src/edu/berkeley/sbp/misc/MetaGrammar.java
index ff4a9fb..f532009 100644 (file)
--- a/src/edu/berkeley/sbp/misc/MetaGrammar.java
+++ b/src/edu/berkeley/sbp/misc/MetaGrammar.java
@@ -201,7 +201,7 @@ public class MetaGrammar extends ReflectiveWalker {
                 HashSet<Sequence> temp = new HashSet<Sequence>();
                 for(PreSequence pre : s[i]) {
                     pre.hatess.addAll(seqs);
                 HashSet<Sequence> temp = new HashSet<Sequence>();
                 for(PreSequence pre : s[i]) {
                     pre.hatess.addAll(seqs);

-                    Sequence seq = pre.buildSequence(Character.isUpperCase(str.charAt(0)) ? dws : null, n, false, dropAll);
+                    Sequence seq = pre.buildSequence(null, n, false, dropAll);

                     temp.add(seq);
                     //for(Sequence dom : seqs) seq.hates.add(dom);
                     n.add(seq);
                     temp.add(seq);
                     //for(Sequence dom : seqs) seq.hates.add(dom);
                     n.add(seq);

diff --git a/tests/meta.g b/tests/meta.g
index 9193c51..17bff83 100644 (file)
--- a/tests/meta.g
+++ b/tests/meta.g
@@ -9,7 +9,6 @@ equiAlt       ::=  conjuncts $$ (ws "|" ws)          => "alternatives"
 
 sequence    ::= es
               > es ws ^"/" e
 
 sequence    ::= es
               > es ws ^"/" e

-Es          ::= e %% (w**)

 es          ::= e %% (w**)
 
 ss ::= es | es ^"/" e /ws
 es          ::= e %% (w**)
 
 ss ::= es | es ^"/" e /ws