fixed issue Samsung#35

franktip · Apr 23, 2015 · b22943e · b22943e
1 parent 01e7dcc
commit b22943e
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 7 deletions.
diff --git a/src/js/frame.html b/src/js/frame.html
@@ -37,6 +37,12 @@
     //]_]
 </script>
 
+<script type="text/javascript">
+    //[_[
+    (function() { return fileExpand("../../node_modules/codemirror/mode/javascript/javascript.js")})
+    //]_]
+</script>
+
 <body>
 <a style="float:right;vertical-align: top;"
    href = "javascript:void(0)"
@@ -54,7 +60,8 @@ <h4>Results</h4>
         mode: 'javascript',
         lineNumbers: true,
         lineWrapping: true,
-        theme: "default"
+        theme: "default",
+        readOnly: true
     });
 
     parent.J$.Results.log = function(str) {

diff --git a/src/js/instrument/esnstrument.js b/src/js/instrument/esnstrument.js
@@ -1152,7 +1152,7 @@ if (typeof J$ === 'undefined') {
     function mergeBodies(node) {
         printIidToLoc(node);
         var ret = replaceInStatement(
-            "function n() { if (!" + logSampleFunName + "(" + RP + "1)){" + RP + "2} else {" + RP + "3}}",
+            "function n() { if (!" + logSampleFunName + "(" + RP + "1, arguments.callee)){" + RP + "2} else {" + RP + "3}}",
             getIid(),
             node.bodyOrig.body,
             node.body.body

diff --git a/src/js/mid.html b/src/js/mid.html
diff --git a/src/js/runtime/analysis.js b/src/js/runtime/analysis.js
@@ -691,9 +691,9 @@ if (typeof J$ === 'undefined') {
         return (lastComputedValue = left);
     }
 
-    function S(iid) {
+    function S(iid, f) {
         if (sandbox.analysis && sandbox.analysis.runInstrumentedFunctionBody) {
-            return sandbox.analysis.runInstrumentedFunctionBody(iid);
+            return sandbox.analysis.runInstrumentedFunctionBody(iid, f, f[SPECIAL_PROP_IID]);
         }
         return true;
     }

diff --git a/src/js/runtime/analysisCallbackTemplate.js b/src/js/runtime/analysisCallbackTemplate.js
@@ -39,7 +39,7 @@
     function MyAnalysis () {
         this.invokeFunPre = function(iid, f, base, args, isConstructor, isMethod, internalIid){return {f:f,base:base,args:args,skip:false};};
 
-        this.invokeFun = function(iid, f, base, args, result, isConstructor, isMethod, internalIid){return {result:result};};
+        this.invokeFun = function(iid, f, base, args, result, isConstructor, isMethod, functionIid){return {result:result};};
 
         this.literal = function(iid, val, hasGetterSetter) {return {result:val};};
 
@@ -91,7 +91,7 @@
 
         this.endExecution = function() {};
 
-        this.runInstrumentedFunctionBody = function(iid) {return false;}; // callback called only when instrumented with Config.ENABLE_SAMPLING = true
+        this.runInstrumentedFunctionBody = function(iid, f, functionIid) {return false;}; // callback called only when instrumented with Config.ENABLE_SAMPLING = true
                                                                          // if returns true, instrumented function body is executed, else uninstrumented function body is executed
 
         /**