Fix debugger eval for Script

* Fix debugger eval for Script
* Fix debugger eval scope for top-level scripts

Author: nicolas-albert

rhino-tools/src/main/java/org/mozilla/javascript/tools/debugger/Dim.java

@@ -17,14 +17,14 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import org.mozilla.javascript.Callable;
 import org.mozilla.javascript.Context;
 import org.mozilla.javascript.ContextAction;
 import org.mozilla.javascript.ContextFactory;
 import org.mozilla.javascript.ImporterTopLevel;
 import org.mozilla.javascript.Kit;
 import org.mozilla.javascript.NativeCall;
 import org.mozilla.javascript.NativeObject;
+import org.mozilla.javascript.Script;
 import org.mozilla.javascript.ScriptRuntime;
 import org.mozilla.javascript.Scriptable;
 import org.mozilla.javascript.ScriptableObject;
@@ -745,8 +745,15 @@ private static String do_eval(Context cx, StackFrame frame, String expr) {
         cx.setInterpretedMode(false);
         cx.setGeneratingDebug(false);
         try {
-            Callable script = (Callable) cx.compileString(expr, "", 0, null);
-            Object result = script.call(cx, frame.scope, frame.thisObj, ScriptRuntime.emptyArgs);
+            Scriptable scope = frame.scope;
+            if (!frame.isFunction && scope != null) {
+                Scriptable parentScope = scope.getParentScope();
+                if (parentScope != null) {
+                    scope = parentScope;
+                }
+            }
+            Script script = cx.compileString(expr, "", 0, null);
+            Object result = script.exec(cx, scope, frame.thisObj);
             if (result == Undefined.instance) {
                 resultString = "";
             } else {
@@ -896,7 +903,7 @@ public DebugFrame getFrame(Context cx, DebuggableScript fnOrScript) {
                 // Can not debug if source is not available
                 return null;
             }
-            return new StackFrame(cx, dim, item);
+            return new StackFrame(cx, dim, item, fnOrScript.isFunction());
         }
 
         /** Called when compilation is finished. */
@@ -974,6 +981,9 @@ public static class StackFrame implements DebugFrame {
         /** The 'this' object. */
         private Scriptable thisObj;
 
+        /** Whether this frame represents a function (vs a top-level script). */
+        private boolean isFunction;
+
         /** Information about the function. */
         private FunctionSource fsource;
 
@@ -984,10 +994,11 @@ public static class StackFrame implements DebugFrame {
         private int lineNumber;
 
         /** Creates a new StackFrame. */
-        private StackFrame(Context cx, Dim dim, FunctionSource fsource) {
+        private StackFrame(Context cx, Dim dim, FunctionSource fsource, boolean isFunction) {
             this.dim = dim;
             this.contextData = ContextData.get(cx);
             this.fsource = fsource;
+            this.isFunction = isFunction;
             this.breakpoints = fsource.sourceInfo().breakpoints;
             this.lineNumber = fsource.firstLine();
         }