projects
/
sbp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
743c3e9
)
checkpoint
author
adam
<adam@megacz.com>
Wed, 14 Dec 2005 07:00:56 +0000
(
02:00
-0500)
committer
adam
<adam@megacz.com>
Wed, 14 Dec 2005 07:00:56 +0000
(
02:00
-0500)
darcs-hash:
20051214070056
-5007d-
a2d222565e858db638092464007529d628016a41
.gz
src/edu/berkeley/sbp/misc/MetaGrammar.java
patch
|
blob
|
history
diff --git
a/src/edu/berkeley/sbp/misc/MetaGrammar.java
b/src/edu/berkeley/sbp/misc/MetaGrammar.java
index
5ea2de3
..
d160680
100644
(file)
--- a/
src/edu/berkeley/sbp/misc/MetaGrammar.java
+++ b/
src/edu/berkeley/sbp/misc/MetaGrammar.java
@@
-27,7
+27,8
@@
public class MetaGrammar extends ReflectiveWalker {
// MetaGrammar //////////////////////////////////////////////////////////////////////////////
// MetaGrammar //////////////////////////////////////////////////////////////////////////////
- public Object _star_(Element r) { return rep(r, null, false, true); }
+ public PreSequence _equals__greater_(Object[] o, String s) { return new PreSequence(o, s); }
+ public Object _star_(Element r) { return Repeat.many0(r); }
public Element epsilon(Object o, Object b) { return epsilon; }
public Element _rightparen_(Object e) { return SELF; }
public Element epsilon(Object o, Object b) { return epsilon; }
public Element _rightparen_(Object e) { return SELF; }
@@
-67,7
+68,7
@@
public class MetaGrammar extends ReflectiveWalker {
public Object _backslash__leftbrace_(String s) { return SELF; }
public Object _leftbrace_(String s) { return SELF; }
public Object _backslash__leftbrace_(String s) { return SELF; }
public Object _leftbrace_(String s) { return SELF; }
- public Object _plus_(final Element r) { return rep(r, null, false, false); }
+ public Object _plus_(final Element r) { return Repeat.many1(r); }
public Object[] _slash_(Object[] o, Object sep) {
if (o.length <= 1) return o;
Object[] ret = new Object[o.length * 2 - 1];
public Object[] _slash_(Object[] o, Object sep) {
if (o.length <= 1) return o;
Object[] ret = new Object[o.length * 2 - 1];
@@
-78,10
+79,7
@@
public class MetaGrammar extends ReflectiveWalker {
}
return ret;
}
}
return ret;
}
- public Element rep(Element e, Element sep, boolean maximal, boolean zero) {
- Element ret = zero ? Repeat.many0(e, sep) : Repeat.many1(e, sep);
- return maximal ? Repeat.maximal(ret) : ret;
- }
+
public Object _plus__slash_(final Element r, Element s) { return Repeat.many1(r, s); }
public Object _star__slash_(final Element r, Element s) { return Repeat.many0(r, s); }
public Object _star__star_(final Element r) { return Repeat.maximal(Repeat.many0(r)); }
public Object _plus__slash_(final Element r, Element s) { return Repeat.many1(r, s); }
public Object _star__slash_(final Element r, Element s) { return Repeat.many0(r, s); }
public Object _star__star_(final Element r) { return Repeat.maximal(Repeat.many0(r)); }
@@
-129,12
+127,9
@@
public class MetaGrammar extends ReflectiveWalker {
return ret;
}
return ret;
}
- public String stringify(String s) { return StringUtil.unescapify(s); }
- public char unescape(char x, char c) { return unescape(c); }
- public char unescape(char c) { return StringUtil.unescapify("\\"+c).charAt(0); }
public PreSequence sequence(Object[] o) { return new PreSequence(o, null); }
public PreSequence sequence(Object[] o) { return new PreSequence(o, null); }
- public PreSequence _equals__greater_(Object[] o, String s) { return new PreSequence(o, s); }
+
public PreSequence wrap(Object[] o) { return new PreSequence(o, ""); }
public PreSequence mwrap(Object[] o) { return new PreSequence(o, ""); }
public PreSequence rewrite(Object[] o) { return new PreSequence(o, null); }
public PreSequence wrap(Object[] o) { return new PreSequence(o, ""); }
public PreSequence mwrap(Object[] o) { return new PreSequence(o, ""); }
public PreSequence rewrite(Object[] o) { return new PreSequence(o, null); }