WIP: DO NOT USE

Author: LaCuneta

build.sbt

@@ -2,9 +2,9 @@ import sbtcrossproject.CrossPlugin.autoImport.CrossType
 import sbtcrossproject.CrossProject
 import org.scalajs.sbtplugin.ScalaJSCrossVersion
 
-val nlDependencyVersion       = "7.0.2"
+val nlDependencyVersion       = "7.0.4-6897cd0"
 
-val parserJsDependencyVersion = "0.4.0-fad1812"
+val parserJsDependencyVersion = "0.4.0-6897cd0"
 
 val scalazVersion             = "7.2.36"
 

compiler/shared/src/main/scala/Prims.scala

@@ -9,6 +9,7 @@ import
   JsOps.{ indented, jsString, jsStringEscaped }
 
 import org.nlogo.core.{
+  Application,
   AstNode,
   CommandBlock,
   Expression,
@@ -19,7 +20,7 @@ import org.nlogo.core.{
   Statement,
   Syntax
 }
-import org.nlogo.core.prim.Lambda
+import org.nlogo.core.prim.{ Lambda, _symbol }
 
 import org.nlogo.tortoise.compiler.utils.CompilerErrors.failCompilation
 
@@ -99,6 +100,44 @@ trait PrimUtils {
     }
   }
 
+  // Check if a type mask allows SymbolType
+  private def allowsSymbolType(mask: Int): Boolean =
+    Arguments.isSupported(mask, Syntax.SymbolType)
+
+  // Extract symbol value from an expression if it's a symbol primitive
+  def compileExtensionArgs(app: Application, syntax: Syntax, useCompileArgs: Boolean)
+    (implicit compilerFlags: CompilerFlags, compilerContext: CompilerContext, procContext: ProcedureContext): String = {
+
+    val argTypes = if (syntax.isInfix) {
+      Seq(syntax.left) ++ syntax.right
+    } else {
+      syntax.right
+    }
+
+    def compileArg(arg: Expression): String =
+      arg match {
+        case r: ReporterApp   => handlers.reporter(r, useCompileArgs)
+        case b: ReporterBlock => handlers.reporter(b, useCompileArgs)
+        case c: CommandBlock  => s"() => { ${handlers.commands(c)} }"
+        case _                => handlers.reporter(arg, useCompileArgs)
+      }
+
+    val compiledArgs = app.args.zipWithIndex.map { case (arg, i) =>
+      val allowedTypes = if (i < argTypes.length) argTypes(i) else argTypes.last
+      if (allowsSymbolType(allowedTypes)) {
+        arg match {
+          case r: ReporterApp if r.reporter.isInstanceOf[_symbol] =>
+            jsString(r.reporter.token.text.toLowerCase)
+          case _ => compileArg(arg)
+        }
+      } else {
+        compileArg(arg)
+      }
+    }
+
+    compiledArgs.mkString(", ")
+  }
+
 }
 
 object ReporterPrims {
@@ -244,7 +283,7 @@ trait ReporterPrims extends PrimUtils {
         val ExtensionPrimRegex = """_externreport\(([^:]+):([^)]+)\)""".r
         (x.toString: @unchecked) match {
           case ExtensionPrimRegex(extName, primName) =>
-            s"Extensions[${jsString(extName)}].prims[${jsString(primName)}](${args.commas})"
+            s"Extensions[${jsString(extName)}].prims[${jsString(primName)}](${compileExtensionArgs(r, x.syntax, useCompileArgs)})"
         }
 
       case ra: prim.etc._range =>
@@ -621,7 +660,7 @@ trait CommandPrims extends PrimUtils {
         val ExtensionPrimRegex = """_extern\(([^:]+):([^)]+)\)""".r
         (x.toString: @unchecked) match {
           case ExtensionPrimRegex(extName, primName) =>
-            s"Extensions[${jsString(extName)}].prims[${jsString(primName)}](${args.commas});"
+            s"Extensions[${jsString(extName)}].prims[${jsString(primName)}](${compileExtensionArgs(s, x.syntax, useCompileArgs)});"
         }
 
       case _ if compilerFlags.generateUnimplemented =>

compiler/shared/src/main/scala/json/DrawingActionToJson.scala

@@ -134,8 +134,7 @@ class StampImageConverter(override protected val target: StampImage) extends Dra
             "size"      -> JsDouble(size),
             "x"         -> JsDouble(x),
             "y"         -> JsDouble(y),
-            "shapeName" -> JsString(shapeName),
-            "stampMode" -> JsString(stampMode)
+            "shapeName" -> JsString(shapeName)
           ))
 
         ("turtle", obj)
@@ -156,8 +155,7 @@ class StampImageConverter(override protected val target: StampImage) extends Dra
             "thickness" -> JsDouble(thickness),
             "directed?" -> JsBool(isDirected),
             "size"      -> JsDouble(size),
-            "hidden?"   -> JsBool(isHidden),
-            "stampMode" -> JsString(stampMode)
+            "hidden?"   -> JsBool(isHidden)
           ))
 
         ("link", obj)

compiler/shared/src/main/scala/utils/CompilerUtils.scala

@@ -5,8 +5,10 @@ package org.nlogo.tortoise.compiler.utils
 import org.nlogo.core.{ CompilerException, Token }
 
 object CompilerErrors {
+  val eof = Token.eof("")
+
   def failCompilation(msg: String): Nothing =
-    failCompilation(msg, Token.Eof.start, Token.Eof.end, Token.Eof.filename)
+    failCompilation(msg, eof.start, eof.end, eof.filename)
 
   def failCompilation(msg: String, token: Token): Nothing =
     failCompilation(msg, token.start, token.end, token.filename)

engine/src/main/coffee/engine/core/world.coffee

@@ -151,8 +151,7 @@ module.exports =
 
         @_config.resizeWorld()
 
-        # For some reason, JVM NetLogo doesn't restart `who` ordering after `resize-world`; even the test for this is existentially confused. --JAB (4/3/14)
-        @turtleManager._clearTurtlesSuspended()
+        @turtleManager.clearTurtles()
 
         @setTopology(wrapsInX, wrapsInY, minPxcor, maxPxcor, minPycor, maxPycor)
         @_createPatches()

engine/src/main/coffee/engine/updater.coffee

@@ -79,13 +79,13 @@ module.exports =
       return
 
     # (Number, Number, Number, Number, RGB, String, String) => Unit
-    registerTurtleStamp: (x, y, size, heading, color, shapeName, stampMode) =>
-      @_reportDrawingEvent({ type: "stamp-image", agentType: "turtle", stamp: { x, y, size, heading, color, shapeName, stampMode } })
+    registerTurtleStamp: (x, y, size, heading, color, shapeName) =>
+      @_reportDrawingEvent({ type: "stamp-image", agentType: "turtle", stamp: { x, y, size, heading, color, shapeName } })
       return
 
     # (Number, Number, Number, Number, Number, Number, Number, RGB, String, Number, Boolean, Number, Boolean, String) => Unit
-    registerLinkStamp: (x1, y1, x2, y2, midpointX, midpointY, heading, color, shapeName, thickness, isDirected, size, isHidden, stampMode) =>
-      @_reportDrawingEvent({ type: "stamp-image", agentType: "link", stamp: { x1, y1, x2, y2, midpointX, midpointY, heading, color, shapeName, thickness, 'directed?': isDirected, size, 'hidden?': isHidden, stampMode } })
+    registerLinkStamp: (x1, y1, x2, y2, midpointX, midpointY, heading, color, shapeName, thickness, isDirected, size, isHidden) =>
+      @_reportDrawingEvent({ type: "stamp-image", agentType: "link", stamp: { x1, y1, x2, y2, midpointX, midpointY, heading, color, shapeName, thickness, 'directed?': isDirected, size, 'hidden?': isHidden } })
       return
 
     # (UpdateEntry, Number) => Unit