checkpoint

darcs-hash:20060713221349-5007d-38690618f6d10858ff446e920523aad88057d21d.gz

diff --git a/src/edu/berkeley/sbp/meta/MetaGrammarBindings.java b/src/edu/berkeley/sbp/meta/MetaGrammarBindings.java
index c7952b0..8b4ee2e 100644 (file)
--- a/src/edu/berkeley/sbp/meta/MetaGrammarBindings.java
+++ b/src/edu/berkeley/sbp/meta/MetaGrammarBindings.java
@@ -92,7 +92,7 @@ public class MetaGrammarBindings {
         
         System.err.println("#import " + fileName + " as " + as);
         try {
-            Tree t = new CharParser(MetaGrammar.make()).parse(new FileInputStream(fileName)).expand1();
+            Tree t = new CharParser(MetaGrammar.make()).parse(new FileInputStream("tests/"+fileName)).expand1();
             Tree.TreeFunctor<Object,Object> red = (Tree.TreeFunctor<Object,Object>)t.head();
             String oldprefix = prefix;
             prefix = as;

diff --git a/tests/testcase.g b/tests/testcase.g
index 01ce08b..2491600 100644 (file)
--- a/tests/testcase.g
+++ b/tests/testcase.g
@@ -1,9 +1,9 @@
-#import tests/meta.g as grammar
+#import meta.g as grammar
 
-xws         = grammar.ws
-ts         = ts:: xws! tests xws!
-tests      =      test */ xws
-test       =   tca::   "testcase" "{" input (o::(output +/ xws))   (grammaro::grammar.Grammar) "}" /xws
-           |   tcb::   "testcase" "{" input                       (grammaro::grammar.Grammar) "}" /xws
-output     =           "output" grammar.Quoted ";" /xws
-input      =           "input"  grammar.Quoted ";" /xws
+ws         = grammar.ws
+ts         = ts:: ws! tests ws!
+tests      =      test */ ws
+test       =   tca::   "testcase" "{" input (o::(output +/ ws))   (grammaro::grammar.Grammar) "}" /ws
+           |   tcb::   "testcase" "{" input                       (grammaro::grammar.Grammar) "}" /ws
+output     =           "output" grammar.Quoted ";" /ws
+input      =           "input"  grammar.Quoted ";" /ws