Kotlin - Forth WIP2

kotlin/forth/src/main/kotlin/ForthEvaluator.kt

@@ -1,16 +1,25 @@
 import java.util.*
 
 class ForthEvaluator {
-    val stack: Stack<Char> = Stack<Char>()
+    val stack: Stack<String> = Stack<String>()
     val overridenOperators = mutableMapOf<Char, Char>()
 
+    private val validOps = listOf<String>("+", "-", "*", "/", "dup", "drop", "swap", "over")
+
     fun evaluateProgram(inpList: List<String>): List<Int>{
         for (i in inpList){
-            val tokenized = i.toList().filter { it != ' ' }
+            val tokenized = i.split(' ')
-            for (i in tokenized){
+            tokenized.all { validateToken(it) }
-                stack.push(i)
+            for (j in tokenized){
+                stack.push(j)
             }
         }
+        return emptyList()
+    }
+    // TODO: This needs to actually work?
+    private fun validateToken(token: String): Boolean {
+        require(if (token.toInt() >= 0){ true } else token in validOps)
+        return false
     }
 }
 

kotlin/forth/src/test/kotlin/ForthEvaluatorTest.kt

@@ -340,7 +340,6 @@ class ForthEvaluatorTest {
         forthEvaluator.evaluateProgram(listOf(": 1 2 ;"))
     }
 
-    @Ignore
     @Test
     fun testErrorIfEvaluatingAnUndefinedOperator() {
         expectedException.expect(IllegalArgumentException::class.java)