From 604701b939487c6c11aac5116941af31627fa12c Mon Sep 17 00:00:00 2001 From: adam Date: Mon, 29 Jan 2007 08:04:22 +0100 Subject: [PATCH] fix NPE due to misplaced grammar file --- Makefile | 7 +++++-- src/edu/berkeley/fleet/assembler/Parser.java | 6 +++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 3b00cab..da98e04 100644 --- a/Makefile +++ b/Makefile @@ -105,8 +105,11 @@ dist: tar cvzf fleet-`date +%d.%h.%y`.tgz fleet-`date +%d.%h.%y` rm -rf fleet-`date +%d.%h.%y` mv fleet-`date +%d.%h.%y`.tgz /afs/research.cs.berkeley.edu/class/fleet/website/files/ - echo - echo http://research.cs.berkeley.edu/class/fleet/files/fleet-`date +%d.%h.%y`.tgz + @echo + @echo + @echo http://research.cs.berkeley.edu/class/fleet/files/fleet-`date +%d.%h.%y`.tgz + @echo + @echo diff --git a/src/edu/berkeley/fleet/assembler/Parser.java b/src/edu/berkeley/fleet/assembler/Parser.java index 7c9318e..2b2dc45 100644 --- a/src/edu/berkeley/fleet/assembler/Parser.java +++ b/src/edu/berkeley/fleet/assembler/Parser.java @@ -33,10 +33,10 @@ class Parser { Tree 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 parsedGrammar = metaGrammarParser.parse(new CharInput(grammarStream)).expand1(); - Union grammar = Grammar.create(parsedGrammar, "s", new Grammar.Bindings() { }); + Tree 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; -- 1.7.10.4