X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FSequence.java;h=091f7aec4df3914439679c8938954b805f085597;hb=fdfbcb35985749c03225bdef24ad5e4add42661b;hp=c3c259f1cf9e6c7cce86ee98ab812ec56147dbc5;hpb=5ea3b9182192a0fbb7a0bd86b919384ddaeff29a;p=sbp.git diff --git a/src/edu/berkeley/sbp/Sequence.java b/src/edu/berkeley/sbp/Sequence.java index c3c259f..091f7ae 100644 --- a/src/edu/berkeley/sbp/Sequence.java +++ b/src/edu/berkeley/sbp/Sequence.java @@ -80,10 +80,10 @@ public abstract class Sequence extends Element implements Iterable { } // DO NOT MESS WITH THE FOLLOWING LINE!!! - private Forest.Ref epsilonForm = null; + private Forest.Many epsilonForm = null; Forest epsilonForm() { if (epsilonForm!=null) return epsilonForm; - epsilonForm = new Forest.Ref(); + epsilonForm = new Forest.Many(); epsilonForm.merge(firstp().rewrite(null, false)); return epsilonForm; } @@ -184,7 +184,7 @@ public abstract class Sequence extends Element implements Iterable { public Constant(Element[] e, Object result) { super(e); this.result = result; } Sequence _clone() { return new Constant(elements, result); } public Forest postReduce(Input.Region loc, Forest[] args, Position p) { - return (Forest)Forest.leaf(loc, result); + return (Forest)Forest.create(loc, result, null, false); } static class Drop extends Constant { Sequence _clone() { return new Drop(elements, lame); }