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

---
 base/src/main/java/bjc/utils/parserutils/ShuntingYard.java | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'base/src/main/java/bjc/utils/parserutils/ShuntingYard.java')

diff --git a/base/src/main/java/bjc/utils/parserutils/ShuntingYard.java b/base/src/main/java/bjc/utils/parserutils/ShuntingYard.java
index ac82388..f73c315 100644
--- a/base/src/main/java/bjc/utils/parserutils/ShuntingYard.java
+++ b/base/src/main/java/bjc/utils/parserutils/ShuntingYard.java
@@ -6,8 +6,8 @@ import java.util.function.Function;
 
 import bjc.funcdata.FunctionalList;
 import bjc.funcdata.FunctionalMap;
-import bjc.funcdata.IList;
-import bjc.funcdata.IMap;
+import bjc.funcdata.ListEx;
+import bjc.funcdata.MapEx;
 import bjc.utils.funcutils.StringUtils;
 
 /**
@@ -59,7 +59,7 @@ public class ShuntingYard<TokenType> {
 	/*
 	 * Holds all the shuntable operations.
 	 */
-	private IMap<String, IPrecedent> operators;
+	private MapEx<String, IPrecedent> operators;
 
 	/**
 	 * Create a new shunting yard with a default set of operators.
@@ -158,7 +158,7 @@ public class ShuntingYard<TokenType> {
 	 *
 	 * @return A list of tokens in postfix notation.
 	 */
-	public IList<TokenType> postfix(final IList<String> input,
+	public ListEx<TokenType> postfix(final ListEx<String> input,
 			final Function<String, TokenType> transformer) {
 		/*
 		 * Check our input
@@ -169,7 +169,7 @@ public class ShuntingYard<TokenType> {
 		/*
 		 * Here's what we're handing back
 		 */
-		final IList<TokenType> output = new FunctionalList<>();
+		final ListEx<TokenType> output = new FunctionalList<>();
 
 		/*
 		 * The stack to put operators on
-- 
cgit v1.2.3


From f3814a84f8471684cd483347db4fb7b107c2e635 Mon Sep 17 00:00:00 2001
From: Ben Culkin <scorpress@gmail.com>
Date: Thu, 3 Dec 2020 19:28:15 -0500
Subject: Rename interfaces to match Java style

Rename several interfaces that were in the style IWhatever, which Java
doesn't use
---
 base/src/main/java/bjc/utils/parserutils/ShuntingYard.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'base/src/main/java/bjc/utils/parserutils/ShuntingYard.java')

diff --git a/base/src/main/java/bjc/utils/parserutils/ShuntingYard.java b/base/src/main/java/bjc/utils/parserutils/ShuntingYard.java
index f73c315..f0475ff 100644
--- a/base/src/main/java/bjc/utils/parserutils/ShuntingYard.java
+++ b/base/src/main/java/bjc/utils/parserutils/ShuntingYard.java
@@ -25,7 +25,7 @@ public class ShuntingYard<TokenType> {
 	 * @author ben
 	 *
 	 */
-	public static enum Operator implements IPrecedent {
+	public static enum Operator implements Precedent {
 		/**
 		 * Represents addition.
 		 */
@@ -59,7 +59,7 @@ public class ShuntingYard<TokenType> {
 	/*
 	 * Holds all the shuntable operations.
 	 */
-	private MapEx<String, IPrecedent> operators;
+	private MapEx<String, Precedent> operators;
 
 	/**
 	 * Create a new shunting yard with a default set of operators.
@@ -95,7 +95,7 @@ public class ShuntingYard<TokenType> {
 		/*
 		 * Create the precedence marker
 		 */
-		final IPrecedent prec = IPrecedent.newSimplePrecedent(precedence);
+		final Precedent prec = Precedent.newSimplePrecedent(precedence);
 
 		this.addOp(operator, prec);
 	}
@@ -109,7 +109,7 @@ public class ShuntingYard<TokenType> {
 	 * @param precedence
 	 *                   The precedence of the operator.
 	 */
-	public void addOp(final String operator, final IPrecedent precedence) {
+	public void addOp(final String operator, final Precedent precedence) {
 		/*
 		 * Complain about trying to add an incorrect operator
 		 */
-- 
cgit v1.2.3