X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FUnion.java;fp=src%2Fedu%2Fberkeley%2Fsbp%2FUnion.java;h=f1f65b1d3ad5f5f87fb4a02cd0e436f6332caeb9;hp=d52c6e96209c53ebffa76640995dc33e126635b0;hb=8a5250c184672495fae152e096b2e800749cd0db;hpb=2cca97362e80d5a3cd3e02d791a10cd7c6f6b29c diff --git a/src/edu/berkeley/sbp/Union.java b/src/edu/berkeley/sbp/Union.java index d52c6e9..f1f65b1 100644 --- a/src/edu/berkeley/sbp/Union.java +++ b/src/edu/berkeley/sbp/Union.java @@ -70,14 +70,14 @@ public class Union extends Element implements Iterable { // Epsilon Form ////////////////////////////////////////////////////////////////////////////// // FIXME - private Forest.Many epsilonForm = null; - Forest epsilonForm() { - if (epsilonForm != null) return epsilonForm; - epsilonForm = new Forest.Many(); + //private Forest.Many epsilonForm = null; + Forest epsilonForm(Input.Region loc) { + //if (epsilonForm != null) return epsilonForm; + Forest.Many epsilonForm = new Forest.Many(); for(Sequence s : this) { // FIXME FIXME FIXME if (new Walk.Cache().possiblyEpsilon(s)) - epsilonForm.merge(s.epsilonForm()); + epsilonForm.merge(s.epsilonForm(loc)); } return epsilonForm; }