projects
/
sbp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6a3a36e
)
checkpoint
author
adam
<adam@megacz.com>
Fri, 14 Jul 2006 01:08:17 +0000
(21:08 -0400)
committer
adam
<adam@megacz.com>
Fri, 14 Jul 2006 01:08:17 +0000
(21:08 -0400)
darcs-hash:
20060714010817
-5007d-
26265dd3d94b13f4ff35a13ed966e14e658391bf
.gz
src/edu/berkeley/sbp/meta/MetaGrammar.java
patch
|
blob
|
history
diff --git
a/src/edu/berkeley/sbp/meta/MetaGrammar.java
b/src/edu/berkeley/sbp/meta/MetaGrammar.java
index
32cac8a
..
5772906
100644
(file)
--- a/
src/edu/berkeley/sbp/meta/MetaGrammar.java
+++ b/
src/edu/berkeley/sbp/meta/MetaGrammar.java
@@
-106,7
+106,6
@@
public class MetaGrammar {
_bindable,
isRaw()) {
public Object invoke(Iterable<Tree<Object>> t) {
_bindable,
isRaw()) {
public Object invoke(Iterable<Tree<Object>> t) {
- if (_israw) return _bindable.impose(new Object[] { t });
ArrayList ret = new ArrayList();
ret.add(region);
for(Tree tc : t) {
ArrayList ret = new ArrayList();
ret.add(region);
for(Tree tc : t) {
@@
-140,8
+139,7
@@
public class MetaGrammar {
p.elements,
p.drops);
return Sequence.rewritingSequence(new TreeBindableReducer(buildSequence(p),
p.elements,
p.drops);
return Sequence.rewritingSequence(new TreeBindableReducer(buildSequence(p),
- _bindable,
- isRaw()),
+ _bindable),
p.elements,
p.drops);
}
p.elements,
p.drops);
}
@@
-151,26
+149,22
@@
public class MetaGrammar {
public static class TreeBindableReducer implements Tree.TreeFunctor<Object,Object>, ToJava {
int[] map;
Bindable _bindable;
public static class TreeBindableReducer implements Tree.TreeFunctor<Object,Object>, ToJava {
int[] map;
Bindable _bindable;
- boolean _israw;
public void toJava(StringBuffer sb) {
sb.append("new MetaGrammar.TreeBindableReducer(new int[] {");
for(int i=0; i<map.length; i++) sb.append((i+"")+(i<map.length-1 ? "," : ""));
sb.append("}, ");
_bindable.toJava(sb);
public void toJava(StringBuffer sb) {
sb.append("new MetaGrammar.TreeBindableReducer(new int[] {");
for(int i=0; i<map.length; i++) sb.append((i+"")+(i<map.length-1 ? "," : ""));
sb.append("}, ");
_bindable.toJava(sb);
- sb.append(", ");
- sb.append(_israw ? "true" : "false");
sb.append(")");
}
sb.append(")");
}
+ public TreeBindableReducer(int[] map, Bindable b) { this(map,b, false); }
public TreeBindableReducer(int[] map, Bindable b, boolean raw) {
this.map = map;
this._bindable = b;
public TreeBindableReducer(int[] map, Bindable b, boolean raw) {
this.map = map;
this._bindable = b;
- this._israw = raw;
}
public String toString() { return "reducer-"+_bindable.toString(); }
public Object invoke(Iterable<Tree<Object>> t) {
}
public String toString() { return "reducer-"+_bindable.toString(); }
public Object invoke(Iterable<Tree<Object>> t) {
- if (_israw) return _bindable.createBinding().invoke(new Object[] { t });
ArrayList ret = new ArrayList();
for(Tree tc : t) {
if (tc.head() != null && tc.head() instanceof Functor)
ArrayList ret = new ArrayList();
for(Tree tc : t) {
if (tc.head() != null && tc.head() instanceof Functor)