Provide enclosing element (method) for local function object, issue 145

frog/frogsh

 #!/usr/bin/env node
 //  ********** Library dart:core **************

[zundel, 2011/11/07 19:26:53]

I take it you don't mean to check in this file.

 //  ********** Natives core.js **************
 // Copyright (c) 2011, 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.
 
 // TODO(jimhug): Completeness - see tests/corelib
 
 /** Implements extends for dart classes on javascript prototypes. */
 function $inherits(child, parent) {
   if (child.prototype.__proto__) {
@@ skipping 794 matching lines @@
   var numberOfFreeOrDeleted = capacity - newNumberOfEntries;
   var numberOfFree = numberOfFreeOrDeleted - this._numberOfDeleted;
   if ($notnull_bool(this._numberOfDeleted > numberOfFree)) {
     this._grow(this._keys.length);
   }
 }
 HashMapImplementation._isPowerOfTwo = function(x) {
   return ((x & (x - 1)) == 0);
 }
 HashMapImplementation.prototype._grow = function(newCapacity) {
-  $assert(HashMapImplementation._isPowerOfTwo(newCapacity), "_isPowerOfTwo(newCapacity)", "/usr/local/google/home/ngeoffray/dart-all2/bleeding_edge/dart/corelib/src/implementation/hash_map_set.dart", 153, 12);
+  $assert(HashMapImplementation._isPowerOfTwo(newCapacity), "_isPowerOfTwo(newCapacity)", "/home/kasperl/Dart/dart/corelib/src/implementation/hash_map_set.dart", 153, 12);
   var capacity = this._keys.length;
   this._loadLimit = HashMapImplementation._computeLoadLimit(newCapacity);
   var oldKeys = this._keys;
   var oldValues = this._values;
   this._keys = new ListFactory(newCapacity);
   this._values = new ListFactory$V(newCapacity);
   for (var i = 0;
    $notnull_bool(i < capacity); i++) {
     var key = oldKeys.$index(i);
     if ($notnull_bool(key == null || key === HashMapImplementation._deletedKey)) {
@@ skipping 136 matching lines @@
   var numberOfFreeOrDeleted = capacity - newNumberOfEntries;
   var numberOfFree = numberOfFreeOrDeleted - this._numberOfDeleted;
   if ($notnull_bool(this._numberOfDeleted > numberOfFree)) {
     this._grow(this._keys.length);
   }
 }
 HashMapImplementation$E$E._isPowerOfTwo = function(x) {
   return ((x & (x - 1)) == 0);
 }
 HashMapImplementation$E$E.prototype._grow = function(newCapacity) {
-  $assert(HashMapImplementation._isPowerOfTwo(newCapacity), "_isPowerOfTwo(newCapacity)", "/usr/local/google/home/ngeoffray/dart-all2/bleeding_edge/dart/corelib/src/implementation/hash_map_set.dart", 153, 12);
+  $assert(HashMapImplementation._isPowerOfTwo(newCapacity), "_isPowerOfTwo(newCapacity)", "/home/kasperl/Dart/dart/corelib/src/implementation/hash_map_set.dart", 153, 12);
   var capacity = this._keys.length;
   this._loadLimit = HashMapImplementation._computeLoadLimit(newCapacity);
   var oldKeys = this._keys;
   var oldValues = this._values;
   this._keys = new ListFactory(newCapacity);
   this._values = new ListFactory$E(newCapacity);
   for (var i = 0;
    $notnull_bool(i < capacity); i++) {
     var key = oldKeys.$index(i);
     if ($notnull_bool(key == null || key === HashMapImplementation._deletedKey)) {
@@ skipping 344 matching lines @@
   if ($notnull_bool(entry == null)) return null;
   return entry.get$element().get$value();
 }
 LinkedHashMapImplementation.prototype.getKeys = function() {
   var list = new ListFactory$K(this.get$length());
   var index = 0;
   this._list.forEach(function _(entry) {
     list.$setindex(index++, entry.key);
   }
   );
-  $assert(index == this.get$length(), "index == length", "/usr/local/google/home/ngeoffray/dart-all2/bleeding_edge/dart/corelib/src/implementation/linked_hash_map.dart", 75, 12);
+  $assert(index == this.get$length(), "index == length", "/home/kasperl/Dart/dart/corelib/src/implementation/linked_hash_map.dart", 75, 12);
   return list;
 }
 LinkedHashMapImplementation.prototype.getValues = function() {
   var list = new ListFactory$V(this.get$length());
   var index = 0;
   this._list.forEach(function _(entry) {
     list.$setindex(index++, entry.value);
   }
   );
-  $assert(index == this.get$length(), "index == length", "/usr/local/google/home/ngeoffray/dart-all2/bleeding_edge/dart/corelib/src/implementation/linked_hash_map.dart", 86, 12);
+  $assert(index == this.get$length(), "index == length", "/home/kasperl/Dart/dart/corelib/src/implementation/linked_hash_map.dart", 86, 12);
   return list;
 }
 LinkedHashMapImplementation.prototype.forEach = function(f) {
   this._list.forEach(function _(entry) {
     f(entry.key, entry.value);
   }
   );
 }
 LinkedHashMapImplementation.prototype.containsKey = function(key) {
   return this._map.containsKey(key);
@@ skipping 1593 matching lines @@
 }
 AbstractLink.prototype.prepend = function(element) {
   return LinkFactory.Link$factory(element, this);
 }
 AbstractLink.prototype.iterator = function() {
   return this.toList().iterator();
 }
 AbstractLink.prototype.printOn = function(buffer, separatedBy) {
   var $0;
   if ($notnull_bool(this.isEmpty())) return;
-  buffer.add($notnull_bool(this.get$head() == null) ? 'null' : this.get$head());
+  buffer.add(this.get$head());
   for (var link = this.get$tail();
    $notnull_bool(!$notnull_bool(link.isEmpty())); link = (($0 = link.get$tail()) && $0.is$Link())) {
     buffer.add(separatedBy);
     buffer.add(link.get$head());
   }
 }
 AbstractLink.prototype.toString = function() {
   var buffer = new StringBufferImpl("");
   buffer.add('[ ');
   this.printOn(buffer, ', ');
@@ skipping 5047 matching lines @@
 }
 ResolverTask.prototype.resolve = function(tree) {
   var $this = this; // closure support
   return this.measure((function () {
     var visitor = new ResolverVisitor($this.compiler);
     visitor.visit(tree);
     return visitor.mapping;
   })
   );
 }
-// ********** Code for ErrorMessages **************
-function ErrorMessages() {}
-ErrorMessages.canNotResolve = function(id) {
-  return ("cannot resolve " + id + "");
-}
-ErrorMessages.duplicateDefinition = function(id) {
-  return ("duplicate definition of " + id + "");
-}
 // ********** Code for ResolverVisitor **************
 function ResolverVisitor(compiler0) {
   this.compiler = compiler0;
   this.mapping = new HashMapImplementation$Node$Element();
   this.context = new Scope(new TopScope(compiler0.universe));
   // Initializers done
 }
-ResolverVisitor.prototype.fail = function(node, message) {
-  this.compiler.cancel(message);
+ResolverVisitor.prototype.fail = function(node) {
+  this.compiler.cancel(('cannot resolve ' + node + ''));
 }
 ResolverVisitor.prototype.visit = function(node) {
   if ($notnull_bool(node == null)) return null;
-  return node.accept(this);
+  var element = node.accept(this);
+  if ($notnull_bool(element != null)) {
+    this.mapping.$setindex(node, element);
+  }
+  return element;
 }
 ResolverVisitor.prototype.visitIn = function(node, scope) {
   this.context = scope;
   var element = this.visit(node);
   this.context = this.context.parent;
   return element;
 }
 ResolverVisitor.prototype.visitBlock = function(node) {
   this.visitIn(node.statements, new Scope(this.context));
 }
 ResolverVisitor.prototype.visitExpressionStatement = function(node) {
   this.visit(node.expression);
 }
 ResolverVisitor.prototype.visitFunctionExpression = function(node) {
-  if ($notnull_bool(!$notnull_bool(node.parameters.nodes.isEmpty()))) this.fail(node, "Unimplemented in the resolver");
+  if ($notnull_bool(!$notnull_bool(node.parameters.nodes.isEmpty()))) this.fail(node);
   var enclosingElement = this.visit(node.name);
   this.visitIn(node.body, new Scope.enclosing$ctor(this.context, enclosingElement));
   return enclosingElement;
 }
 ResolverVisitor.prototype.visitIdentifier = function(node) {
   var element = this.context.lookup(node.get$source());
-  if ($notnull_bool(element == null)) this.fail(node, ErrorMessages.canNotResolve(node));
-  this.useElement(node, element);
+  if ($notnull_bool(element == null)) this.fail(node);
   return element;
 }
 ResolverVisitor.prototype.visitIf = function(node) {
   this.visit(node.condition);
   this.visit(node.thenPart);
   this.visit(node.elsePart);
 }
 ResolverVisitor.prototype.visitSend = function(node) {
+  var $0;
   var target = null;
   this.visit(node.receiver);
   var name = node.selector.get$source();
   if ($notnull_bool($eq(name, const$231/*const SourceString('print')*/) || $eq(name, const$232/*const SourceString('+')*/) || $eq(name, const$233/*const SourceString('-')*/) || $eq(name, const$234/*const SourceString('*')*/) || $eq(name, const$235/*const SourceString('/')*/) || $eq(name, const$236/*const SourceString('~/')*/))) {
   }
   else {
-    this.visit(node.selector);
+    target = (($0 = this.visit(node.selector)) && $0.is$Element());
+    if ($notnull_bool(target == null)) {
+      this.fail(node);
+    }
   }
   this.visit(node.argumentsNode);
   return target;
 }
 ResolverVisitor.prototype.visitSendSet = function(node) {
   this.compiler.unimplemented('ResolverVisitor::visitSendSet');
 }
 ResolverVisitor.prototype.visitLiteralInt = function(node) {
 
 }
 ResolverVisitor.prototype.visitLiteralDouble = function(node) {
 
 }
 ResolverVisitor.prototype.visitLiteralBool = function(node) {
 
 }
 ResolverVisitor.prototype.visitLiteralString = function(node) {
 
 }
 ResolverVisitor.prototype.visitNodeList = function(node) {
   var $0;
   for (var link = node.nodes;
    $notnull_bool(!$notnull_bool(link.isEmpty())); link = (($0 = link.get$tail()) && $0.is$Link$Node())) {
     this.visit((($0 = link.get$head()) && $0.is$Node()));
   }
 }
 ResolverVisitor.prototype.visitOperator = function(node) {
-  this.fail(node, "Unimplemented in the resolver");
+  this.fail(node);
 }
 ResolverVisitor.prototype.visitReturn = function(node) {
   this.visit(node.expression);
   return null;
 }
 ResolverVisitor.prototype.visitTypeAnnotation = function(node) {
 
 }
 ResolverVisitor.prototype.visitVariableDefinitions = function(node) {
   var visitor = new VariableDefinitionsVisitor(node, this);
   visitor.visit(node.definitions);
 }
-ResolverVisitor.prototype.defineElement = function(node, element) {
+ResolverVisitor.prototype.setElement = function(node, element) {
   this.mapping.$setindex(node, element);
-  return this.context.add(element);
-}
-ResolverVisitor.prototype.useElement = function(node, element) {
-  this.mapping.$setindex(node, element);
+  this.context.add(element);
 }
 // ********** Code for VariableDefinitionsVisitor **************
 function VariableDefinitionsVisitor(definitions, resolver) {
   this.definitions = definitions;
   this.resolver = resolver;
   // Initializers done
 }
 VariableDefinitionsVisitor.prototype.visitSend = function(node) {
   var $0;
-  $assert(node.get$arguments().get$tail().isEmpty(), "node.arguments.tail.isEmpty()", "leg/resolver.dart", 158, 12);
+  $assert(node.get$arguments().get$tail().isEmpty(), "node.arguments.tail.isEmpty()", "leg/resolver.dart", 153, 12);
   var selector = node.selector;
   var name = selector.get$source();
-  $assert($eq(name, const$237/*const SourceString('=')*/), "name == const SourceString('=')", "leg/resolver.dart", 161, 12);
+  $assert($eq(name, const$237/*const SourceString('=')*/), "name == const SourceString('=')", "leg/resolver.dart", 156, 12);
   this.resolver.visit((($0 = node.get$arguments().get$head()) && $0.is$Node()));
   this.visit(node.receiver);
 }
 VariableDefinitionsVisitor.prototype.visitIdentifier = function(node) {
   var variableElement = new Element(node.get$source(), this.resolver.context.enclosingElement);
-  var existing = this.resolver.defineElement(node, variableElement);
-  if ($notnull_bool($ne(existing, variableElement))) {
-    this.resolver.fail(node, ErrorMessages.duplicateDefinition(node));
-  }
+  this.resolver.setElement(node, variableElement);
 }
 VariableDefinitionsVisitor.prototype.visitNodeList = function(node) {
   var $0;
   for (var link = node.nodes;
    $notnull_bool(!$notnull_bool(link.isEmpty())); link = (($0 = link.get$tail()) && $0.is$Link$Node())) {
     this.visit((($0 = link.get$head()) && $0.is$Node()));
   }
 }
 VariableDefinitionsVisitor.prototype.visit = function(node) {
   return node.accept(this);
@@ skipping 17 matching lines @@
   // Initializers done
 }
 Scope.enclosing$ctor.prototype = Scope.prototype;
 Scope.prototype.get$parent = function() { return this.parent; };
 Scope.prototype.lookup = function(name) {
   var element = this.elements.$index(name);
   if ($notnull_bool(element != null)) return element;
   return this.parent.lookup(name);
 }
 Scope.prototype.add = function(element) {
-  if ($notnull_bool(this.elements.containsKey(element.name))) return this.elements.$index(element.name);
   this.elements.$setindex(element.name, element);
-  return element;
 }
 // ********** Code for TopScope **************
 function TopScope(universe) {
   this.universe = universe;
   Scope.top$ctor.call(this);
   // Initializers done
 }
 $inherits(TopScope, Scope);
 TopScope.prototype.lookup = function(name) {
   return this.universe.find(name);
@@ skipping 10419 matching lines @@
       INTERFACE,
       LIBRARY,
       NATIVE,
       NEGATE,
       OPERATOR,
       SET,
       SOURCE,
       STATIC,
       TYPEDEF ]*/;
 main();