Add report

Author: qiemem

src/main/LevelsSpace.java

@@ -59,6 +59,7 @@ public void actionPerformed(ActionEvent arg0) {
     public void load(PrimitiveManager primitiveManager) throws ExtensionException {
         primitiveManager.addPrimitive("ask", new Ask());
         primitiveManager.addPrimitive("of", new Of());
+        primitiveManager.addPrimitive("report", new Report());
         primitiveManager.addPrimitive("load-headless-model", new LoadModel<HeadlessChildModel>(HeadlessChildModel.class));
         primitiveManager.addPrimitive("load-gui-model", new LoadModel<GUIChildModel>(GUIChildModel.class));
         primitiveManager.addPrimitive("name-of", new ModelName());
@@ -270,6 +271,31 @@ public Object report(Argument args[], Context context) throws LogoException, Ext
         }
     }
 
+    public static class Report extends DefaultReporter {
+        @Override
+        public Syntax getSyntax() {
+            return Syntax.reporterSyntax(
+                    new int[]{
+                            Syntax.NumberType() | Syntax.ListType(),
+                            Syntax.ReporterTaskType() | Syntax.StringType(),
+                            Syntax.WildcardType() | Syntax.RepeatableType()
+                    },
+                    Syntax.WildcardType(),
+                    2
+            );
+        }
+        public Object report(Argument args[], Context context) throws LogoException, ExtensionException {
+            LogoListBuilder results = new LogoListBuilder();
+            String reporter = args[1].getString();
+            Object[] actuals = getActuals(args, 2);
+            for (ChildModel model : toModelList(args[0])){
+                results.add(model.of(reporter, actuals));
+            }
+            LogoList returnValue = results.toLogoList();
+            return args[0].get() instanceof Double ? returnValue.first() : returnValue;
+        }
+    }
+
     public static void askDescendant(LogoList modelTreePath, String command, Object[] args) throws ExtensionException, HaltException {
         ChildModel child = getModel(castToId(modelTreePath.first()));
         if (modelTreePath.size() == 1) {

tests.txt

@@ -31,13 +31,15 @@ ls-ask-and-of-work-for-single-models
   O> ls:ask 0 "crt 1"
   "count turtles" ls:of 0 => 1
 
-ls-ask-and-of-take-arguments
+ls-ask-and-report-take-arguments
   extensions [ ls ]
   O> ls:load-headless-model "Blank.nlogo"
   O> (ls:ask 0 "crt ?" 5)
   "count turtles" ls:of 0 => 5
   O> (ls:ask 0 "crt ?" 10)
   "count turtles" ls:of 0 => 15
+  (ls:report 0 "?" 5) => 5
+  (ls:report 0 "?1 + ?2" 5 6) => 11
 
 ls-ask-and-of-work-for-lists
   extensions [ ls ]