Infrastructure: Bump Headless and ParserJS for 7.0.4 release

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/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

@@ -89,13 +89,13 @@ module.exports =
         minPycor: minPycor,
         maxPxcor: maxPxcor,
         maxPycor: maxPycor,
-        linkBreeds: @breedManager.orderedLinkBreeds(),
+        linkBreeds: @breedManager.orderedLinkBreeds().filter((b) -> b isnt "LINKS"),
         linkShapeList: @linkShapeMap,
         patchSize: @patchSize,
         patchesAllBlack: @_patchesAllBlack,
         patchesWithLabels: @_patchesWithLabels,
         ticks: -1,
-        turtleBreeds: @breedManager.orderedTurtleBreeds(),
+        turtleBreeds: @breedManager.orderedTurtleBreeds().filter((b) -> b isnt "TURTLES"),
         turtleShapeList: @turtleShapeMap,
         unbreededLinksAreDirected: false
         wrappingAllowedInX: wrappingAllowedInX,
@@ -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