Skip to content

Commit be6b6e0

Browse files
committed
Parity: Support __clear-all-and-reset-ticks legacy prim
We don't force people to remove it, so adding it here. Maybe a better way is to warn users in the front end, or just auto-replace it, but this works for now.
1 parent 89704e0 commit be6b6e0

File tree

3 files changed

+40
-32
lines changed

3 files changed

+40
-32
lines changed

build.sbt

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ import sbtcrossproject.CrossPlugin.autoImport.CrossType
22
import sbtcrossproject.CrossProject
33
import org.scalajs.sbtplugin.ScalaJSCrossVersion
44

5-
val nlDependencyVersion = "6.4.0-e625bb1"
5+
val nlDependencyVersion = "6.4.0-307f18b"
66

7-
val parserJsDependencyVersion = "0.4.0-e625bb1"
7+
val parserJsDependencyVersion = "0.4.0-307f18b"
88

99
val scalazVersion = "7.2.35"
1010

compiler/shared/src/main/scala/SimplePrims.scala

+31-30
Original file line numberDiff line numberDiff line change
@@ -405,36 +405,37 @@ object SimplePrims {
405405
case _: prim.etc._stopinspectingdeadagents => "InspectionPrims.clearDead"
406406

407407
// Misc.
408-
case _: prim.etc._clearall => "world.clearAll"
409-
case _: prim.etc._cleardrawing => "world.clearDrawing"
410-
case _: prim.etc._clearglobals => "world.observer.clearCodeGlobals"
411-
case _: prim.etc._clearpatches => "world.clearPatches"
412-
case _: prim.etc._clearturtles => "world.turtleManager.clearTurtles"
413-
case _: prim.etc._clearticks => "world.ticker.clear"
414-
case _: prim.etc._clearlinks => "world.clearLinks"
415-
case _: prim.etc._resizeworld => "world.resize"
416-
case _: prim.etc._setpatchsize => "world.setPatchSize"
417-
case _: prim.etc._resetticks => "world.ticker.reset"
418-
case _: prim.etc._tick => "world.ticker.tick"
419-
case _: prim.etc._tickadvance => "world.ticker.tickAdvance"
420-
case _: prim.etc._resettimer => "workspace.timer.reset"
421-
case _: prim.etc._follow => "world.observer.follow"
422-
case _: prim.etc._ride => "world.observer.ride"
423-
case _: prim.etc._watch => "world.observer.watch"
424-
case _: prim.etc._resetperspective => "world.observer.resetPerspective"
425-
case _: prim.etc._layoutspring => "LayoutManager.layoutSpring"
426-
case _: prim.etc._layoutcircle => "LayoutManager.layoutCircle"
427-
case _: prim.etc._layoutradial => "LayoutManager.layoutRadial"
428-
case _: prim.etc._layouttutte => "LayoutManager.layoutTutte"
429-
case _: prim.etc._changetopology => "world.changeTopology"
430-
case _: prim.etc._stdout => "Prims.stdout"
431-
case _: prim.etc._usermessage => "UserDialogPrims.confirm"
432-
case _: prim.etc._exportoutput => "ImportExportPrims.exportOutput"
433-
case _: prim.etc._exportplot => "ImportExportPrims.exportPlot"
434-
case _: prim.etc._exportplots => "ImportExportPrims.exportAllPlots"
435-
case _: prim.etc._exportview => "ImportExportPrims.exportView"
436-
case _: prim.etc._exportworld => "ImportExportPrims.exportWorld"
437-
case _: prim.etc._wait => "Prims.wait"
408+
case _: prim.etc._clearall => "world.clearAll"
409+
case _: prim.etc._clearallandresetticks => "world.clearAllAndResetTicks"
410+
case _: prim.etc._cleardrawing => "world.clearDrawing"
411+
case _: prim.etc._clearglobals => "world.observer.clearCodeGlobals"
412+
case _: prim.etc._clearpatches => "world.clearPatches"
413+
case _: prim.etc._clearturtles => "world.turtleManager.clearTurtles"
414+
case _: prim.etc._clearticks => "world.ticker.clear"
415+
case _: prim.etc._clearlinks => "world.clearLinks"
416+
case _: prim.etc._resizeworld => "world.resize"
417+
case _: prim.etc._setpatchsize => "world.setPatchSize"
418+
case _: prim.etc._resetticks => "world.ticker.reset"
419+
case _: prim.etc._tick => "world.ticker.tick"
420+
case _: prim.etc._tickadvance => "world.ticker.tickAdvance"
421+
case _: prim.etc._resettimer => "workspace.timer.reset"
422+
case _: prim.etc._follow => "world.observer.follow"
423+
case _: prim.etc._ride => "world.observer.ride"
424+
case _: prim.etc._watch => "world.observer.watch"
425+
case _: prim.etc._resetperspective => "world.observer.resetPerspective"
426+
case _: prim.etc._layoutspring => "LayoutManager.layoutSpring"
427+
case _: prim.etc._layoutcircle => "LayoutManager.layoutCircle"
428+
case _: prim.etc._layoutradial => "LayoutManager.layoutRadial"
429+
case _: prim.etc._layouttutte => "LayoutManager.layoutTutte"
430+
case _: prim.etc._changetopology => "world.changeTopology"
431+
case _: prim.etc._stdout => "Prims.stdout"
432+
case _: prim.etc._usermessage => "UserDialogPrims.confirm"
433+
case _: prim.etc._exportoutput => "ImportExportPrims.exportOutput"
434+
case _: prim.etc._exportplot => "ImportExportPrims.exportPlot"
435+
case _: prim.etc._exportplots => "ImportExportPrims.exportAllPlots"
436+
case _: prim.etc._exportview => "ImportExportPrims.exportView"
437+
case _: prim.etc._exportworld => "ImportExportPrims.exportWorld"
438+
case _: prim.etc._wait => "Prims.wait"
438439

439440
case _: prim.etc._importdrawing => "ImportExportPrims.importDrawing"
440441

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

+7
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,13 @@ module.exports =
211211
)
212212
return
213213

214+
# This is a "legacy prim" that could be auto-inserted by the code converter in NetLogo 5 -Jeremy B 2023
215+
# () => Unit
216+
clearAllAndResetTicks: ->
217+
@clearAll()
218+
@ticker.reset()
219+
return
220+
214221
# () => Unit
215222
clearDrawing: ->
216223
@_updater.clearDrawing()

0 commit comments

Comments
 (0)