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
/
Union.java
diff --git
a/src/edu/berkeley/sbp/Union.java
b/src/edu/berkeley/sbp/Union.java
index
70a3e45
..
dce9cbe
100644
(file)
--- a/
src/edu/berkeley/sbp/Union.java
+++ b/
src/edu/berkeley/sbp/Union.java
@@
-25,13
+25,8
@@
public class Union extends Element implements Iterable<Sequence> {
this.synthetic = synthetic;
}
this.synthetic = synthetic;
}
- /** display form for the Union (ie not including the RHS) */
final String shortForm;
final String shortForm;
-
- /** this is just a hint to use when printing out the grammar in visual form */
final boolean synthetic;
final boolean synthetic;
-
- /** the actual alternatives */
private final List<Sequence> alternatives = new ArrayList<Sequence>();
public Iterator<Sequence> iterator() { return alternatives.iterator(); }
private final List<Sequence> alternatives = new ArrayList<Sequence>();
public Iterator<Sequence> iterator() { return alternatives.iterator(); }
@@
-74,6
+69,7
@@
public class Union extends Element implements Iterable<Sequence> {
if (alternatives.size()==0) {
sb.append(StringUtil.pad(15, shortForm) + " = ");
} else for(Sequence s : this) {
if (alternatives.size()==0) {
sb.append(StringUtil.pad(15, shortForm) + " = ");
} else for(Sequence s : this) {
+ // FIXME: what to do here about printing out negated sequences?
sb.append(StringUtil.pad(15, first ? shortForm : "") + (first ? " = " : " | "));
first = false;
sb.append(s.toString());
sb.append(StringUtil.pad(15, first ? shortForm : "") + (first ? " = " : " | "));
first = false;
sb.append(s.toString());