From 06067e75b905c511309c6d68cc5b334416b78c86 Mon Sep 17 00:00:00 2001 From: Ben Culkin Date: Thu, 18 Jan 2018 20:41:35 -0500 Subject: Resolve conflict --- RGens/src/main/java/bjc/rgens/newparser/RGrammarSet.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'RGens/src/main/java/bjc/rgens/newparser') diff --git a/RGens/src/main/java/bjc/rgens/newparser/RGrammarSet.java b/RGens/src/main/java/bjc/rgens/newparser/RGrammarSet.java index 5087ab4..10b78f2 100644 --- a/RGens/src/main/java/bjc/rgens/newparser/RGrammarSet.java +++ b/RGens/src/main/java/bjc/rgens/newparser/RGrammarSet.java @@ -256,10 +256,10 @@ public class RGrammarSet { */ Path convPath = cfgParent.resolve(path.toString()); - if(Files.isDirectory(convPath)) { - /* @TODO implement subset grammars */ - throw new GrammarException("Sub-grammar sets aren't implemented yet"); - } else if (convPath.getFileName().endsWith(".gram")) { + //if(Files.isDirectory(convPath)) { + // /* @TODO implement subset grammars */ + // throw new GrammarException("Sub-grammar sets aren't implemented yet"); + //} else if (convPath.getFileName().endsWith(".gram")) { /* Load grammar file. */ try { BufferedReader fis = Files.newBufferedReader(convPath); @@ -278,10 +278,10 @@ public class RGrammarSet { String msg = String.format("Error loading file '%s'", path); throw new GrammarException(msg, gex); } - } else { - String msg = String.format("Unrecognized file type '%s'"); - throw new GrammarException(msg); - } + //} else { + // String msg = String.format("Unrecognized file type '%s'", convPath.getFileName()); + // throw new GrammarException(msg); + //} } } -- cgit v1.2.3