Update

5 files changed, 25 insertions, 25 deletions

diff --git a/RGens/src/main/java/bjc/rgens/newparser/RGrammarBuilder.java b/RGens/src/main/java/bjc/rgens/newparser/RGrammarBuilder.java
index edd7e80..d71578b 100644
--- a/RGens/src/main/java/bjc/rgens/newparser/RGrammarBuilder.java
+++ b/RGens/src/main/java/bjc/rgens/newparser/RGrammarBuilder.java
@@ -108,7 +108,7 @@ public class RGrammarBuilder {
 			throw new IllegalStateException("Must start a rule before finishing one");
 		}
 
-		rules.put(currRule.ruleName, currRule);
+		rules.put(currRule.name, currRule);
 	}
 
 	/**
diff --git a/RGens/src/main/java/bjc/rgens/newparser/RGrammarFormatter.java b/RGens/src/main/java/bjc/rgens/newparser/RGrammarFormatter.java
index 231e191..202d9ef 100644
--- a/RGens/src/main/java/bjc/rgens/newparser/RGrammarFormatter.java
+++ b/RGens/src/main/java/bjc/rgens/newparser/RGrammarFormatter.java
@@ -37,13 +37,13 @@ public class RGrammarFormatter {
 		}
 
 		for(Rule rule : rules.values()) {
-			if(!processedRules.contains(rule.ruleName)) {
+			if(!processedRules.contains(rule.name)) {
 				sb.append("\n\n");
 				
 				processRule(rule, sb);
 			}
 
-			processedRules.add(rule.ruleName);
+			processedRules.add(rule.name);
 		}
 
 		return sb.toString().trim();
@@ -54,7 +54,7 @@ public class RGrammarFormatter {
 
 		StringBuilder ruleBuilder = new StringBuilder();
 
-		ruleBuilder.append(rule.ruleName);
+		ruleBuilder.append(rule.name);
 		ruleBuilder.append(" \u2192 ");
 
 		int markerPos = ruleBuilder.length();
diff --git a/RGens/src/main/java/bjc/rgens/newparser/RGrammarParser.java b/RGens/src/main/java/bjc/rgens/newparser/RGrammarParser.java
index cb76946..2f64b75 100644
--- a/RGens/src/main/java/bjc/rgens/newparser/RGrammarParser.java
+++ b/RGens/src/main/java/bjc/rgens/newparser/RGrammarParser.java
@@ -1,8 +1,8 @@
 package bjc.rgens.newparser;
 
 import bjc.utils.funcutils.TriConsumer;
-import bjc.utils.parserutils.BlockReader;
-import bjc.utils.parserutils.BlockReader.Block;
+import bjc.utils.ioutils.Block;
+import bjc.utils.ioutils.BlockReader;
 
 import java.io.InputStream;
 import java.io.InputStreamReader;
diff --git a/RGens/src/main/java/bjc/rgens/newparser/RGrammarSet.java b/RGens/src/main/java/bjc/rgens/newparser/RGrammarSet.java
index d86b18c..608697a 100644
--- a/RGens/src/main/java/bjc/rgens/newparser/RGrammarSet.java
+++ b/RGens/src/main/java/bjc/rgens/newparser/RGrammarSet.java
@@ -73,8 +73,8 @@ public class RGrammarSet {
 		grammars.put(grammarName, gram);
 
 		for(Rule export : gram.getExportedRules()) {
-			exportedRules.put(export.ruleName, gram);
-			exportFrom.put(export.ruleName, grammarName);
+			exportedRules.put(export.name, gram);
+			exportFrom.put(export.name, grammarName);
 		}
 
 		gram.setImportedRules(exportedRules);
diff --git a/RGens/src/main/java/bjc/rgens/newparser/Rule.java b/RGens/src/main/java/bjc/rgens/newparser/Rule.java
index eca856f..0197860 100644
--- a/RGens/src/main/java/bjc/rgens/newparser/Rule.java
+++ b/RGens/src/main/java/bjc/rgens/newparser/Rule.java
@@ -15,9 +15,9 @@ public class Rule {
 	/**
 	 * The name of this grammar rule.
 	 */
-	public final String ruleName;
+	public final String name;
 
-	private IList<RuleCase> ruleCases;
+	private IList<RuleCase> cases;
 
 	/**
 	 * Create a new grammar rule.
@@ -35,9 +35,9 @@ public class Rule {
 			throw new IllegalArgumentException("The empty string is not a valid rule name");
 		}
 
-		this.ruleName = ruleName;
+		name = ruleName;
 
-		ruleCases = new FunctionalList<>();
+		cases = new FunctionalList<>();
 	}
 
 	/**
@@ -51,7 +51,7 @@ public class Rule {
 			throw new NullPointerException("Case must not be null");
 		}
 
-		ruleCases.add(cse);
+		cases.add(cse);
 	}
 
 	/**
@@ -60,7 +60,7 @@ public class Rule {
 	 * @return A random case from this rule.
 	 */
 	public RuleCase getCase() {
-		return ruleCases.randItem();
+		return cases.randItem();
 	}
 
 	/**
@@ -72,7 +72,7 @@ public class Rule {
 	 * @return A random case from this rule.
 	 */
 	public RuleCase getCase(Random rnd) {
-		return ruleCases.randItem(rnd::nextInt);
+		return cases.randItem(rnd::nextInt);
 	}
 
 	/**
@@ -81,7 +81,7 @@ public class Rule {
 	 * @return All the cases in this rule.
 	 */
 	public IList<RuleCase> getCases() {
-		return ruleCases;
+		return cases;
 	}
 
 	@Override
@@ -89,8 +89,8 @@ public class Rule {
 		final int prime = 31;
 
 		int result = 1;
-		result = prime * result + ((ruleCases == null) ? 0 : ruleCases.hashCode());
-		result = prime * result + ((ruleName == null) ? 0 : ruleName.hashCode());
+		result = prime * result + ((cases == null) ? 0 : cases.hashCode());
+		result = prime * result + ((name == null) ? 0 : name.hashCode());
 
 		return result;
 	}
@@ -103,19 +103,19 @@ public class Rule {
 
 		Rule other = (Rule) obj;
 
-		if(ruleCases == null) {
-			if(other.ruleCases != null) return false;
-		} else if(!ruleCases.equals(other.ruleCases)) return false;
+		if(cases == null) {
+			if(other.cases != null) return false;
+		} else if(!cases.equals(other.cases)) return false;
 
-		if(ruleName == null) {
-			if(other.ruleName != null) return false;
-		} else if(!ruleName.equals(other.ruleName)) return false;
+		if(name == null) {
+			if(other.name != null) return false;
+		} else if(!name.equals(other.name)) return false;
 
 		return true;
 	}
 
 	@Override
 	public String toString() {
-		return String.format("Rule [ruleName='%s', ruleCases=%s]", ruleName, ruleCases);
+		return String.format("Rule [ruleName='%s', ruleCases=%s]", name, cases);
 	}
 }
\ No newline at end of file