From 7826bba40477307a63ad5fa86d9e2b94d859dfdb Mon Sep 17 00:00:00 2001
From: Ben Culkin <scorpress@gmail.com>
Date: Sun, 12 Apr 2020 14:10:03 -0400
Subject: Adjust to BJC-Utils changes

Several packages from BJC-Utils were moved to esodata. This does the
neccessary adjustments
---
 src/main/java/bjc/dicelang/scl/StreamControlConsole.java    |  4 ++--
 src/main/java/bjc/dicelang/scl/StreamControlEngine.java     | 10 +++++-----
 src/main/java/bjc/dicelang/scl/StreamEngine.java            | 12 ++++++------
 src/main/java/bjc/dicelang/scl/tokens/ArraySCLToken.java    |  2 +-
 src/main/java/bjc/dicelang/scl/tokens/WordListSCLToken.java |  2 +-
 src/main/java/bjc/dicelang/scl/tokens/WordsSCLToken.java    |  2 +-
 6 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'src')

diff --git a/src/main/java/bjc/dicelang/scl/StreamControlConsole.java b/src/main/java/bjc/dicelang/scl/StreamControlConsole.java
index 1a60beb..ae4dcca 100644
--- a/src/main/java/bjc/dicelang/scl/StreamControlConsole.java
+++ b/src/main/java/bjc/dicelang/scl/StreamControlConsole.java
@@ -2,8 +2,8 @@ package bjc.dicelang.scl;
 
 import java.util.Scanner;
 
-import bjc.utils.funcdata.FunctionalList;
-import bjc.utils.funcdata.IList;
+import bjc.funcdata.FunctionalList;
+import bjc.funcdata.IList;
 
 /**
  * Implement a SCL REPL
diff --git a/src/main/java/bjc/dicelang/scl/StreamControlEngine.java b/src/main/java/bjc/dicelang/scl/StreamControlEngine.java
index 4b4dce7..5637962 100644
--- a/src/main/java/bjc/dicelang/scl/StreamControlEngine.java
+++ b/src/main/java/bjc/dicelang/scl/StreamControlEngine.java
@@ -26,10 +26,10 @@ import bjc.dicelang.scl.tokens.SymbolSCLToken;
 import bjc.dicelang.scl.tokens.WordListSCLToken;
 import bjc.dicelang.scl.tokens.WordSCLToken;
 import bjc.dicelang.scl.tokens.WordsSCLToken;
-import bjc.utils.esodata.SimpleStack;
-import bjc.utils.esodata.Stack;
-import bjc.utils.funcdata.FunctionalList;
-import bjc.utils.funcdata.IList;
+import bjc.esodata.SimpleStack;
+import bjc.esodata.Stack;
+import bjc.funcdata.FunctionalList;
+import bjc.funcdata.IList;
 import bjc.utils.parserutils.TokenUtils;
 
 /*
@@ -203,7 +203,7 @@ public class StreamControlEngine {
 			curStack.push(new IntSCLToken(curStack.size()));
 			break;
 		case STACKEMPTY:
-			curStack.push(new BooleanSCLToken(curStack.empty()));
+			curStack.push(new BooleanSCLToken(curStack.isEmpty()));
 			break;
 		case DROP:
 			if (curStack.size() == 0) {
diff --git a/src/main/java/bjc/dicelang/scl/StreamEngine.java b/src/main/java/bjc/dicelang/scl/StreamEngine.java
index 0aa4ef5..4f2e0b8 100644
--- a/src/main/java/bjc/dicelang/scl/StreamEngine.java
+++ b/src/main/java/bjc/dicelang/scl/StreamEngine.java
@@ -7,12 +7,12 @@ import static bjc.dicelang.scl.Errors.ErrorKey.EK_STRM_NONEX;
 import java.util.Arrays;
 import java.util.function.Predicate;
 
-import bjc.utils.esodata.SingleTape;
-import bjc.utils.esodata.Tape;
-import bjc.utils.funcdata.FunctionalList;
-import bjc.utils.funcdata.FunctionalMap;
-import bjc.utils.funcdata.IList;
-import bjc.utils.funcdata.IMap;
+import bjc.esodata.SingleTape;
+import bjc.esodata.Tape;
+import bjc.funcdata.FunctionalList;
+import bjc.funcdata.FunctionalMap;
+import bjc.funcdata.IList;
+import bjc.funcdata.IMap;
 import bjc.utils.funcutils.ListUtils;
 
 /**
diff --git a/src/main/java/bjc/dicelang/scl/tokens/ArraySCLToken.java b/src/main/java/bjc/dicelang/scl/tokens/ArraySCLToken.java
index a06a0fd..17c76a3 100644
--- a/src/main/java/bjc/dicelang/scl/tokens/ArraySCLToken.java
+++ b/src/main/java/bjc/dicelang/scl/tokens/ArraySCLToken.java
@@ -1,6 +1,6 @@
 package bjc.dicelang.scl.tokens;
 
-import bjc.utils.funcdata.IList;
+import bjc.funcdata.IList;
 
 /**
  * Represents an array token.
diff --git a/src/main/java/bjc/dicelang/scl/tokens/WordListSCLToken.java b/src/main/java/bjc/dicelang/scl/tokens/WordListSCLToken.java
index 1d870db..f6fef90 100644
--- a/src/main/java/bjc/dicelang/scl/tokens/WordListSCLToken.java
+++ b/src/main/java/bjc/dicelang/scl/tokens/WordListSCLToken.java
@@ -1,6 +1,6 @@
 package bjc.dicelang.scl.tokens;
 
-import bjc.utils.funcdata.IList;
+import bjc.funcdata.IList;
 
 /**
  * Represents a list of words.
diff --git a/src/main/java/bjc/dicelang/scl/tokens/WordsSCLToken.java b/src/main/java/bjc/dicelang/scl/tokens/WordsSCLToken.java
index 40c4cd4..dc1d7d3 100644
--- a/src/main/java/bjc/dicelang/scl/tokens/WordsSCLToken.java
+++ b/src/main/java/bjc/dicelang/scl/tokens/WordsSCLToken.java
@@ -1,6 +1,6 @@
 package bjc.dicelang.scl.tokens;
 
-import bjc.utils.funcdata.IList;
+import bjc.funcdata.IList;
 
 /**
  * A token representing an executable bunch of words.
-- 
cgit v1.2.3