[inspector] add scope type for modules.

test/debugger/debug/harmony/modules-debug-scopes1.js

 // Copyright 2016 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // MODULE
-// Flags: --expose-debug-as debug --allow-natives-syntax --noanalyze-environment-liveness
+// Flags: --allow-natives-syntax --noanalyze-environment-liveness
 
 // These tests are copied from mjsunit/debug-scopes.js and adapted for modules.

[jgruber, 2016/12/12 13:23:48]

Nit: mjsunit -> debugger/

 
 
 var Debug = debug.Debug;
 
 var test_name;
 var listener_delegate;
 var listener_called;
 var exception;
 var begin_test_count = 0;
 var end_test_count = 0;
@@ skipping 44 matching lines @@
                         scope2.scopeObject().value());
 }
 
 function CheckFastAllScopes(scopes, exec_state)
 {
   var fast_all_scopes = exec_state.frame().allScopes(true);
   var length = fast_all_scopes.length;
   assertTrue(scopes.length >= length);
   for (var i = 0; i < scopes.length && i < length; i++) {
     var scope = fast_all_scopes[length - i - 1];
-    assertTrue(scope.isScope());
     assertEquals(scopes[scopes.length - i - 1], scope.scopeType());
   }
 }
 
 
 // Check that the scope chain contains the expected types of scopes.
 function CheckScopeChain(scopes, exec_state) {
   var all_scopes = exec_state.frame().allScopes();
   assertEquals(scopes.length, exec_state.frame().scopeCount());
   assertEquals(scopes.length, all_scopes.length,
                "FrameMirror.allScopes length");
   for (var i = 0; i < scopes.length; i++) {
     var scope = exec_state.frame().scope(i);
-    assertTrue(scope.isScope());
     assertEquals(scopes[i], scope.scopeType());
     assertScopeMirrorEquals(all_scopes[i], scope);
   }
   CheckFastAllScopes(scopes, exec_state);
 }
 
 
 // Check that the scope chain contains the expected names of scopes.
 function CheckScopeChainNames(names, exec_state) {
   var all_scopes = exec_state.frame().allScopes();
   assertEquals(names.length, all_scopes.length, "FrameMirror.allScopes length");
   for (var i = 0; i < names.length; i++) {
     var scope = exec_state.frame().scope(i);
-    assertTrue(scope.isScope());
     assertEquals(names[i], scope.details().name())
   }
 }
 
 
 // Check that the scope contains at least minimum_content. For functions just
 // check that there is a function.
 function CheckScopeContent(minimum_content, number, exec_state) {
   var scope = exec_state.frame().scope(number);
   var minimum_count = 0;
   for (var p in minimum_content) {
     var property_mirror = scope.scopeObject().property(p);
     assertFalse(property_mirror.isUndefined(),
                 'property ' + p + ' not found in scope');
-    if (typeof(minimum_content[p]) === 'function') {
-      assertTrue(property_mirror.value().isFunction());
-    } else {
-      assertEquals(minimum_content[p], property_mirror.value().value(),
-                   'property ' + p + ' has unexpected value');
-    }
+    assertEquals(minimum_content[p], property_mirror.value().value(),
+                 'property ' + p + ' has unexpected value');
     minimum_count++;
   }
 
   // 'arguments' and might be exposed in the local and closure scope. Just
   // ignore this.
   var scope_size = scope.scopeObject().properties().length;
   if (!scope.scopeObject().property('arguments').isUndefined()) {
     scope_size--;
   }
   // Ditto for 'this'.
@@ skipping 13 matching lines @@
   assertTrue(scope_size >= minimum_count);
 }
 
 // Check that the scopes have positions as expected.
 function CheckScopeChainPositions(positions, exec_state) {
   var all_scopes = exec_state.frame().allScopes();
   assertTrue(positions.length <= all_scopes.length,
              "FrameMirror.allScopes length");
   for (var i = 0; i < positions.length; i++) {
     var scope = exec_state.frame().scope(i);
-    assertTrue(scope.isScope());
     var position = positions[i];
     if (!position)
       continue;
 
     print(
         `Checking position.start = ${position.start}, .end = ${position.end}`);
     assertEquals(position.start, scope.details().startPosition())
     assertEquals(position.end, scope.details().endPosition())
   }
 }
@@ skipping 235 matching lines @@
   };
   return f;
 }
 
 listener_delegate = function(exec_state) {
   CheckScopeChain([debug.ScopeType.Local,
                    debug.ScopeType.Closure,
                    debug.ScopeType.Module,
                    debug.ScopeType.Script,
                    debug.ScopeType.Global], exec_state);
-  CheckScopeContent({a:1,b:2,x:3,y:4,f:function(){}}, 1, exec_state);
+  CheckScopeContent({a:1,b:2,x:3,y:4,f:undefined}, 1, exec_state);
   CheckScopeChainNames(["f", "closure_4", undefined, undefined, undefined],
                        exec_state)
 };
 closure_4(1, 2)();
 EndTest();
 
 
 
 // Simple closure formed by returning an inner function referering the outer
 // functions arguments. In the presence of eval all arguments and locals
@@ skipping 11 matching lines @@
   };
   return f;
 }
 
 listener_delegate = function(exec_state) {
   CheckScopeChain([debug.ScopeType.Local,
                    debug.ScopeType.Closure,
                    debug.ScopeType.Module,
                    debug.ScopeType.Script,
                    debug.ScopeType.Global], exec_state);
-  CheckScopeContent({a:1,b:2,x:3,y:4,f:function(){}}, 1, exec_state);
+  CheckScopeContent({a:1,b:2,x:3,y:4,f:undefined}, 1, exec_state);
   CheckScopeChainNames(["f", "closure_5", undefined, undefined, undefined],
                        exec_state)
 };
 closure_5(1, 2)();
 EndTest();
 
 
 // Two closures. Due to optimizations only the parts actually used are provided
 // through the debugger information.
 BeginTest("Closure 6");
@@ skipping 14 matching lines @@
 }
 
 listener_delegate = function(exec_state) {
   CheckScopeChain([debug.ScopeType.Local,
                    debug.ScopeType.Closure,
                    debug.ScopeType.Closure,
                    debug.ScopeType.Module,
                    debug.ScopeType.Script,
                    debug.ScopeType.Global], exec_state);
   CheckScopeContent({a:1}, 1, exec_state);
-  CheckScopeContent({f:function(){}}, 2, exec_state);
+  CheckScopeContent({f:undefined}, 2, exec_state);
   CheckScopeChainNames(
       [undefined, "f", "closure_6", undefined, undefined, undefined],
       exec_state);
 };
 closure_6(1, 2)();
 EndTest();
 
 
 // Two closures. In the presence of eval all information is provided as the
 // compiler cannot determine which parts are used.
@@ skipping 19 matching lines @@
 
 listener_delegate = function(exec_state) {
   CheckScopeChain([debug.ScopeType.Local,
                    debug.ScopeType.Closure,
                    debug.ScopeType.Closure,
                    debug.ScopeType.Module,
                    debug.ScopeType.Script,
                    debug.ScopeType.Global], exec_state);
   CheckScopeContent({}, 0, exec_state);
   CheckScopeContent({a:1,b:2,x:3,y:4}, 1, exec_state);
-  CheckScopeContent({a:1,b:2,x:3,y:4,f:function(){}}, 2, exec_state);
+  CheckScopeContent({a:1,b:2,x:3,y:4,f:undefined}, 2, exec_state);
   CheckScopeChainNames(
       [undefined, "f", "closure_7", undefined, undefined, undefined],
       exec_state);
 };
 closure_7(1, 2)();
 EndTest();
 
 
 // Closure that may be optimized out.
 BeginTest("Closure 8");
@@ skipping 341 matching lines @@
   CheckScopeChainPositions([{start: 89, end: 183}, {start: 27, end: 217}],
                            exec_state);
 }
 eval(code8);
 EndTest();
 
 assertEquals(begin_test_count, break_count,
              'one or more tests did not enter the debugger');
 assertEquals(begin_test_count, end_test_count,
              'one or more tests did not have its result checked');