rename the Interpreter to MoeInterpreter and remove the InterpreterUt…

…ils and put that stuff into guts.Utils
MoeOrganization · May 2, 2013 · a139539 · a139539
1 parent b6168d5
commit a139539
Show file tree

Hide file tree

Showing 20 changed files with 51 additions and 73 deletions.
diff --git a/src/main/scala/org/moe/Moe.scala b/src/main/scala/org/moe/Moe.scala
@@ -60,7 +60,7 @@ object Moe {
       return
     }
 
-    val interpreter = new Interpreter()
+    val interpreter = new MoeInterpreter()
     val runtime     = new MoeRuntime(
       warnings    = cmd.hasOption("w"),
       debug       = cmd.hasOption("d"),
@@ -145,7 +145,7 @@ object Moe {
   }
 
   object REPL {
-    def enter (interpreter: Interpreter, runtime: MoeRuntime, dumpAST: Boolean = false): Unit = {
+    def enter (interpreter: MoeInterpreter, runtime: MoeRuntime, dumpAST: Boolean = false): Unit = {
       import jline.{ConsoleReader, History}
 
       def isReplCommand(input: String) = input(0) == ':'
@@ -181,7 +181,7 @@ object Moe {
       }
     }
 
-    def evalLine(interpreter: Interpreter, runtime: MoeRuntime, line: String, options: Map[String, Boolean]) = {
+    def evalLine(interpreter: MoeInterpreter, runtime: MoeRuntime, line: String, options: Map[String, Boolean]) = {
       try {
         val nodes = MoeParser.parseFromEntry(line)
         val ast = CompilationUnitNode(

diff --git a/...ala/org/moe/interpreter/Interpreter.scala → .../org/moe/interpreter/MoeInterpreter.scala b/...ala/org/moe/interpreter/Interpreter.scala → .../org/moe/interpreter/MoeInterpreter.scala
@@ -7,7 +7,7 @@ import org.moe.parser._
 
 import org.moe.interpreter.guts._
 
-class Interpreter {
+class MoeInterpreter {
 
   private var compiler  : PartialFunction[(MoeEnvironment, AST), MoeObject] = _
   private var evaluator : PartialFunction[(MoeEnvironment, AST), MoeObject] = _

diff --git a/src/main/scala/org/moe/interpreter/guts/Classes.scala b/src/main/scala/org/moe/interpreter/guts/Classes.scala
@@ -5,11 +5,9 @@ import org.moe.runtime._
 import org.moe.runtime.nativeobjects._
 import org.moe.ast._
 
-import InterpreterUtils._
+object Classes extends Utils {
 
-object Classes {
-
-  def declaration (i: Interpreter, r: MoeRuntime): PartialFunction[(MoeEnvironment, AST), MoeObject] = {
+  def declaration (i: MoeInterpreter, r: MoeRuntime): PartialFunction[(MoeEnvironment, AST), MoeObject] = {
     case (env, ClassDeclarationNode(name, superclass, body, version, authority)) => {
       val pkg = env.getCurrentPackage.getOrElse(
         throw new MoeErrors.PackageNotFound("__PACKAGE__")
@@ -76,7 +74,7 @@ object Classes {
     }
   }
 
-  def apply (i: Interpreter, r: MoeRuntime): PartialFunction[(MoeEnvironment, AST), MoeObject] = {
+  def apply (i: MoeInterpreter, r: MoeRuntime): PartialFunction[(MoeEnvironment, AST), MoeObject] = {
     case (env, ClassAccessNode(name)) => r.lookupClass(
       name, 
       env.getCurrentPackage.getOrElse(throw new MoeErrors.PackageNotFound("__PACKAGE__"))

diff --git a/src/main/scala/org/moe/interpreter/guts/CompilationUnits.scala b/src/main/scala/org/moe/interpreter/guts/CompilationUnits.scala
@@ -7,7 +7,7 @@ import org.moe.ast._
 
 object CompilationUnits {
 
-  def apply (i: Interpreter, r: MoeRuntime): PartialFunction[(MoeEnvironment, AST), MoeObject] = {
+  def apply (i: MoeInterpreter, r: MoeRuntime): PartialFunction[(MoeEnvironment, AST), MoeObject] = {
     case (env, CompilationUnitNode(body)) => i.eval(r, env, body)
     case (env, ScopeNode(body))           => i.compile_and_evaluate(new MoeEnvironment(Some(env)), body)
     case (env, StatementsNode(nodes))     => {

diff --git a/src/main/scala/org/moe/interpreter/guts/ElementAccess.scala b/src/main/scala/org/moe/interpreter/guts/ElementAccess.scala
@@ -7,11 +7,9 @@ import org.moe.ast._
 
 import scala.util.{Try, Success, Failure}
 
-import InterpreterUtils._
-
 object ElementAccess {
 
-  def apply (i: Interpreter, r: MoeRuntime): PartialFunction[(MoeEnvironment, AST), MoeObject] = {
+  def apply (i: MoeInterpreter, r: MoeRuntime): PartialFunction[(MoeEnvironment, AST), MoeObject] = {
 
     case (env, ArrayElementAccessNode(arrayName: String, indices: List[AST])) => {
       var array_value = env.get(arrayName) match {

diff --git a/src/main/scala/org/moe/interpreter/guts/Literals.scala b/src/main/scala/org/moe/interpreter/guts/Literals.scala
@@ -5,11 +5,9 @@ import org.moe.runtime._
 import org.moe.runtime.nativeobjects._
 import org.moe.ast._
 
-import InterpreterUtils._
+object Literals extends Utils {
 
-object Literals {
-
-  def apply (i: Interpreter, r: MoeRuntime): PartialFunction[(MoeEnvironment, AST), MoeObject] = {
+  def apply (i: MoeInterpreter, r: MoeRuntime): PartialFunction[(MoeEnvironment, AST), MoeObject] = {
     case (env, IntLiteralNode(value))     => r.NativeObjects.getInt(value)
     case (env, FloatLiteralNode(value))   => r.NativeObjects.getNum(value)
     case (env, StringLiteralNode(value))  => r.NativeObjects.getStr(value)

diff --git a/src/main/scala/org/moe/interpreter/guts/Operators.scala b/src/main/scala/org/moe/interpreter/guts/Operators.scala
@@ -5,11 +5,9 @@ import org.moe.runtime._
 import org.moe.runtime.nativeobjects._
 import org.moe.ast._
 
-import InterpreterUtils._
-
 object Operators {
 
-  def apply (i: Interpreter, r: MoeRuntime): PartialFunction[(MoeEnvironment, AST), MoeObject] = {
+  def apply (i: MoeInterpreter, r: MoeRuntime): PartialFunction[(MoeEnvironment, AST), MoeObject] = {
     // unary operators
 
     case (env, PrefixUnaryOpNode(lhs: AST, operator: String)) => {

diff --git a/src/main/scala/org/moe/interpreter/guts/Packages.scala b/src/main/scala/org/moe/interpreter/guts/Packages.scala
@@ -5,11 +5,9 @@ import org.moe.runtime._
 import org.moe.runtime.nativeobjects._
 import org.moe.ast._
 
-import InterpreterUtils._
-
 object Packages {
 
-  def declaration (i: Interpreter, r: MoeRuntime): PartialFunction[(MoeEnvironment, AST), MoeObject] = {
+  def declaration (i: MoeInterpreter, r: MoeRuntime): PartialFunction[(MoeEnvironment, AST), MoeObject] = {
     case (env, PackageDeclarationNode(name, body, version, authority)) => {
       val newEnv = new MoeEnvironment(Some(env))
       val parent = env.getCurrentPackage.getOrElse(throw new MoeErrors.PackageNotFound("__PACKAGE__"))

diff --git a/src/main/scala/org/moe/interpreter/guts/Signatures.scala b/src/main/scala/org/moe/interpreter/guts/Signatures.scala
@@ -4,11 +4,9 @@ import org.moe.interpreter._
 import org.moe.runtime._
 import org.moe.ast._
 
-import InterpreterUtils._
-
 object Signatures {
 
-  def declaration (i: Interpreter, r: MoeRuntime): PartialFunction[(MoeEnvironment, AST), MoeObject] = {
+  def declaration (i: MoeInterpreter, r: MoeRuntime): PartialFunction[(MoeEnvironment, AST), MoeObject] = {
     case (env, ParameterNode(name, optional, slurpy, named)) => (optional, slurpy, named) match {
       case (false, false, false) => new MoePositionalParameter(name)
       case (true,  false, false) => new MoeOptionalParameter(name)

diff --git a/src/main/scala/org/moe/interpreter/guts/Statements.scala b/src/main/scala/org/moe/interpreter/guts/Statements.scala
@@ -6,15 +6,13 @@ import org.moe.runtime.nativeobjects._
 import org.moe.ast._
 import org.moe.parser._
 
-import InterpreterUtils._
-
 import scala.io.Source
 
 object Statements {
 
   private val stub = new MoeObject()
 
-  def apply (i: Interpreter, r: MoeRuntime): PartialFunction[(MoeEnvironment, AST), MoeObject] = {
+  def apply (i: MoeInterpreter, r: MoeRuntime): PartialFunction[(MoeEnvironment, AST), MoeObject] = {
     case (env, UseStatement(name)) => {
       val path = r.findFilePathForPackageName(name).getOrElse(
         throw new MoeErrors.MoeProblems(

diff --git a/src/main/scala/org/moe/interpreter/guts/Subroutines.scala b/src/main/scala/org/moe/interpreter/guts/Subroutines.scala
@@ -5,11 +5,9 @@ import org.moe.runtime._
 import org.moe.runtime.nativeobjects._
 import org.moe.ast._
 
-import InterpreterUtils._
+object Subroutines extends Utils {
 
-object Subroutines {
-
-  def declaration (i: Interpreter, r: MoeRuntime): PartialFunction[(MoeEnvironment, AST), MoeObject] = {
+  def declaration (i: MoeInterpreter, r: MoeRuntime): PartialFunction[(MoeEnvironment, AST), MoeObject] = {
     case (env, SubroutineDeclarationNode(name, signature, body, traits)) => {
       val sig = i.compile(env, signature).asInstanceOf[MoeSignature]
       throwForUndeclaredVars(env, sig, body)
@@ -32,7 +30,7 @@ object Subroutines {
     }
   }
 
-  def apply (i: Interpreter, r: MoeRuntime): PartialFunction[(MoeEnvironment, AST), MoeObject] = {
+  def apply (i: MoeInterpreter, r: MoeRuntime): PartialFunction[(MoeEnvironment, AST), MoeObject] = {
     case (env, SubroutineCallNode(function_name, args)) => {
       val sub = r.lookupSubroutine(
         function_name, 

diff --git a/...rg/moe/interpreter/InterpreterUtils.scala → ...cala/org/moe/interpreter/guts/Utils.scala b/...rg/moe/interpreter/InterpreterUtils.scala → ...cala/org/moe/interpreter/guts/Utils.scala
@@ -1,15 +1,32 @@
-package org.moe.interpreter
+package org.moe.interpreter.guts
 
 import org.moe.runtime._
 import org.moe.ast._
 
-object InterpreterUtils {
-  def inNewEnv[T](env: MoeEnvironment)(body: MoeEnvironment => T): T = {
-    val newEnv = new MoeEnvironment(Some(env))
+trait Utils {
 
-    body(env)
+  // Throw an exception if a variable isn't closed over at declaration time
+  // This is to prevent variables in the same env but after declaration getting
+  // sucked into the closure and causing unexpected behavior.
+  def throwForUndeclaredVars(env: MoeEnvironment, signature: MoeSignature, body: StatementsNode): Unit = {
+      var declared: Set[String] = signature.getParams.map(_.getName).toSet
+      walkAST(
+        body,
+        { ast: AST =>
+          ast match {
+            case VariableDeclarationNode(varname, _) =>
+              declared += varname
+            case VariableAccessNode(varname) =>
+              if (!env.has(varname) && !declared(varname) && !env.isSpecialMarker(varname)) {
+                throw new MoeErrors.VariableNotFound(varname)
+              }
+            case _ => Unit
+          }
+        }
+      )
   }
 
+  // XXX - this no longer captures all the AST nodes anymore
   def walkAST(ast: AST, callback: (AST) => Unit): Unit = {
     callback(ast)
     ast match {
@@ -106,26 +123,6 @@ object InterpreterUtils {
     }
   }
 
-  // Throw an exception if a variable isn't closed over at declaration time
-  // This is to prevent variables in the same env but after declaration getting
-  // sucked into the closure and causing unexpected behavior.
-  def throwForUndeclaredVars(env: MoeEnvironment, signature: MoeSignature, body: StatementsNode): Unit = {
-      var declared: Set[String] = signature.getParams.map(_.getName).toSet
-      walkAST(
-        body,
-        { ast: AST =>
-          ast match {
-            case VariableDeclarationNode(varname, _) =>
-              declared += varname
-            case VariableAccessNode(varname) =>
-              if (!env.has(varname) && !declared(varname) && !env.isSpecialMarker(varname)) {
-                throw new MoeErrors.VariableNotFound(varname)
-              }
-            case _ => Unit
-          }
-        }
-      )
-  }
 
 }
 
diff --git a/src/main/scala/org/moe/interpreter/guts/Variables.scala b/src/main/scala/org/moe/interpreter/guts/Variables.scala
@@ -5,11 +5,9 @@ import org.moe.runtime._
 import org.moe.runtime.nativeobjects._
 import org.moe.ast._
 
-import InterpreterUtils._
-
 object Variables {
 
-  def declaration (i: Interpreter, r: MoeRuntime): PartialFunction[(MoeEnvironment, AST), MoeObject] = {
+  def declaration (i: MoeInterpreter, r: MoeRuntime): PartialFunction[(MoeEnvironment, AST), MoeObject] = {
     case (env, VariableDeclarationNode(name, expression)) => {
       val value = i.evaluate(env, expression)
       if (!MoeType.checkType(name, value)) throw new MoeErrors.IncompatibleType(
@@ -19,7 +17,7 @@ object Variables {
     }
   }
 
-  def apply (i: Interpreter, r: MoeRuntime): PartialFunction[(MoeEnvironment, AST), MoeObject] = {
+  def apply (i: MoeInterpreter, r: MoeRuntime): PartialFunction[(MoeEnvironment, AST), MoeObject] = {
     case (env, VariableAccessNode(name)) => env.get(name).getOrElse(
         if (name.startsWith("&")) {
           val function_name = name.drop(1)

diff --git a/src/main/scala/org/moe/runtime/MoeLazyEval.scala b/src/main/scala/org/moe/runtime/MoeLazyEval.scala
@@ -10,7 +10,7 @@ import org.moe.ast._
  */
 
 class MoeLazyEval (
-  interpreter: Interpreter,
+  interpreter: MoeInterpreter,
   runtime: MoeRuntime,
   env: MoeEnvironment,
   node: AST

diff --git a/src/main/scala/org/moe/runtime/MoeRuntime.scala b/src/main/scala/org/moe/runtime/MoeRuntime.scala
@@ -11,7 +11,7 @@ class MoeRuntime (
     private val system: MoeSystem = new MoeSystem(),
     private val warnings: Boolean = true,
     private val debug: Boolean = false,
-    private val interpreter: Option[Interpreter] = None 
+    private val interpreter: Option[MoeInterpreter] = None 
   ) extends MoeObject {
 
   private val VERSION         = "0.0.0"

diff --git a/src/main/scala/org/moe/runtime/builtins/IntClass.scala b/src/main/scala/org/moe/runtime/builtins/IntClass.scala
@@ -2,7 +2,6 @@ package org.moe.runtime.builtins
 
 import org.moe.runtime._
 import org.moe.runtime.nativeobjects._
-import org.moe.interpreter.InterpreterUtils._
 
 /**
   * setup class Int

diff --git a/src/main/scala/org/moe/runtime/builtins/NumClass.scala b/src/main/scala/org/moe/runtime/builtins/NumClass.scala
@@ -2,7 +2,6 @@ package org.moe.runtime.builtins
 
 import org.moe.runtime._
 import org.moe.runtime.nativeobjects._
-import org.moe.interpreter.InterpreterUtils._
 
 /**
   * setup class Num 

diff --git a/src/test/scala/org/moe/interpreter/InterpreterTestUtils.scala b/src/test/scala/org/moe/interpreter/InterpreterTestUtils.scala
@@ -12,11 +12,11 @@ trait InterpreterTestUtils
   with BeforeAndAfter
   with ShouldMatchers {
 
-  var interpreter : Interpreter = _
+  var interpreter : MoeInterpreter = _
   var runtime : MoeRuntime = _
 
   before {
-    interpreter = new Interpreter()
+    interpreter = new MoeInterpreter()
     runtime = new MoeRuntime()
     runtime.bootstrap()
   }

diff --git a/src/test/scala/org/moe/interpreter/InterpreterUtilsTestSuite.scala b/src/test/scala/org/moe/interpreter/InterpreterUtilsTestSuite.scala
@@ -1,13 +1,14 @@
 package org.moe.interpreter
 
 import org.moe.ast._
+import org.moe.interpreter.guts._
 
 import org.scalatest.FunSuite
 import org.scalatest.matchers._
 
 import scala.util.parsing.json._
 
-class InterpreterUtilsTestSuite extends FunSuite with ShouldMatchers {
+class InterpreterUtilsTestSuite extends FunSuite with ShouldMatchers with Utils {
   test("... test walking ASTs") {
     var cb_count = 0
     var node_list: List[String] = List()
@@ -17,7 +18,7 @@ class InterpreterUtilsTestSuite extends FunSuite with ShouldMatchers {
         case JSONObject(map) => node_list ++= map.keys
       }
     }
-    InterpreterUtils.walkAST(
+    walkAST(
       StatementsNode(
         List(
           VariableDeclarationNode("$n", IntLiteralNode(0)),

diff --git a/src/test/scala/org/moe/parser/ParserTestUtils.scala b/src/test/scala/org/moe/parser/ParserTestUtils.scala
@@ -10,11 +10,11 @@ import org.scalatest.BeforeAndAfter
 
 trait ParserTestUtils extends FunSuite with BeforeAndAfter  {
 
-  var interpreter: Interpreter = _
+  var interpreter: MoeInterpreter = _
   var runtime : MoeRuntime = _
 
   before {
-    interpreter = new Interpreter()
+    interpreter = new MoeInterpreter()
     runtime = new MoeRuntime()
     runtime.bootstrap()
   }