projects
/
sbp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
b910ad5
)
fix error caused when building error message
author
adam
<adam@megacz.com>
Mon, 26 Mar 2007 07:13:54 +0000
(
03:13
-0400)
committer
adam
<adam@megacz.com>
Mon, 26 Mar 2007 07:13:54 +0000
(
03:13
-0400)
darcs-hash:
20070326071354
-5007d-
20ff1a22552daf5cc0902845436ccf6cd56247ef
.gz
src/edu/berkeley/sbp/meta/GrammarBuilder.java
patch
|
blob
|
history
diff --git
a/src/edu/berkeley/sbp/meta/GrammarBuilder.java
b/src/edu/berkeley/sbp/meta/GrammarBuilder.java
index
5e1d3d9
..
2b1d765
100644
(file)
--- a/
src/edu/berkeley/sbp/meta/GrammarBuilder.java
+++ b/
src/edu/berkeley/sbp/meta/GrammarBuilder.java
@@
-327,8
+327,6
@@
public class GrammarBuilder {
if (!drops[i])
if (idx==-1) idx = i;
else multiNonDrop = true;
if (!drops[i])
if (idx==-1) idx = i;
else multiNonDrop = true;
- if (tag==null && multiNonDrop)
- throw new Error("multiple non-dropped elements in sequence: " + Sequence.create(els, ""));
for(int i=0; i<elements.length; i++) {
if (!multiNonDrop && i==idx && tag!=null && elements[i] instanceof RepeatNode) {
els[i] = ((RepeatNode)elements[i]).build(cx, cnt, dropall, tag);
for(int i=0; i<elements.length; i++) {
if (!multiNonDrop && i==idx && tag!=null && elements[i] instanceof RepeatNode) {
els[i] = ((RepeatNode)elements[i]).build(cx, cnt, dropall, tag);
@@
-336,6
+334,8
@@
public class GrammarBuilder {
} else
els[i] = elements[i].build(cx, cnt, dropall);
}
} else
els[i] = elements[i].build(cx, cnt, dropall);
}
+ if (tag==null && multiNonDrop)
+ throw new RuntimeException("multiple non-dropped elements in sequence: " + Sequence.create(els, ""));
if (!multiNonDrop) {
if (idx == -1)
ret = tag==null
if (!multiNonDrop) {
if (idx == -1)
ret = tag==null