From 223dc6d10617d282204c515cf3794d59a31ebf16 Mon Sep 17 00:00:00 2001
From: Ben Culkin <scorpress@gmail.com>
Date: Thu, 3 Dec 2020 19:23:06 -0500
Subject: Adapt to esodata changes

---
 src/main/java/bjc/rgens/parser/templates/GrammarTemplate.java  | 10 +++++-----
 .../bjc/rgens/parser/templates/LiteralTemplateElement.java     |  4 ++--
 .../java/bjc/rgens/parser/templates/LiveTemplateElement.java   |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/main/java/bjc/rgens/parser/templates')

diff --git a/src/main/java/bjc/rgens/parser/templates/GrammarTemplate.java b/src/main/java/bjc/rgens/parser/templates/GrammarTemplate.java
index 45833f2..6303fa6 100644
--- a/src/main/java/bjc/rgens/parser/templates/GrammarTemplate.java
+++ b/src/main/java/bjc/rgens/parser/templates/GrammarTemplate.java
@@ -3,8 +3,8 @@ package bjc.rgens.parser.templates;
 import bjc.rgens.parser.ConfigSet;
 import bjc.rgens.parser.GenerationState;
 
-import bjc.data.ITree;
 import bjc.data.Tree;
+import bjc.data.SimpleTree;
 
 import java.io.Reader;
 import java.util.ArrayList;
@@ -72,7 +72,7 @@ public class GrammarTemplate {
 	 *
 	 * @return The generated template.
 	 */
-	public static GrammarTemplate readTemplate(Reader rdr, ITree<String> errs) {
+	public static GrammarTemplate readTemplate(Reader rdr, Tree<String> errs) {
 		List<TemplateElement> elements = new ArrayList<>();
 		GrammarTemplate template = new GrammarTemplate(elements);
 
@@ -84,7 +84,7 @@ public class GrammarTemplate {
 			String ln = scn.nextLine();
 			lno += 1;
 
-			ITree<String> kid = new Tree<>(String.format("INFO: Line %d", lno));
+			Tree<String> kid = new SimpleTree<>(String.format("INFO: Line %d", lno));
 			switch(ln.charAt(0)) {
 			case '#':
 				// Ignore comments
@@ -106,7 +106,7 @@ public class GrammarTemplate {
 		return template;
 	}
 
-	private static void handleLine(List<TemplateElement> elements, GrammarTemplate template, String ln, ITree<String> errs) {
+	private static void handleLine(List<TemplateElement> elements, GrammarTemplate template, String ln, Tree<String> errs) {
 		if(ln.matches("^.*?\\$@.+?@\\$.*$")) {
 			/*
 			 * Handle live templates
@@ -117,7 +117,7 @@ public class GrammarTemplate {
 		}
 	}
 
-	private static void handlePragma(List<TemplateElement> elements, GrammarTemplate template, String ln, ITree<String> errs) {
+	private static void handlePragma(List<TemplateElement> elements, GrammarTemplate template, String ln, Tree<String> errs) {
 		/*
 		 * @TODO 2/8/2019 Ben Culkin :TemplatePragmas
 		 * Implement template pragmas.
diff --git a/src/main/java/bjc/rgens/parser/templates/LiteralTemplateElement.java b/src/main/java/bjc/rgens/parser/templates/LiteralTemplateElement.java
index 6bd8b9f..0d0f611 100644
--- a/src/main/java/bjc/rgens/parser/templates/LiteralTemplateElement.java
+++ b/src/main/java/bjc/rgens/parser/templates/LiteralTemplateElement.java
@@ -1,6 +1,6 @@
 package bjc.rgens.parser.templates;
 
-import bjc.data.ITree;
+import bjc.data.Tree;
 
 import bjc.rgens.parser.GenerationState;
 
@@ -24,7 +24,7 @@ public class LiteralTemplateElement extends TemplateElement {
 	 * @param errs
 	 *             The place to put errors.
 	 */
-	public LiteralTemplateElement(String val, ITree<String> errs) {
+	public LiteralTemplateElement(String val, Tree<String> errs) {
 		super(true);
 
 		this.val = val;
diff --git a/src/main/java/bjc/rgens/parser/templates/LiveTemplateElement.java b/src/main/java/bjc/rgens/parser/templates/LiveTemplateElement.java
index 653ae76..8b9806b 100644
--- a/src/main/java/bjc/rgens/parser/templates/LiveTemplateElement.java
+++ b/src/main/java/bjc/rgens/parser/templates/LiveTemplateElement.java
@@ -7,7 +7,7 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import bjc.data.BooleanToggle;
-import bjc.data.ITree;
+import bjc.data.Tree;
 
 import bjc.rgens.parser.GenerationState;
 import bjc.rgens.parser.RGrammarParser;
@@ -37,7 +37,7 @@ public class LiveTemplateElement extends TemplateElement {
 	 * @param errs
 	 * 		A tree to add errors &amp; information to.
 	 */
-	public LiveTemplateElement(String val, ITree<String> errs) {
+	public LiveTemplateElement(String val, Tree<String> errs) {
 		super(true);
 
 		elements = new ArrayList<>();
-- 
cgit v1.2.3