projects
/
sbp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
835d79e
..
196394a
100644
(file)
--- a/
src/edu/berkeley/sbp/meta/MetaGrammarBindings.java
+++ b/
src/edu/berkeley/sbp/meta/MetaGrammarBindings.java
@@
-75,7
+75,7
@@
public class MetaGrammarBindings extends AnnotationGrammarBindings {
HashSet<Sequence> bad2 = new HashSet<Sequence>();
for(int i=0; i<sequences.length; i++) {
Seq[] group = sequences[i];
HashSet<Sequence> bad2 = new HashSet<Sequence>();
for(int i=0; i<sequences.length; i++) {
Seq[] group = sequences[i];
- Union u2 = new Union();
+ Union u2 = new Union(null, false);
if (sequences.length==1) u2 = u;
for(int j=0; j<group.length; j++) {
group[j].build(cx, u2, false, cnt);
if (sequences.length==1) u2 = u;
for(int j=0; j<group.length; j++) {
group[j].build(cx, u2, false, cnt);
@@
-130,7
+130,7
@@
public class MetaGrammarBindings extends AnnotationGrammarBindings {
if (!rep) { super.build(cx, u, this); return; }
HashSet<Sequence> bad2 = new HashSet<Sequence>();
if (!rep) { super.build(cx, u, this); return; }
HashSet<Sequence> bad2 = new HashSet<Sequence>();
- Union urep = new Union();
+ Union urep = new Union(null, false);
urep.add(Sequence.empty);
if (sep != null)
urep.add(Sequence.singleton(new Element[] { cx.get(sep), u }, 1));
urep.add(Sequence.empty);
if (sep != null)
urep.add(Sequence.singleton(new Element[] { cx.get(sep), u }, 1));
@@
-139,10
+139,10
@@
public class MetaGrammarBindings extends AnnotationGrammarBindings {
for(int i=0; i<sequences.length; i++) {
Seq[] group = sequences[i];
for(int i=0; i<sequences.length; i++) {
Seq[] group = sequences[i];
- Union u2 = new Union();
+ Union u2 = new Union(null, false);
if (sequences.length==1) u2 = u;
for(int j=0; j<group.length; j++) {
if (sequences.length==1) u2 = u;
for(int j=0; j<group.length; j++) {
- Union u3 = new Union();
+ Union u3 = new Union(null, false);
group[j].build(cx, u3, false, this);
Sequence s = Sequence.unwrap(new Element[] { u3, urep },
cx.rm.repeatTag(),
group[j].build(cx, u3, false, this);
Sequence s = Sequence.unwrap(new Element[] { u3, urep },
cx.rm.repeatTag(),
@@
-171,7
+171,7
@@
public class MetaGrammarBindings extends AnnotationGrammarBindings {
this.sequences = sequences;
}
public Element build(Context cx, NonTerminalNode cnt) {
this.sequences = sequences;
}
public Element build(Context cx, NonTerminalNode cnt) {
- Union ret = new Union();
+ Union ret = new Union(null, false);
build(cx, ret, cnt);
return ret;
}
build(cx, ret, cnt);
return ret;
}
@@
-336,9
+336,9
@@
public class MetaGrammarBindings extends AnnotationGrammarBindings {
public static @bind.as("{") class XTree extends ElementNode {
public @bind.arg Seq body;
public Element build(Context cx, NonTerminalNode cnt) {
public static @bind.as("{") class XTree extends ElementNode {
public @bind.arg Seq body;
public Element build(Context cx, NonTerminalNode cnt) {
- Union u = new Union();
+ Union u = new Union(null, false);
Sequence s = body.build(cx, u, false, null);
Sequence s = body.build(cx, u, false, null);
- Union u2 = new Union();
+ Union u2 = new Union(null, false);
u2.add(Sequence.singleton(new Element[] {
CharAtom.leftBrace,
cx.get("ws"),
u2.add(Sequence.singleton(new Element[] {
CharAtom.leftBrace,
cx.get("ws"),