diff options
| author | Ben Culkin <bjculkin@mix.wvu.edu> | 2018-01-18 20:41:35 -0500 |
|---|---|---|
| committer | Benjamin J. Culkin <bjculkin@mix.wvu.edu> | 2018-01-18 21:48:35 -0400 |
| commit | 06067e75b905c511309c6d68cc5b334416b78c86 (patch) | |
| tree | e6571515a150140a9afe02164d2b51f0ebcc204e /RGens/src/main/java/bjc/rgens | |
| parent | 7a8560805f0469f929c4bb3e222a3a4606bfe651 (diff) | |
Resolve conflict
Diffstat (limited to 'RGens/src/main/java/bjc/rgens')
| -rw-r--r-- | RGens/src/main/java/bjc/rgens/newparser/RGrammarSet.java | 16 |
1 files changed, 8 insertions, 8 deletions
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); + //} } } |