diff options
Diffstat (limited to 'RGens/src/main/java')
4 files changed, 21 insertions, 8 deletions
diff --git a/RGens/src/main/java/bjc/rgens/parser/RGrammarParser.java b/RGens/src/main/java/bjc/rgens/parser/RGrammarParser.java index cffb896..3a357b1 100644 --- a/RGens/src/main/java/bjc/rgens/parser/RGrammarParser.java +++ b/RGens/src/main/java/bjc/rgens/parser/RGrammarParser.java @@ -19,7 +19,9 @@ import java.util.Map; * @author student */ public class RGrammarParser { - /* Whether we are in debug mode or not. */ + /** + * Whether we are in debug mode or not. + */ public static final boolean DEBUG = false; /* @@ -369,6 +371,7 @@ public class RGrammarParser { String ctxDelim = String.format(TMPL_TOPLEVEL_BLOCK_DELIM, level + 1); try (BlockReader bodyReader = new SimpleBlockReader(ctxDelim, ctxReader)) { + @SuppressWarnings("unused") Block whereBody = whereReader.next(); /** diff --git a/RGens/src/main/java/bjc/rgens/parser/RGrammarSet.java b/RGens/src/main/java/bjc/rgens/parser/RGrammarSet.java index 41974c0..975510a 100644 --- a/RGens/src/main/java/bjc/rgens/parser/RGrammarSet.java +++ b/RGens/src/main/java/bjc/rgens/parser/RGrammarSet.java @@ -179,7 +179,7 @@ public class RGrammarSet { return grammarName; } else if (!grammars.containsKey(grammarName)) { String msg = String.format("No grammar with name '%s' defined", grammarName); - throw new IllegalArgumentException(); + throw new IllegalArgumentException(msg); } return loadedFrom.getOrDefault(grammarName, "Unknown"); diff --git a/RGens/src/main/java/bjc/rgens/parser/RGrammars.java b/RGens/src/main/java/bjc/rgens/parser/RGrammars.java index 69cca0d..f74a756 100644 --- a/RGens/src/main/java/bjc/rgens/parser/RGrammars.java +++ b/RGens/src/main/java/bjc/rgens/parser/RGrammars.java @@ -24,6 +24,7 @@ public class RGrammars { Map<String, String> env = new HashMap<>(); env.put("create", "true"); + @SuppressWarnings("unused") FileSystem zipfs = FileSystems.newFileSystem(rsc, env); Path cfgPath = Paths.get(rsc); @@ -38,17 +39,28 @@ public class RGrammars { } } + /** + * Generate an exported rule. + * + * @param exportName + * The rule to generate. + * @return The generated rule + * @throws GrammarException + * If something went wrong. + */ public static String generateExport(String exportName) throws GrammarException { - if(gramSet == null) loadSet(); + if (gramSet == null) + loadSet(); - if(!gramSet.getExportedRules().contains(exportName)) { - throw new GrammarException(String.format("No built-in rule named %s", exportName)); + if (!gramSet.getExportedRules().contains(exportName)) { + throw new GrammarException(String.format("No exported rule named %s", exportName)); } RGrammar gram = gramSet.getExportSource(exportName); String res = gram.generate(exportName); - if(exportName.contains("+")) res = res.replaceAll("\\s+", ""); + if (exportName.contains("+")) + res = res.replaceAll("\\s+", ""); return res; } diff --git a/RGens/src/main/java/bjc/rgens/parser/elements/CaseElement.java b/RGens/src/main/java/bjc/rgens/parser/elements/CaseElement.java index 7cad599..d74ab52 100644 --- a/RGens/src/main/java/bjc/rgens/parser/elements/CaseElement.java +++ b/RGens/src/main/java/bjc/rgens/parser/elements/CaseElement.java @@ -1,7 +1,5 @@ package bjc.rgens.parser.elements; -import static bjc.rgens.parser.elements.CaseElement.ElementType.*; - import bjc.rgens.parser.GrammarException; /* |