General cleanup

Removes the old grammar stuff.

1 files changed, 4 insertions, 3 deletions

diff --git a/RGens/src/main/java/bjc/rgens/newparser/RGrammarSet.java b/RGens/src/main/java/bjc/rgens/newparser/RGrammarSet.java
index 1cc8f92..d86b18c 100644
--- a/RGens/src/main/java/bjc/rgens/newparser/RGrammarSet.java
+++ b/RGens/src/main/java/bjc/rgens/newparser/RGrammarSet.java
@@ -219,8 +219,6 @@ public class RGrammarSet {
 	public static RGrammarSet fromConfigFile(Path cfgFile) throws IOException {
 		RGrammarSet set = new RGrammarSet();
 
-		RGrammarParser parser = new RGrammarParser();
-
 		Path cfgParent = cfgFile.getParent();
 
 		try(Scanner scn = new Scanner(cfgFile)) {
@@ -270,7 +268,10 @@ public class RGrammarSet {
 					 * Load grammar files.
 					 */
 					try {
-						RGrammar gram = parser.readGrammar(new FileInputStream(fle));
+						FileInputStream fis = new FileInputStream(fle);
+						RGrammar gram = RGrammarParser.readGrammar(fis);
+						fis.close();
+						
 						set.addGrammar(name, gram);
 
 						set.loadedFrom.put(name, path.toString());