From 12fd9362751871711fad12fea01f39a38c2f32e8 Mon Sep 17 00:00:00 2001 From: "Benjamin J. Culkin" Date: Sun, 23 Jul 2017 20:10:44 -0300 Subject: Simplify parser. The parser no longer uses a modal builder, so grammar blocks could now be done in a parallel manner --- RGens/src/main/java/bjc/rgens/newparser/RGrammar.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'RGens/src/main/java/bjc/rgens/newparser/RGrammar.java') diff --git a/RGens/src/main/java/bjc/rgens/newparser/RGrammar.java b/RGens/src/main/java/bjc/rgens/newparser/RGrammar.java index 3606d40..ada1a57 100644 --- a/RGens/src/main/java/bjc/rgens/newparser/RGrammar.java +++ b/RGens/src/main/java/bjc/rgens/newparser/RGrammar.java @@ -281,7 +281,7 @@ public class RGrammar { if (!state.vars.containsKey(var)) { String msg = String.format("No variable '%s' defined", var); - throw new GrammarException(); + throw new GrammarException(msg); } String name = state.vars.get(var); @@ -312,7 +312,7 @@ public class RGrammar { if (!state.vars.containsKey(key)) { String msg = String.format("No variable '%s' defined", key); - throw new GrammarException(); + throw new GrammarException(msg); } state.contents.append(state.vars.get(key)); @@ -339,11 +339,11 @@ public class RGrammar { String msg = String.format("No rule '%s' defined (perhaps you meant %s?)", refersTo, StringUtils.toEnglishList(resArray, false)); - throw new GrammarException(); + throw new GrammarException(msg); } String msg = String.format("No rule '%s' defined", refersTo); - throw new GrammarException(); + throw new GrammarException(msg); } if (refersTo.contains("+")) { @@ -385,7 +385,7 @@ public class RGrammar { throw new GrammarException("The empty string is not a valid rule name"); } else if (!rules.containsKey(initRule)) { String msg = String.format("No rule '%s' local to this grammar defined.", initRule); - throw new GrammarException(); + throw new GrammarException(msg); } initialRule = initRule; @@ -405,7 +405,7 @@ public class RGrammar { if (!rules.containsKey(rname)) { String msg = String.format("No rule '%s' local to this grammar defined", initialRule); - throw new GrammarException(); + throw new GrammarException(msg); } res.add(rules.get(rname)); -- cgit v1.2.3