qualify core types: Object, Error, Symbol

lib/src/js/nodes.dart

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 part of js_ast;
 
 abstract class NodeVisitor<T> {
   T visitProgram(Program node);
 
   T visitBlock(Block node);
@@ skipping 973 matching lines @@
 
   static bool foundIn(Node node) {
     _thisFinder.found = false;
     node.accept(_thisFinder);
     return _thisFinder.found;
   }
 }
 
 final _thisFinder = new _ThisFinder();
 class _ThisFinder extends BaseVisitor {
+  int nested = 0;
   bool found = false;
   visitThis(This node) {
-    found = true;
+    if (nested <= 1) found = true;
+  }
+  visitFunctionExpression(FunctionExpression node) {

[ochafik, 2015/09/15 18:05:17]

Does FunctionExpression include arrow functions? (if so, they shouldn't increase
the nesting?)

(also, did you mean to include this change in this patchset?)

+    for (var param in node.params) {
+      param.accept(this);
+    }
+    ++nested;
+    node.body.accept(this);
+    --nested;
   }
   visitNode(Node node) {
     if (!found) super.visitNode(node);
   }
 }
 
 
 // `super` is more restricted in the ES6 spec, but for simplicity we accept
 // it anywhere that `this` is accepted.
 class Super extends Expression {
@@ skipping 16 matching lines @@
     function.accept(visitor);
   }
   NamedFunction _clone() => new NamedFunction(name, function);
 
   int get precedenceLevel => PRIMARY_LOW_PRECEDENCE;
 }
 
 abstract class FunctionExpression extends Expression {
   List<Parameter> get params;
   get body; // Expression or block
+
+  void visitChildren(NodeVisitor visitor) {
+    for (Parameter param in params) param.accept(visitor);
+    body.accept(visitor);
+  }
 }
 
 class Fun extends FunctionExpression {
   final List<Parameter> params;
   final Block body;
   /** Whether this is a JS generator (`function*`) that may contain `yield`. */
   final bool isGenerator;
 
   final AsyncModifier asyncModifier;
 
   Fun(this.params, this.body, {this.isGenerator: false,
       this.asyncModifier: const AsyncModifier.sync()});
 
   accept(NodeVisitor visitor) => visitor.visitFun(this);
 
-  void visitChildren(NodeVisitor visitor) {
-    for (Parameter param in params) param.accept(visitor);
-    body.accept(visitor);
-  }
-
   Fun _clone() => new Fun(params, body,
       isGenerator: isGenerator, asyncModifier: asyncModifier);
 
   int get precedenceLevel => PRIMARY_LOW_PRECEDENCE;
 }
 
 class ArrowFun extends FunctionExpression {
   final List<Parameter> params;
   final body; // Expression or Block
 
   bool _closesOverThis; // lazy initialized
 
   ArrowFun(this.params, this.body);
 
   accept(NodeVisitor visitor) => visitor.visitArrowFun(this);
 
-  void visitChildren(NodeVisitor visitor) {
-    for (Parameter param in params) param.accept(visitor);
-    body.accept(visitor);
-  }
   /// True if this function actually closes of `this`. We use this in some
   /// situations to generate different code.
   bool get closesOverThis {
     if (_closesOverThis == null) _closesOverThis = This.foundIn(this);
     return _closesOverThis;
   }
 
   int get precedenceLevel => PRIMARY_LOW_PRECEDENCE;
 
   ArrowFun _clone() => new ArrowFun(params, body);
@@ skipping 484 matching lines @@
   final Expression expression;
 
   CommentExpression(this.comment, this.expression);
 
   int get precedenceLevel => PRIMARY;
   accept(NodeVisitor visitor) => visitor.visitCommentExpression(this);
   CommentExpression _clone() => new CommentExpression(comment, expression);
 
   void visitChildren(NodeVisitor visitor) => expression.accept(visitor);
 }