From 145a9cab78330e3daad06a72e914895d32a1d621 Mon Sep 17 00:00:00 2001 From: adam Date: Wed, 4 Jan 2006 05:49:14 -0500 Subject: [PATCH] checkpoint darcs-hash:20060104104914-5007d-913ac463629afb684e9ce5b99e7681453c298558.gz --- src/edu/berkeley/sbp/GSS.java | 4 ++-- src/edu/berkeley/sbp/Parser.java | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/edu/berkeley/sbp/GSS.java b/src/edu/berkeley/sbp/GSS.java index a4f3d6a..0bc14ae 100644 --- a/src/edu/berkeley/sbp/GSS.java +++ b/src/edu/berkeley/sbp/GSS.java @@ -202,7 +202,7 @@ class GSS { int where = parents().size(); for(Parser.Table.Reduction r : state.getReductions(token)) if (r.numPop >= 1) - r.reduce(this, null, null); + r.reduce(this); } public void queueReductions(Node n2) { @@ -217,7 +217,7 @@ class GSS { if (reducing) for(Parser.Table.Reduction r : token==null ? state.getEofReductions() : state.getReductions(token)) if (r.numPop==0) - r.reduce(this, null, r.zero()); + r.reduce(this); } private Node(Node parent, Forest pending, Parser.Table.State state, Phase start) { diff --git a/src/edu/berkeley/sbp/Parser.java b/src/edu/berkeley/sbp/Parser.java index f087a05..817aea6 100644 --- a/src/edu/berkeley/sbp/Parser.java +++ b/src/edu/berkeley/sbp/Parser.java @@ -311,8 +311,9 @@ public abstract class Parser { } public String toString() { return "[reduce " + position + "]"; } - public Forest reduce(GSS.Phase.Node parent, GSS.Phase.Node onlychild, Forest rex) { - Forest ret = reduce(parent, numPop-1, rex, onlychild, parent.phase()); + public Forest reduce(GSS.Phase.Node parent) { + Forest rex = numPop==0 ? zero() : null; + Forest ret = reduce(parent, numPop-1, rex, null, parent.phase()); return ret; } -- 1.7.10.4