From: Adam Megacz <megacz@cs.berkeley.edu>
Date: Sun, 2 May 2010 01:24:14 +0000 (-0700)
Subject: Merge branch 'master' of /afs/megacz.com/web/research.cs.berkeley.edu/project/sbp... 
X-Git-Url: http://git.megacz.com/?p=sbp.git;a=commitdiff_plain;h=dce3af8d6974a6c5b05955703de2e983f112b765;hp=ead5dd828b3a45a9de17d4a0c7a41b3c42c4b3c3

Merge branch 'master' of /afs/megacz.com/web/research.cs.berkeley.edu/project/sbp/edu.berkeley.sbp
---

diff --git a/src/edu/berkeley/sbp/meta/GrammarAST.java b/src/edu/berkeley/sbp/meta/GrammarAST.java
index 412f7e1..0b4ba07 100644
--- 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
--- 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
--- 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
--- a/tests/math.g
+++ b/tests/math.g
@@ -1,3 +1,4 @@
+s = Expr [\n ]!*
 
 Expr = Plus::  Expr "+" Expr
      | Minus:: Expr "-" Expr