projects
/
sbp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
ead5dd8
)
Merge branch 'master' of /afs/megacz.com/web/research.cs.berkeley.edu/project/sbp...
author
Adam Megacz
<megacz@cs.berkeley.edu>
Sun, 2 May 2010 01:24:14 +0000
(18:24 -0700)
committer
Adam Megacz
<megacz@cs.berkeley.edu>
Sun, 2 May 2010 01:24:14 +0000
(18:24 -0700)
src/edu/berkeley/sbp/meta/GrammarAST.java
patch
|
blob
|
history
src/edu/berkeley/sbp/misc/TestAstGenerator.java
patch
|
blob
|
history
tests/demo.g
patch
|
blob
|
history
tests/math.g
patch
|
blob
|
history
diff --git
a/src/edu/berkeley/sbp/meta/GrammarAST.java
b/src/edu/berkeley/sbp/meta/GrammarAST.java
index
412f7e1
..
0b4ba07
100644
(file)
--- a/
src/edu/berkeley/sbp/meta/GrammarAST.java
+++ b/
src/edu/berkeley/sbp/meta/GrammarAST.java
@@
-39,6
+39,7
@@
public class GrammarAST {
return new GrammarAST(resolver, "").buildGrammar(grammarAST, startingNonterminal);
}
+ /** This does not work yet */
public static void emitCode(PrintWriter pw, Tree grammarAST, String startingNonterminal, ImportResolver resolver) {
GrammarAST ga = new GrammarAST(resolver, "");
Object o = ga.walk(grammarAST);
diff --git
a/src/edu/berkeley/sbp/misc/TestAstGenerator.java
b/src/edu/berkeley/sbp/misc/TestAstGenerator.java
index
4ccbdc7
..
a6152ea
100644
(file)
--- a/
src/edu/berkeley/sbp/misc/TestAstGenerator.java
+++ b/
src/edu/berkeley/sbp/misc/TestAstGenerator.java
@@
-10,6
+10,7
@@
import edu.berkeley.sbp.util.*;
import java.util.*;
import java.io.*;
+/** This does not work yet */
public class TestAstGenerator {
public static GrammarAST.ImportResolver resolver = new GrammarAST.ImportResolver() {
diff --git
a/tests/demo.g
b/tests/demo.g
index
9a2ef37
..
a85b0ba
100644
(file)
--- a/
tests/demo.g
+++ b/
tests/demo.g
@@
-1,3
+1,4
@@
+s = Expr [\n ]!*
Expr = Expr ^"+" Expr /ws
| Expr ^"-" Expr /ws
@@
-7,9
+8,9
@@
Expr = Expr ^"+" Expr /ws
| ^"(" Expr ")" /ws
- | numeric:[0-9]++
+ | numeric::[0-9]++
-ws = [ \r\n]**
+ws = [ \r\n]!**
diff --git
a/tests/math.g
b/tests/math.g
index
4573929
..
487ee0d
100644
(file)
--- a/
tests/math.g
+++ b/
tests/math.g
@@
-1,3
+1,4
@@
+s = Expr [\n ]!*
Expr = Plus:: Expr "+" Expr
| Minus:: Expr "-" Expr