Feature/Parity: Type checking for inspection prims

Author: LaCuneta

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

@@ -302,6 +302,8 @@ object SimplePrims {
         case _: prim.etc._importpcolorsrgb  => imperfect(c, "import-pcolors-rgb")
         case _: prim.etc._importworld       => imperfect(c, "import-world")
 
+        case _: prim.etc._stopinspectingdeadagents => "InspectionPrims.clearDead"
+
       }
   }
 
@@ -310,16 +312,15 @@ object SimplePrims {
       PartialFunction.condOpt(c) {
 
         // Turtle
-        case _: prim.etc._setxy => "PrimChecks.turtle.setXY"
-
+        case _: prim.etc._setxy        => "PrimChecks.turtle.setXY"
         // Random
-        case _: prim.etc._randomseed => "PrimChecks.math.randomSeed"
-
+        case _: prim.etc._randomseed   => "PrimChecks.math.randomSeed"
         // Other
-        case _: prim.etc._error => s"PrimChecks.errorPrim"
-
+        case _: prim.etc._error        => "PrimChecks.errorPrim"
         // World
         case _: prim.etc._setpatchsize => "PrimChecks.world.setPatchSize"
+        // Inspection
+        case _: prim.etc._inspect      => "PrimChecks.inspection.inspect"
 
       }
   }
@@ -341,6 +342,9 @@ object SimplePrims {
         case _: prim.etc._watch                 => "world.observer.watch"
         case _: prim.etc._resetperspective      => "world.observer.resetPerspective"
 
+        // Inspection
+        case _: prim.etc._stopinspecting           => "InspectionPrims.stopInspecting"
+
       }
   }
 
@@ -414,11 +418,6 @@ object SimplePrims {
         case _: prim.etc._setupplots             => "plotManager.setupPlots"
         case _: prim.etc._updateplots            => "plotManager.updatePlots"
 
-        // Inspection
-        case _: prim.etc._inspect                  => "InspectionPrims.inspect"
-        case _: prim.etc._stopinspecting           => "InspectionPrims.stopInspecting"
-        case _: prim.etc._stopinspectingdeadagents => "InspectionPrims.clearDead"
-
         // Misc.
         case _: prim.etc._clearall              => "world.clearAll"
         case _: prim.etc._clearallandresetticks => "world.clearAllAndResetTicks"

engine/src/main/coffee/engine/prim-checks/checker.coffee

@@ -5,39 +5,41 @@
 { checks }                       = require('../core/typechecker')
 { exceptionFactory: exceptions } = require('util/exception')
 
-AgentSetChecks  = require('./agentset-checks')
-ColorChecks     = require('./color-checks')
-ControlChecks   = require('./control-checks')
-LinkChecks      = require('./link-checks')
-ListChecks      = require('./list-checks')
-MathChecks      = require('./math-checks')
-PatchChecks     = require('./patch-checks')
-ProcedureChecks = require('./procedure-checks')
-TaskChecks      = require('./task-checks')
-TurtleChecks    = require('./turtle-checks')
-WorldChecks     = require('./world-checks')
-Validator       = require('./validator')
+AgentSetChecks   = require('./agentset-checks')
+ColorChecks      = require('./color-checks')
+ControlChecks    = require('./control-checks')
+LinkChecks       = require('./link-checks')
+ListChecks       = require('./list-checks')
+MathChecks       = require('./math-checks')
+PatchChecks      = require('./patch-checks')
+ProcedureChecks  = require('./procedure-checks')
+TaskChecks       = require('./task-checks')
+TurtleChecks     = require('./turtle-checks')
+InspectionChecks = require('./inspection-checks')
+WorldChecks      = require('./world-checks')
+Validator        = require('./validator')
 
 class Checker
 
   constructor: ( i18nBundle, dumper, miscPrims, listPrims, randomPrims, stringPrims
-               , procedurePrims, selfPrims, world) ->
+               , procedurePrims, selfPrims, inspectionPrims, world) ->
 
     getSelf = world.selfManager.self
 
-    @validator = new Validator(i18nBundle, dumper)
-    @agentset  = new AgentSetChecks(@validator, dumper, miscPrims, getSelf)
-    @color     = new ColorChecks(@validator)
-    @list      = new ListChecks(@validator, dumper, listPrims, stringPrims)
-    @math      = new MathChecks(@validator, randomPrims)
-    @procedure = new ProcedureChecks(@validator, procedurePrims)
-    @turtle    = new TurtleChecks( @validator, getSelf, world.turtleManager
+    @validator  = new Validator(i18nBundle, dumper)
+    @agentset   = new AgentSetChecks(@validator, dumper, miscPrims, getSelf)
+    @color      = new ColorChecks(@validator)
+    @list       = new ListChecks(@validator, dumper, listPrims, stringPrims)
+    @math       = new MathChecks(@validator, randomPrims)
+    @procedure  = new ProcedureChecks(@validator, procedurePrims)
+    @turtle     = new TurtleChecks( @validator, getSelf, world.turtleManager
                                  , world.breedManager)
-    @patch     = new PatchChecks(@validator, getSelf)
-    @link      = new LinkChecks(@validator, getSelf, selfPrims)
-    @task      = new TaskChecks(@validator)
-    @control   = new ControlChecks(@validator)
-    @world     = new WorldChecks(@validator, world)
+    @patch      = new PatchChecks(@validator, getSelf)
+    @link       = new LinkChecks(@validator, getSelf, selfPrims)
+    @task       = new TaskChecks(@validator)
+    @control    = new ControlChecks(@validator)
+    @inspection = new InspectionChecks(@validator, inspectionPrims)
+    @world      = new WorldChecks(@validator, world)
 
     @turtleOrLink = {
       getVariable: (sourceStart, sourceEnd, name) =>

engine/src/main/coffee/engine/prim-checks/inspection-checks.coffee

@@ -0,0 +1,18 @@
+# (C) Uri Wilensky. https://github.com/NetLogo/Tortoise
+
+{ Something } = require('brazier/maybe')
+{ exceptionFactory: exceptions } = require('util/exception')
+
+class InspectionChecks
+
+  constructor: (@validator, @prims) ->
+
+  # (Int, Int, Agent) => Unit
+  inspect: (sourceStart, sourceEnd, agent) ->
+    if agent.isDead()
+      throw exceptions.runtime("That #{agent.getBreedNameSingular()} is dead.", "inspect", Something(sourceStart), Something(sourceEnd))
+    else
+      @prims.inspect(agent)
+      return
+
+module.exports = InspectionChecks

engine/src/main/coffee/engine/prim/inspectionprims.coffee

@@ -10,9 +10,5 @@ module.exports.Config =
 module.exports.Prims =
   class InspectionPrims
     # (InspectionConfig) => InspectionPrims
-    constructor: ({ inspect, @stopInspecting, @clearDead }) ->
-      @inspect = (agent) ->
-        if not agent.isDead()
-          inspect(agent)
-        else
-          throw exceptions.runtime("That #{agent.getBreedNameSingular()} is dead.", "inspect")
+    constructor: ({ @inspect, @stopInspecting, @clearDead }) ->
+      return

engine/src/main/coffee/engine/workspace.coffee

@@ -112,7 +112,7 @@ module.exports =
 
     i18nBundle = new I18nBundle()
     primChecks = new PrimChecks( i18nBundle, dump, prims, listPrims, randomPrims
-                               , stringPrims, procedurePrims, selfPrims, world)
+                               , stringPrims, procedurePrims, selfPrims, inspectionPrims, world)
 
     importWorldFromCSV = (csvText) ->