special variables should not cause that to die

MoeOrganization · Apr 11, 2013 · e712210 · e712210
1 parent 6ef5fb6
commit e712210
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/main/scala/org/moe/interpreter/InterpreterUtils.scala b/src/main/scala/org/moe/interpreter/InterpreterUtils.scala
@@ -118,7 +118,7 @@ object InterpreterUtils {
             case VariableDeclarationNode(varname, _) =>
               declared += varname
             case VariableAccessNode(varname) =>
-              if (!env.has(varname) && !declared(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/runtime/MoeEnvironment.scala b/src/main/scala/org/moe/runtime/MoeEnvironment.scala
@@ -22,6 +22,11 @@ class MoeEnvironment(
     val Topic    = "$_"
   }
 
+  def isSpecialMarker(m: String) = 
+    m == Markers.Runtime || m == Markers.Package  || 
+    m == Markers.Class   || m == Markers.Invocant || 
+    m == Markers.Topic
+
   private val pad: Map[String, MoeObject] = new HashMap[String, MoeObject]()
 
   def getCurrentRuntime  : Option[MoeRuntime] = getAs[MoeRuntime](Markers.Runtime)