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
/
tib
/
Tib.java
diff --git
a/src/edu/berkeley/sbp/tib/Tib.java
b/src/edu/berkeley/sbp/tib/Tib.java
index
1492240
..
0237e64
100644
(file)
--- a/
src/edu/berkeley/sbp/tib/Tib.java
+++ b/
src/edu/berkeley/sbp/tib/Tib.java
@@
-45,8
+45,8
@@
public class Tib implements Input<Character> {
public Input.Location getLocation() { return new Cartesian.Location(_col, _row); }
private BufferedReader br;
public Input.Location getLocation() { return new Cartesian.Location(_col, _row); }
private BufferedReader br;
- char left = CharRange.left;
- char right = CharRange.right;
+ char left = CharAtom.left;
+ char right = CharAtom.right;
boolean waiting = false;
char waitingChar = ' ';
boolean waiting = false;
char waitingChar = ' ';
@@
-135,6
+135,7
@@
public class Tib implements Input<Character> {
// Grammar //////////////////////////////////////////////////////////////////////////////
// Grammar //////////////////////////////////////////////////////////////////////////////
+ /*
public static class Grammar extends ReflectiveGrammar {
private int anon = 0;
private final Element ws = Sequence.maximal0(getNonTerminal("w"));
public static class Grammar extends ReflectiveGrammar {
private int anon = 0;
private final Element ws = Sequence.maximal0(getNonTerminal("w"));
@@
-148,11
+149,11
@@
public class Tib implements Input<Character> {
u2.add(Sequence.singleton(new Element[] { u }, 0));
return anonymousNonTerminal(new Sequence[][] {
new Sequence[] {
u2.add(Sequence.singleton(new Element[] { u }, 0));
return anonymousNonTerminal(new Sequence[][] {
new Sequence[] {
- Sequence.singleton(new Element[] { CharRange.leftBrace,
+ Sequence.singleton(new Element[] { CharAtom.leftBrace,
ws,
u2,
ws,
ws,
u2,
ws,
- CharRange.rightBrace
+ CharAtom.rightBrace
}, 2)
}
});
}, 2)
}
});
@@
-160,6
+161,7
@@
public class Tib implements Input<Character> {
return super.walk(tree);
}
}
return super.walk(tree);
}
}
+ */
/*
public class Braces extends Union {
/*
public class Braces extends Union {