adjust the tests to the new world

MoeOrganization · Feb 3, 2013 · 574164b · 574164b
1 parent 462a18e
commit 574164b
Show file tree

Hide file tree

Showing 15 changed files with 48 additions and 48 deletions.
diff --git a/src/test/scala/org/moe/interpreter/ArrayLiteralNodeTestSuite.scala b/src/test/scala/org/moe/interpreter/ArrayLiteralNodeTestSuite.scala
@@ -18,7 +18,7 @@ class ArrayLiteralNodeTestSuite extends FunSuite with InterpreterTestUtils {
         )
       )
     )
-    val result = Interpreter.eval(runtime.getRootEnv, ast)
+    val result = Interpreter.eval(runtime, runtime.getRootEnv, ast)
 
     val array: List[MoeObject] = result.asInstanceOf[MoeArrayObject].getNativeValue
 
@@ -42,7 +42,7 @@ class ArrayLiteralNodeTestSuite extends FunSuite with InterpreterTestUtils {
         )
       )
     )
-    val result = Interpreter.eval(runtime.getRootEnv, ast)
+    val result = Interpreter.eval(runtime, runtime.getRootEnv, ast)
 
     val array: List[ MoeObject ] = result.asInstanceOf[MoeArrayObject].getNativeValue
 

diff --git a/src/test/scala/org/moe/interpreter/ComparisonNodeTestSuite.scala b/src/test/scala/org/moe/interpreter/ComparisonNodeTestSuite.scala
@@ -16,7 +16,7 @@ class ComparisonNodeTestSuite extends FunSuite with InterpreterTestUtils {
         )
       )
     )
-    val result = Interpreter.eval(runtime.getRootEnv, ast)
+    val result = Interpreter.eval(runtime, runtime.getRootEnv, ast)
     assert(result.asInstanceOf[MoeBooleanObject].getNativeValue === true)
   }
 
@@ -29,7 +29,7 @@ class ComparisonNodeTestSuite extends FunSuite with InterpreterTestUtils {
         )
       )
     )
-    val result = Interpreter.eval(runtime.getRootEnv, ast)
+    val result = Interpreter.eval(runtime, runtime.getRootEnv, ast)
     assert(result.asInstanceOf[MoeBooleanObject].getNativeValue === false)
   }
 
@@ -42,7 +42,7 @@ class ComparisonNodeTestSuite extends FunSuite with InterpreterTestUtils {
         )
       )
     )
-    val result = Interpreter.eval(runtime.getRootEnv, ast)
+    val result = Interpreter.eval(runtime, runtime.getRootEnv, ast)
     assert(result.asInstanceOf[MoeBooleanObject].getNativeValue === true)
   }
 
@@ -55,7 +55,7 @@ class ComparisonNodeTestSuite extends FunSuite with InterpreterTestUtils {
         )
       )
     )
-    val result = Interpreter.eval(runtime.getRootEnv, ast)
+    val result = Interpreter.eval(runtime, runtime.getRootEnv, ast)
     assert(result.asInstanceOf[MoeBooleanObject].getNativeValue === false)
   }
 
@@ -68,7 +68,7 @@ class ComparisonNodeTestSuite extends FunSuite with InterpreterTestUtils {
         )
       )
     )
-    val result = Interpreter.eval(runtime.getRootEnv, ast)
+    val result = Interpreter.eval(runtime, runtime.getRootEnv, ast)
     assert(result.asInstanceOf[MoeBooleanObject].getNativeValue === true)
   }
 
@@ -81,7 +81,7 @@ class ComparisonNodeTestSuite extends FunSuite with InterpreterTestUtils {
         )
       )
     )
-    val result = Interpreter.eval(runtime.getRootEnv, ast)
+    val result = Interpreter.eval(runtime, runtime.getRootEnv, ast)
     assert(result.asInstanceOf[MoeBooleanObject].getNativeValue === false)
   }
 
@@ -94,7 +94,7 @@ class ComparisonNodeTestSuite extends FunSuite with InterpreterTestUtils {
         )
       )
     )
-    val result = Interpreter.eval(runtime.getRootEnv, ast)
+    val result = Interpreter.eval(runtime, runtime.getRootEnv, ast)
     assert(result.asInstanceOf[MoeBooleanObject].getNativeValue === true)
   }
 
@@ -107,7 +107,7 @@ class ComparisonNodeTestSuite extends FunSuite with InterpreterTestUtils {
         )
       )
     )
-    val result = Interpreter.eval(runtime.getRootEnv, ast)
+    val result = Interpreter.eval(runtime, runtime.getRootEnv, ast)
     assert(result.asInstanceOf[MoeBooleanObject].getNativeValue === false)
   }
 

diff --git a/src/test/scala/org/moe/interpreter/DoWhileNodeTestSuite.scala b/src/test/scala/org/moe/interpreter/DoWhileNodeTestSuite.scala
@@ -35,7 +35,7 @@ class DoWhileNodeTestSuite extends FunSuite with InterpreterTestUtils {
         VariableAccessNode("$bar")
       )
     )
-    val result = Interpreter.eval(runtime.getRootEnv, ast)
+    val result = Interpreter.eval(runtime, runtime.getRootEnv, ast)
     assert(result.asInstanceOf[MoeIntObject].getNativeValue === -1)
   }
 

diff --git a/src/test/scala/org/moe/interpreter/ForNodeTestSuite.scala b/src/test/scala/org/moe/interpreter/ForNodeTestSuite.scala
@@ -41,7 +41,7 @@ class ForNodeTestSuite extends FunSuite with InterpreterTestUtils {
         VariableAccessNode("$bar")
       )
     )
-    val result = Interpreter.eval(runtime.getRootEnv, ast)
+    val result = Interpreter.eval(runtime, runtime.getRootEnv, ast)
     assert(result.asInstanceOf[MoeIntObject].getNativeValue === 4)
   }
 
@@ -72,7 +72,7 @@ class ForNodeTestSuite extends FunSuite with InterpreterTestUtils {
         VariableAccessNode("$bar")
       )
     )
-    val result = Interpreter.eval(runtime.getRootEnv, ast)
+    val result = Interpreter.eval(runtime, runtime.getRootEnv, ast)
     assert(result.asInstanceOf[MoeIntObject].getNativeValue === -10)
   }
 

diff --git a/src/test/scala/org/moe/interpreter/HashLiteralNodeTestSuite.scala b/src/test/scala/org/moe/interpreter/HashLiteralNodeTestSuite.scala
@@ -18,7 +18,7 @@ class HashLiteralNodeTestSuite extends FunSuite with InterpreterTestUtils {
         )
       )
     )
-    val result = Interpreter.eval(runtime.getRootEnv, ast)
+    val result = Interpreter.eval(runtime, runtime.getRootEnv, ast)
 
     val hash: Map[String, MoeObject] = result.asInstanceOf[MoeHashObject].getNativeValue
     assert(hash("foo").asInstanceOf[MoeIntObject].getNativeValue === 10)

diff --git a/src/test/scala/org/moe/interpreter/IfNodeTestSuite.scala b/src/test/scala/org/moe/interpreter/IfNodeTestSuite.scala
@@ -16,7 +16,7 @@ class IfNodeTestSuite extends FunSuite with InterpreterTestUtils {
         )
       )
     )
-    val result = Interpreter.eval(runtime.getRootEnv, ast)
+    val result = Interpreter.eval(runtime, runtime.getRootEnv, ast)
     assert(result.asInstanceOf[MoeIntObject].getNativeValue === 1)
   }
 
@@ -29,7 +29,7 @@ class IfNodeTestSuite extends FunSuite with InterpreterTestUtils {
         )
       )
     )
-    val result = Interpreter.eval(runtime.getRootEnv, ast)
+    val result = Interpreter.eval(runtime, runtime.getRootEnv, ast)
     assert(result === runtime.NativeObjects.getUndef)
   }
 
@@ -43,7 +43,7 @@ class IfNodeTestSuite extends FunSuite with InterpreterTestUtils {
         )
       )
     )
-    val result = Interpreter.eval(runtime.getRootEnv, ast)
+    val result = Interpreter.eval(runtime, runtime.getRootEnv, ast)
     assert(result.asInstanceOf[MoeIntObject].getNativeValue === 2)
   }
 
@@ -57,7 +57,7 @@ class IfNodeTestSuite extends FunSuite with InterpreterTestUtils {
         )
       )
     )
-    val result = Interpreter.eval(runtime.getRootEnv, ast)
+    val result = Interpreter.eval(runtime, runtime.getRootEnv, ast)
     assert(result.asInstanceOf[MoeIntObject].getNativeValue === 3)
   }
 
@@ -72,7 +72,7 @@ class IfNodeTestSuite extends FunSuite with InterpreterTestUtils {
         )
       )
     )
-    val result = Interpreter.eval(runtime.getRootEnv, ast)
+    val result = Interpreter.eval(runtime, runtime.getRootEnv, ast)
     assert(result.asInstanceOf[MoeIntObject].getNativeValue === 5)
   }
 
@@ -87,7 +87,7 @@ class IfNodeTestSuite extends FunSuite with InterpreterTestUtils {
         )
       )
     )
-    val result = Interpreter.eval(runtime.getRootEnv, ast)
+    val result = Interpreter.eval(runtime, runtime.getRootEnv, ast)
     assert(result.asInstanceOf[MoeIntObject].getNativeValue === 8)
   }
 
@@ -102,7 +102,7 @@ class IfNodeTestSuite extends FunSuite with InterpreterTestUtils {
         )
       )
     )
-    val result = Interpreter.eval(runtime.getRootEnv, ast)
+    val result = Interpreter.eval(runtime, runtime.getRootEnv, ast)
     assert(result === runtime.NativeObjects.getUndef)
   }
 
@@ -118,7 +118,7 @@ class IfNodeTestSuite extends FunSuite with InterpreterTestUtils {
         )
       )
     )
-    val result = Interpreter.eval(runtime.getRootEnv, ast)
+    val result = Interpreter.eval(runtime, runtime.getRootEnv, ast)
     assert(result.asInstanceOf[MoeIntObject].getNativeValue === 34)
   }
 
@@ -134,7 +134,7 @@ class IfNodeTestSuite extends FunSuite with InterpreterTestUtils {
         )
       )
     )
-    val result = Interpreter.eval(runtime.getRootEnv, ast)
+    val result = Interpreter.eval(runtime, runtime.getRootEnv, ast)
     assert(result.asInstanceOf[MoeIntObject].getNativeValue === 55)
   }
 
@@ -150,7 +150,7 @@ class IfNodeTestSuite extends FunSuite with InterpreterTestUtils {
         )
       )
     )
-    val result = Interpreter.eval(runtime.getRootEnv, ast)
+    val result = Interpreter.eval(runtime, runtime.getRootEnv, ast)
     assert(result.asInstanceOf[MoeIntObject].getNativeValue === 89)
   }
 

diff --git a/src/test/scala/org/moe/interpreter/IncrementDecrementNodeTestSuite.scala b/src/test/scala/org/moe/interpreter/IncrementDecrementNodeTestSuite.scala
@@ -17,7 +17,7 @@ class IncrementDecrementNodeTestSuite extends FunSuite with InterpreterTestUtils
         IncrementNode(VariableAccessNode("$foo"))
       )
     )
-    val result = Interpreter.eval(runtime.getRootEnv, ast)
+    val result = Interpreter.eval(runtime, runtime.getRootEnv, ast)
     assert(result.asInstanceOf[MoeIntObject].getNativeValue === 43)
   }
 
@@ -31,7 +31,7 @@ class IncrementDecrementNodeTestSuite extends FunSuite with InterpreterTestUtils
         IncrementNode(VariableAccessNode("$foo"))
       )
     )
-    val result = Interpreter.eval(runtime.getRootEnv, ast)
+    val result = Interpreter.eval(runtime, runtime.getRootEnv, ast)
     assert(result.asInstanceOf[MoeFloatObject].getNativeValue === 99.6)
   }
 
@@ -45,7 +45,7 @@ class IncrementDecrementNodeTestSuite extends FunSuite with InterpreterTestUtils
         DecrementNode(VariableAccessNode("$foo"))
       )
     )
-    val result = Interpreter.eval(runtime.getRootEnv, ast)
+    val result = Interpreter.eval(runtime, runtime.getRootEnv, ast)
     assert(result.asInstanceOf[MoeIntObject].getNativeValue === 41)
   }
 
@@ -59,7 +59,7 @@ class IncrementDecrementNodeTestSuite extends FunSuite with InterpreterTestUtils
         DecrementNode(VariableAccessNode("$foo"))
       )
     )
-    val result = Interpreter.eval(runtime.getRootEnv, ast)
+    val result = Interpreter.eval(runtime, runtime.getRootEnv, ast)
     assert(result.asInstanceOf[MoeFloatObject].getNativeValue === 97.6)
   }
 

diff --git a/src/test/scala/org/moe/interpreter/LiteralNodeTestSuite.scala b/src/test/scala/org/moe/interpreter/LiteralNodeTestSuite.scala
@@ -9,25 +9,25 @@ class LiteralNodeTestSuite extends FunSuite with InterpreterTestUtils {
 
   test("... basic test with null") {
     val ast = wrapSimpleAST(List(UndefLiteralNode()))
-    val result = Interpreter.eval(runtime.getRootEnv, ast)
+    val result = Interpreter.eval(runtime, runtime.getRootEnv, ast)
     assert(result === runtime.NativeObjects.getUndef)
   }
 
   test("... basic test with Int") {
     val ast = wrapSimpleAST(List(IntLiteralNode(10)))
-    val result = Interpreter.eval(runtime.getRootEnv, ast)
+    val result = Interpreter.eval(runtime, runtime.getRootEnv, ast)
     assert(result.asInstanceOf[MoeIntObject].getNativeValue === 10)
   }
 
   test("... basic test with Float") {
     val ast = wrapSimpleAST(List(FloatLiteralNode(10.5)))
-    val result = Interpreter.eval(runtime.getRootEnv, ast)
+    val result = Interpreter.eval(runtime, runtime.getRootEnv, ast)
     assert(result.asInstanceOf[MoeFloatObject].getNativeValue === 10.5)
   }
 
   test("... basic test with String") {
     val ast = wrapSimpleAST(List(StringLiteralNode("HELLO")))
-    val result = Interpreter.eval(runtime.getRootEnv, ast)
+    val result = Interpreter.eval(runtime, runtime.getRootEnv, ast)
     assert(result.asInstanceOf[MoeStringObject].getNativeValue === "HELLO")
   }
 

diff --git a/src/test/scala/org/moe/interpreter/LogicalNodeTestSuite.scala b/src/test/scala/org/moe/interpreter/LogicalNodeTestSuite.scala
@@ -13,7 +13,7 @@ class LogicalNodeTestSuite extends FunSuite with InterpreterTestUtils {
         NotNode(BooleanLiteralNode(true))
       )
     )
-    val result = Interpreter.eval(runtime.getRootEnv, ast)
+    val result = Interpreter.eval(runtime, runtime.getRootEnv, ast)
     assert(result.asInstanceOf[ MoeBooleanObject ].getNativeValue === false)
   }
 
@@ -23,7 +23,7 @@ class LogicalNodeTestSuite extends FunSuite with InterpreterTestUtils {
         NotNode(BooleanLiteralNode(false))
       )
     )
-    val result = Interpreter.eval(runtime.getRootEnv, ast)
+    val result = Interpreter.eval(runtime, runtime.getRootEnv, ast)
     assert(result.asInstanceOf[MoeBooleanObject].getNativeValue === true)
   }
 
@@ -36,7 +36,7 @@ class LogicalNodeTestSuite extends FunSuite with InterpreterTestUtils {
         )
       )
     )
-    val result = Interpreter.eval(runtime.getRootEnv, ast)
+    val result = Interpreter.eval(runtime, runtime.getRootEnv, ast)
     assert(result.asInstanceOf[MoeBooleanObject].getNativeValue === false)
   }
 
@@ -52,7 +52,7 @@ class LogicalNodeTestSuite extends FunSuite with InterpreterTestUtils {
         )
       )
     )
-    val result = Interpreter.eval(runtime.getRootEnv, ast)
+    val result = Interpreter.eval(runtime, runtime.getRootEnv, ast)
     assert(result.asInstanceOf[MoeIntObject].getNativeValue === 100)
   }
 
@@ -65,7 +65,7 @@ class LogicalNodeTestSuite extends FunSuite with InterpreterTestUtils {
         )
       )
     )
-    val result = Interpreter.eval(runtime.getRootEnv, ast)
+    val result = Interpreter.eval(runtime, runtime.getRootEnv, ast)
     assert(result.asInstanceOf[MoeBooleanObject].getNativeValue === true)
   }
 

diff --git a/src/test/scala/org/moe/interpreter/MiscNodeTestSuite.scala b/src/test/scala/org/moe/interpreter/MiscNodeTestSuite.scala
@@ -16,7 +16,7 @@ class MiscNodeTestSuite extends FunSuite with InterpreterTestUtils {
         StringLiteralNode("WORLD")
       )
     )
-    val result = Interpreter.eval(runtime.getRootEnv, ast)
+    val result = Interpreter.eval(runtime, runtime.getRootEnv, ast)
     assert(result.asInstanceOf[MoeStringObject].getNativeValue === "WORLD")
   }
 
@@ -27,7 +27,7 @@ class MiscNodeTestSuite extends FunSuite with InterpreterTestUtils {
       )
     )
     intercept[MoeErrors.UnknownNode] {
-      Interpreter.eval(runtime.getRootEnv, ast)
+      Interpreter.eval(runtime, runtime.getRootEnv, ast)
     }
   }
 

diff --git a/src/test/scala/org/moe/interpreter/PackageNodeTestSuite.scala b/src/test/scala/org/moe/interpreter/PackageNodeTestSuite.scala
@@ -38,7 +38,7 @@ class PackageNodeTestSuite extends FunSuite with InterpreterTestUtils {
         )
       )
     )
-    val result = Interpreter.eval(runtime.getRootEnv, ast)
+    val result = Interpreter.eval(runtime, runtime.getRootEnv, ast)
     assert(result.asInstanceOf[MoeIntObject].getNativeValue === 3)
   }
 

diff --git a/src/test/scala/org/moe/interpreter/UnlessNodeTestSuite.scala b/src/test/scala/org/moe/interpreter/UnlessNodeTestSuite.scala
@@ -16,7 +16,7 @@ class UnlessNodeTestSuite extends FunSuite with InterpreterTestUtils {
         )
       )
     )
-    val result = Interpreter.eval( runtime.getRootEnv, ast )
+    val result = Interpreter.eval(runtime, runtime.getRootEnv, ast )
     assert( result.asInstanceOf[ MoeIntObject ].getNativeValue === 42 )
   }
 
@@ -29,7 +29,7 @@ class UnlessNodeTestSuite extends FunSuite with InterpreterTestUtils {
         )
       )
     )
-    val result = Interpreter.eval( runtime.getRootEnv, ast )
+    val result = Interpreter.eval(runtime, runtime.getRootEnv, ast )
     assert( result === runtime.NativeObjects.getUndef )
   }
 
@@ -43,7 +43,7 @@ class UnlessNodeTestSuite extends FunSuite with InterpreterTestUtils {
         )
       )
     )
-    val result = Interpreter.eval( runtime.getRootEnv, ast )
+    val result = Interpreter.eval(runtime, runtime.getRootEnv, ast )
     assert( result.asInstanceOf[ MoeIntObject ].getNativeValue === 42 )
   }
 
@@ -57,7 +57,7 @@ class UnlessNodeTestSuite extends FunSuite with InterpreterTestUtils {
         )
       )
     )
-    val result = Interpreter.eval( runtime.getRootEnv, ast )
+    val result = Interpreter.eval(runtime, runtime.getRootEnv, ast )
     assert( result.asInstanceOf[ MoeIntObject ].getNativeValue === 21 )
   }