diff options
| author | Ben Culkin <bjculkin@mix.wvu.edu> | 2018-01-18 20:41:35 -0500 |
|---|---|---|
| committer | Ben Culkin <bjculkin@mix.wvu.edu> | 2018-01-18 20:41:35 -0500 |
| commit | 514f84ac02937c8ec74016db75194d4f94a78d19 (patch) | |
| tree | e6571515a150140a9afe02164d2b51f0ebcc204e /RGens | |
| parent | 7a8560805f0469f929c4bb3e222a3a4606bfe651 (diff) | |
Fix grammar set loading
Diffstat (limited to 'RGens')
| -rw-r--r-- | RGens/data/seniordesign/dbdata.gram | 6 | ||||
| -rw-r--r-- | RGens/src/main/java/bjc/rgens/newparser/RGrammarSet.java | 16 |
2 files changed, 11 insertions, 11 deletions
diff --git a/RGens/data/seniordesign/dbdata.gram b/RGens/data/seniordesign/dbdata.gram index 0429490..5567438 100644 --- a/RGens/data/seniordesign/dbdata.gram +++ b/RGens/data/seniordesign/dbdata.gram @@ -16,14 +16,14 @@ pragma export-rule [user-role] -[dept-id] CS - IS +[dept-id] [synth+deptid] + +[real-deptid] CSIS MATH ENGL PHYS CHEM PSYC - [synth+deptid] pragma export-rule [dept-id] 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); + //} } } |