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
/
Walk.java
diff --git
a/src/edu/berkeley/sbp/Walk.java
b/src/edu/berkeley/sbp/Walk.java
index
380d09b
..
c6bb514
100644
(file)
--- a/
src/edu/berkeley/sbp/Walk.java
+++ b/
src/edu/berkeley/sbp/Walk.java
@@
-37,7
+37,13
@@
abstract class Walk<T> {
else if (e instanceof Sequence) return sequence((Sequence)e);
else if (e instanceof Union) {
T ret = bottom(e);
else if (e instanceof Sequence) return sequence((Sequence)e);
else if (e instanceof Union) {
T ret = bottom(e);
- for(Sequence s : (Union)e) ret = union((Union)e, ret, walk(s));
+ for(Sequence s : (Union)e) {
+ ret = union((Union)e, ret, walk(s));
+
+ // FIXME
+ for(Sequence ss : s.needs()) ret = union((Union)e, ret, walk(ss));
+ for(Sequence ss : s.hates()) ret = union((Union)e, ret, walk(ss));
+ }
return ret;
} else {
throw new Error("unknown element of class " + e.getClass().getName() + ": " + e);
return ret;
} else {
throw new Error("unknown element of class " + e.getClass().getName() + ": " + e);
@@
-75,28
+81,28
@@
abstract class Walk<T> {
}
}
- // Token-Set //////////////////////////////////////////////////////////////////////////////
+ // Input-Set //////////////////////////////////////////////////////////////////////////////
- static abstract class WalkTokenSet<Tok extends Token> extends Walk<Topology<Tok>> {
+ static abstract class WalkTokenSet<Tok extends Input> extends Walk<Topology<Tok>> {
public Topology<Tok> cs;
public WalkTokenSet(Topology<Tok> cs) { this.cs = cs; }
public WalkTokenSet(Topology<Tok> cs, Cache c) { super(c); this.cs = cs; }
public Topology<Tok> bottom(Element e) { return cs; }
public Topology<Tok> cs;
public WalkTokenSet(Topology<Tok> cs) { this.cs = cs; }
public WalkTokenSet(Topology<Tok> cs, Cache c) { super(c); this.cs = cs; }
public Topology<Tok> bottom(Element e) { return cs; }
- public Topology<Tok> walkAtom(Atom r) { cs = cs.union(r); return cs; }
+ public Topology<Tok> walkAtom(Atom r) { cs = cs.union(r.getTokenTopology()); return cs; }
}
}
- static class First<Tok extends Token> extends WalkTokenSet<Tok> {
+ static class First<Tok extends Input> extends WalkTokenSet<Tok> {
public First(Topology<Tok> cs, Walk.Cache cache) { super(cs, cache); }
public Topology<Tok> sequence(Sequence seq) {
for(Position p = seq.firstp(); p!=null && !p.isLast(); p = p.next()) {
walk(p.element());
public First(Topology<Tok> cs, Walk.Cache cache) { super(cs, cache); }
public Topology<Tok> sequence(Sequence seq) {
for(Position p = seq.firstp(); p!=null && !p.isLast(); p = p.next()) {
walk(p.element());
- if (!p.element().possiblyEpsilon(c)) break;
+ if (!c.possiblyEpsilon(p.element())) break;
}
return cs;
}
}
}
return cs;
}
}
- static class Follow<Tok extends Token> extends WalkTokenSet<Tok> {
+ static class Follow<Tok extends Input> extends WalkTokenSet<Tok> {
private final Element me;
private final HashSet<Element> all;
private boolean eof = false;
private final Element me;
private final HashSet<Element> all;
private boolean eof = false;
@@
-130,7
+136,7
@@
abstract class Walk<T> {
Position mp = null;
for(Position pos = a.firstp(); pos != null && !pos.isLast(); pos = pos.next()) {
if (matched) cs = cs.union(c.first(pos.element(), cs.empty()));
Position mp = null;
for(Position pos = a.firstp(); pos != null && !pos.isLast(); pos = pos.next()) {
if (matched) cs = cs.union(c.first(pos.element(), cs.empty()));
- if (pos.isLast()) { matched = (matched && pos.element().possiblyEpsilon(c)); continue; }
+ if (pos.isLast()) { matched = (matched && c.possiblyEpsilon(pos.element())); continue; }
boolean good = false;
if (e instanceof Atom) {
Topology top = c.atoms.get(pos.element());
boolean good = false;
if (e instanceof Atom) {
Topology top = c.atoms.get(pos.element());
@@
-149,7
+155,7
@@
abstract class Walk<T> {
if (e instanceof Sequence) {
Sequence s = (Sequence)e;
if (e instanceof Sequence) {
Sequence s = (Sequence)e;
- if (s.noFollow() != null) cs = cs.minus(s.noFollow());
+ if (s.follow() != null) cs = cs.intersect(s.follow().getTokenTopology());
}
if (c != null && e==me) {
}
if (c != null && e==me) {
@@
-172,8
+178,16
@@
abstract class Walk<T> {
public HashMap<Element,Topology> follow = new HashMap<Element,Topology>();
public HashMapBag<Element,Element> ys = new HashMapBag<Element,Element>();
public HashMap<Element,Topology> atoms = new HashMap<Element,Topology>();
public HashMap<Element,Topology> follow = new HashMap<Element,Topology>();
public HashMapBag<Element,Element> ys = new HashMapBag<Element,Element>();
public HashMap<Element,Topology> atoms = new HashMap<Element,Topology>();
- public <Tok extends Token> Topology<Tok> first(Element e, Topology<Tok> empty) {
+ public <Tok extends Input> Topology<Tok> first(Element e, Topology<Tok> empty) {
return new Walk.First<Tok>(empty, this).walk(e);
}
return new Walk.First<Tok>(empty, this).walk(e);
}
+ final boolean possiblyEpsilon(Element e) {
+ Walk.Cache cache = this;
+ Boolean ret = possiblyEpsilon.get(e);
+ if (ret != null) return ret.booleanValue();
+ ret = new Walk.PossiblyEpsilon().walk(e) ? Boolean.TRUE : Boolean.FALSE;
+ possiblyEpsilon.put(e, ret);
+ return ret;
+ }
}
}
}
}