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
/
meta
/
MetaGrammarBindings.java
diff --git
a/src/edu/berkeley/sbp/meta/MetaGrammarBindings.java
b/src/edu/berkeley/sbp/meta/MetaGrammarBindings.java
index
0d9052c
..
3dd0879
100644
(file)
--- a/
src/edu/berkeley/sbp/meta/MetaGrammarBindings.java
+++ b/
src/edu/berkeley/sbp/meta/MetaGrammarBindings.java
@@
-285,7
+285,7
@@
public class MetaGrammarBindings extends AnnotationGrammarBindings {
}
public static class Literal extends Constant {
}
public static class Literal extends Constant {
- public @bind Literal(@bind.arg String string) { super(CharRange.string(string)); }
+ public @bind Literal(@bind.arg String string) { super(CharAtom.string(string)); }
public boolean drop() { return true; }
}
public boolean drop() { return true; }
}
@@
-296,7
+296,7
@@
public class MetaGrammarBindings extends AnnotationGrammarBindings {
edu.berkeley.sbp.util.Range.Set set = new edu.berkeley.sbp.util.Range.Set();
for(Range r : ranges)
set.add(r.first, r.last);
edu.berkeley.sbp.util.Range.Set set = new edu.berkeley.sbp.util.Range.Set();
for(Range r : ranges)
set.add(r.first, r.last);
- return CharRange.set(set);
+ return CharAtom.set(set);
}
}
}
}
@@
-307,11
+307,11
@@
public class MetaGrammarBindings extends AnnotationGrammarBindings {
Sequence s = body.build(cx, u, false, null);
Union u2 = new Union();
u2.add(Sequence.singleton(new Element[] {
Sequence s = body.build(cx, u, false, null);
Union u2 = new Union();
u2.add(Sequence.singleton(new Element[] {
- CharRange.leftBrace,
+ CharAtom.leftBrace,
cx.get("ws"),
u,
cx.get("ws"),
cx.get("ws"),
u,
cx.get("ws"),
- CharRange.rightBrace
+ CharAtom.rightBrace
}, 2));
return u2;
}
}, 2));
return u2;
}
@@
-355,7
+355,7
@@
public class MetaGrammarBindings extends AnnotationGrammarBindings {
public static @bind.as("^") ElementNode caret(final String s) {
final String thePrefix = prefix;
public static @bind.as("^") ElementNode caret(final String s) {
final String thePrefix = prefix;
- return new Constant(CharRange.string(s)) {
+ return new Constant(CharAtom.string(s)) {
public String getOwnerTag() { return thePrefix+s; }
public boolean drop() { return true; }
};
public String getOwnerTag() { return thePrefix+s; }
public boolean drop() { return true; }
};
@@
-364,7
+364,7
@@
public class MetaGrammarBindings extends AnnotationGrammarBindings {
public static @bind.as("~") ElementNode tilde(final ElementNode e) {
return new PostProcess(e) {
public Element postProcess(Element e) {
public static @bind.as("~") ElementNode tilde(final ElementNode e) {
return new PostProcess(e) {
public Element postProcess(Element e) {
- return infer((Topology<Character>)Atom.toAtom(e).complement().minus(CharRange.braces));
+ return infer((Topology<Character>)Atom.toAtom(e).complement().minus(CharAtom.braces));
} }; }
public static @bind.as("Word") String word(String s) { return s; }
} }; }
public static @bind.as("Word") String word(String s) { return s; }
@@
-375,7
+375,7
@@
public class MetaGrammarBindings extends AnnotationGrammarBindings {
public static @bind.as("\r") String lf() { return "\r"; }
static Atom infer(Element e) { return infer((Topology<Character>)Atom.toAtom(e)); }
public static @bind.as("\r") String lf() { return "\r"; }
static Atom infer(Element e) { return infer((Topology<Character>)Atom.toAtom(e)); }
- static Atom infer(Topology<Character> t) { return new CharRange(new CharTopology(t)); }
+ static Atom infer(Topology<Character> t) { return new CharAtom(new CharTopology(t)); }
public static class Context {
public HashMap<String,Union> map = new HashMap<String,Union>();
public static class Context {
public HashMap<String,Union> map = new HashMap<String,Union>();