diff options
Diffstat (limited to 'src/main/java/bjc/rgens/parser/elements')
| -rwxr-xr-x | src/main/java/bjc/rgens/parser/elements/CaseElement.java | 6 | ||||
| -rw-r--r-- | src/main/java/bjc/rgens/parser/elements/RuleVariableCaseElement.java | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/main/java/bjc/rgens/parser/elements/CaseElement.java b/src/main/java/bjc/rgens/parser/elements/CaseElement.java index 386e2b4..fa398e7 100755 --- a/src/main/java/bjc/rgens/parser/elements/CaseElement.java +++ b/src/main/java/bjc/rgens/parser/elements/CaseElement.java @@ -7,6 +7,8 @@ import bjc.rgens.parser.GrammarException; import java.util.Arrays; +import static bjc.rgens.parser.RGrammarLogging.*; + /** * A element in a rule case. * @@ -93,7 +95,7 @@ public abstract class CaseElement { char op = varName.charAt(varName.length() - 1); - System.err.printf("\t\tTRACE: Colon definition w/ op %d", (int)op); + trace("Colon definition w/ op %d", (int)op); // Remove the colon, plus any tacked on operator varName = varName.substring(0, varName.length() - 2); @@ -138,7 +140,7 @@ public abstract class CaseElement { return new InlineRuleCaseElement(elms); } else if(rawCase.contains("|")) { - throw new GrammarException("\t\tERROR: Inline rule using | found, they use || now"); + throw new GrammarException("Inline rule using | found, they use || now"); // String[] elms = StringUtils.levelSplit(rawCase, "|").toArray(new String[0]); // return new InlineRuleCaseElement(elms); diff --git a/src/main/java/bjc/rgens/parser/elements/RuleVariableCaseElement.java b/src/main/java/bjc/rgens/parser/elements/RuleVariableCaseElement.java index 29b6fc9..d11915e 100644 --- a/src/main/java/bjc/rgens/parser/elements/RuleVariableCaseElement.java +++ b/src/main/java/bjc/rgens/parser/elements/RuleVariableCaseElement.java @@ -8,6 +8,8 @@ import bjc.rgens.parser.GenerationState; import bjc.rgens.parser.Rule; import bjc.rgens.parser.RGrammar; +import static bjc.rgens.parser.RGrammarLogging.*; + public class RuleVariableCaseElement extends VariableDefCaseElement { public final boolean exhaust; @@ -31,9 +33,9 @@ public class RuleVariableCaseElement extends VariableDefCaseElement { state.rlVars.put(varName, rl); if(exhaust) { - System.err.printf("\t\tFINE: Defined exhausted rulevar '%s' ('%s')\n", varName, varDef); + fine("Defined exhausted rulevar '%s' ('%s')", varName, varDef); } else { - System.err.printf("\t\tFINE: Defined rulevar '%s' ('%s')\n", varName, varDef); + fine("Defined rulevar '%s' ('%s')", varName, varDef); } } } |