projects
/
sbp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
reorganize GrammarAST hierarchy to make clear the distinction between ElementNodes...
[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
c164262
..
8f3ea2e
100644
(file)
--- a/
src/edu/berkeley/sbp/Union.java
+++ b/
src/edu/berkeley/sbp/Union.java
@@
-1,4
+1,4
@@
-// Copyright 2006 all rights reserved; see LICENSE file for BSD-style license
+// Copyright 2006-2007 all rights reserved; see LICENSE file for BSD-style license
package edu.berkeley.sbp;
import edu.berkeley.sbp.util.*;
package edu.berkeley.sbp;
import edu.berkeley.sbp.util.*;
@@
-74,12
+74,12
@@
public class Union extends Element implements Iterable<Sequence> {
}
/** the Forest which results from matching this Union against the empty string at region <tt>region</tt> */
}
/** the Forest which results from matching this Union against the empty string at region <tt>region</tt> */
- Forest epsilonForm(Input.Region region, Cache cache) {
+ Forest epsilonForm(Input.Region region) {
viewed = true;
Forest.Many epsilonForm = new Forest.Many();
for(Sequence s : this)
viewed = true;
Forest.Many epsilonForm = new Forest.Many();
for(Sequence s : this)
- if (cache.possiblyEpsilon(s))
- epsilonForm.merge(s.epsilonForm(region, cache));
+ if (Element.possiblyEpsilon(s))
+ epsilonForm.merge(s.epsilonForm(region));
return epsilonForm;
}
return epsilonForm;
}