added forObjectPost

src/ch.usi.inf.nodeprof/js/analysis/forinof/analysis.js

@@ -21,6 +21,9 @@
         this.forObject = function (iid, isForIn) {
             console.log('forObject@', J$.iidToLocation(iid), isForIn, lastExprResult);
         }
+        this.forObjectPost = function (iid, isForIn) {
+            console.log('forObjectPost@', J$.iidToLocation(iid), isForIn);
+        }
         this.endExpression = function (iid, type, result) {
             lastExprResult = result;
         }

src/ch.usi.inf.nodeprof/js/analysis/forinof/minitests.forinof.js.expected

@@ -1,2 +1,4 @@
 forObject@ (src/ch.usi.inf.nodeprof.test/js/minitests/forinof.js:6:1:7:2) true { x: 'valueX', y: 'valueY' }
+forObjectPost@ (src/ch.usi.inf.nodeprof.test/js/minitests/forinof.js:6:1:7:2) true
 forObject@ (src/ch.usi.inf.nodeprof.test/js/minitests/forinof.js:11:1:12:2) false [ 41, 42, 43 ]
+forObjectPost@ (src/ch.usi.inf.nodeprof.test/js/minitests/forinof.js:11:1:12:2) false

src/ch.usi.inf.nodeprof/js/analysis/trivial/emptyTemplate.js

@@ -171,6 +171,8 @@
              **/
             this.forObject = function (iid, isForIn) {
             }
+            this.forObjectPost = function (iid, isForIn) {
+            }
 
             /**
              * This callback is called before a value is returned from a function using the <tt>return</tt> keyword.

src/ch.usi.inf.nodeprof/src/ch/usi/inf/nodeprof/jalangi/JalangiAnalysis.java

@@ -121,6 +121,7 @@ public class JalangiAnalysis {
             put("evalFunctionPost", EnumSet.of(BUILTIN));
 
             put("forObject", EnumSet.of(CF_ROOT));
+            put("forObjectPost", EnumSet.of(CF_ROOT));
 
             put("_return", EnumSet.of(CF_BRANCH));
 
@@ -271,10 +272,10 @@ public void onReady() {
                             new EvalFunctionFactory(this.jsAnalysis, callbacks.get("evalFunctionPre"), callbacks.get("evalFunctionPost")));
         }
 
-        if (this.callbacks.containsKey("forObject")) {
+        if (this.callbacks.containsKey("forObject") || this.callbacks.containsKey("forObjectPost")) {
             this.instrument.onCallback(
                             ProfiledTagEnum.CF_ROOT,
-                            new ForObjectFactory(this.jsAnalysis, callbacks.get("forObject")));
+                            new ForObjectFactory(this.jsAnalysis, callbacks.get("forObject"), callbacks.get("forObjectPost")));
         }
 
         /**

src/ch.usi.inf.nodeprof/src/ch/usi/inf/nodeprof/jalangi/factory/ForObjectFactory.java

@@ -24,14 +24,15 @@
 import ch.usi.inf.nodeprof.handlers.LoopEventHandler;
 
 public class ForObjectFactory extends AbstractFactory {
-    public ForObjectFactory(Object jalangiAnalysis, DynamicObject pre) {
-        super("forObject", jalangiAnalysis, pre, null, 2, -1);
+    public ForObjectFactory(Object jalangiAnalysis, DynamicObject pre, DynamicObject post) {
+        super("forObject", jalangiAnalysis, pre, post, 2, 2);
     }
 
     @Override
     public BaseEventHandlerNode create(EventContext context) {
         return new LoopEventHandler(context) {
             @Child DirectCallNode preCall = createPreCallNode();
+            @Child DirectCallNode postCall = createPostCallNode();
 
             @Override
             public void executePre(VirtualFrame frame,
@@ -42,6 +43,16 @@ public void executePre(VirtualFrame frame,
                     directCall(preCall, true, getSourceIID());
                 }
             }
+
+            @Override
+            public void executePost(VirtualFrame frame, Object result, Object[] inputs) {
+                if (post != null && (isForIn() || isForOf())) {
+                    setPostArguments(0, getSourceIID());
+                    setPostArguments(1, isForIn());
+                    directCall(postCall, true, getSourceIID());
+                }
+
+            }
         };
     }