fix NPE due to misplaced grammar file

[fleet.git] / src / edu / berkeley / fleet / assembler / Parser.java

diff --git a/src/edu/berkeley/fleet/assembler/Parser.java b/src/edu/berkeley/fleet/assembler/Parser.java
index 7c9318e..2b2dc45 100644 (file)
--- a/src/edu/berkeley/fleet/assembler/Parser.java
+++ b/src/edu/berkeley/fleet/assembler/Parser.java
@@ -33,10 +33,10 @@ class Parser {
 
     Tree<String> parse(Reader r) throws Exception {
         InputStream grammarStream =
-            Parser.class.getClassLoader().getResourceAsStream("edu/berkeley/fleet/parser/fleet.g");
+            Parser.class.getClassLoader().getResourceAsStream("edu/berkeley/fleet/assembler/fleet.g");
         CharParser metaGrammarParser   = new CharParser(MetaGrammar.newInstance());
-        Tree<String> parsedGrammar = metaGrammarParser.parse(new CharInput(grammarStream)).expand1();
-        Union   grammar            = Grammar.create(parsedGrammar, "s", new Grammar.Bindings() { });
+        Tree<String> parsedGrammar     = metaGrammarParser.parse(new CharInput(grammarStream)).expand1();
+        Union   grammar                = Grammar.create(parsedGrammar, "s", new Grammar.Bindings() { });
         CharParser  parser             = new CharParser(grammar);
         Tree tree = parser.parse(new CharInput(r)).expand1();
         return tree;