Fixed lambdas that have the same name as one of their parameters/locals

frog/minfrog

 #!/usr/bin/env node
 //  ********** Library dart:core **************
 //  ********** Natives dart:core **************
 /**
  * Generates a dynamic call stub for a function.
  * Our goal is to create a stub method like this on-the-fly:
  *   function($0, $1, capture) { return this($0, $1, true, capture); }
  *
  * This stub then replaces the dynamic one on Function, with one that is
  * specialized for that particular function, taking into account its default
@@ skipping 2502 matching lines @@
   this.writer = new CodeWriter();
   this.needsThis = false;
   // Initializers done
   if (this.enclosingMethod != null) {
     this._scope = new BlockScope(this, this.enclosingMethod._scope, false);
     this.captures = new HashSetImplementation();
   }
   else {
     this._scope = new BlockScope(this, null, false);
   }
-  if (this.enclosingMethod != null && this.method.name != '') {
-    var m = this.method;
-    this._scope.create(m.name, m.get$functionType(), m.definition.span, true, false);
-  }
   this._usedTemps = new HashSetImplementation();
   this._freeTemps = [];
 }
 MethodGenerator.prototype.get$enclosingMethod = function() { return this.enclosingMethod; };
 MethodGenerator.prototype.set$enclosingMethod = function(value) { return this.enclosingMethod = value; };
 MethodGenerator.prototype.get$needsThis = function() { return this.needsThis; };
 MethodGenerator.prototype.set$needsThis = function(value) { return this.needsThis = value; };
 MethodGenerator.prototype.get$library = function() {
   return this.method.get$library();
 }
@@ skipping 376 matching lines @@
   this._scope = new BlockScope(this, this._scope, reentrant);
 }
 MethodGenerator.prototype._popBlock = function() {
   this._scope = this._scope.parent;
 }
 MethodGenerator.prototype._makeLambdaMethod = function(name, func) {
   var meth = new MethodMember(name, this.method.declaringType, func);
   meth.set$isLambda(true);
   meth.set$enclosingElement(this.method);
   meth.resolve$0();
-  $globals.world.gen.genMethod(meth, this);
   return meth;
 }
 MethodGenerator.prototype.visitBool = function(node) {
   return this.visitValue(node).convertTo$3(this, $globals.world.nonNullBool, node);
 }
 MethodGenerator.prototype.visitValue = function(node) {
   if (node == null) return null;
   var value = node.visit(this);
   value.checkFirstClass$1(node.span);
   return value;
@@ skipping 48 matching lines @@
     }
     else {
       value = value.convertTo$3(this, type, node.values.$index(i));
       this.writer.write(('' + val.get$code() + ' = ' + value.get$code()));
     }
   }
   this.writer.writeln(';');
   return false;
 }
 MethodGenerator.prototype.visitFunctionDefinition = function(node) {
-  var name = $globals.world.toJsIdentifier(node.name.name);
-  var meth = this._makeLambdaMethod(name, node);
-  var funcValue = this._scope.create(name, meth.get$functionType(), this.method.get$definition().get$span(), true, false);
+  var meth = this._makeLambdaMethod(node.name.name, node);
+  var funcValue = this._scope.create(meth.get$name(), meth.get$functionType(), this.method.get$definition().get$span(), true, false);
+  $globals.world.gen.genMethod(meth, this);
   meth.get$generator().writeDefinition$2(this.writer);
   return false;
 }
 MethodGenerator.prototype.visitReturnStatement = function(node) {
   if (node.value == null) {
     this.writer.writeln('return;');
   }
   else {
     if (this.method.get$isConstructor()) {
       $globals.world.error('return of value not allowed from constructor', node.span);
@@ skipping 353 matching lines @@
     outermostMethod._checkNonStatic(node);
     outermostMethod.set$needsThis(true);
     return new Value(outermostMethod.method.get$declaringType(), '\$this', node != null ? node.span : null, false);
   }
   else {
     this._checkNonStatic(node);
     return new Value(this.method.declaringType, 'this', node != null ? node.span : null, false);
   }
 }
 MethodGenerator.prototype.visitLambdaExpression = function(node) {
-  var name = '';
-  if (node.func.name != null) {
-    name = $globals.world.toJsIdentifier(node.func.name.name);
+  var name = (node.func.name != null) ? node.func.name.name : '';
+  var meth = this._makeLambdaMethod(name, node.func);
+  var lambdaGen = new MethodGenerator(meth, this);
+  if ($ne(name, '')) {
+    lambdaGen._scope.create(name, meth.get$functionType(), meth.definition.span, true, false);
+    lambdaGen._pushBlock(false);
   }
-  var meth = this._makeLambdaMethod(name, node.func);
+  lambdaGen.run();
   var w = new CodeWriter();
-  meth.get$generator().writeDefinition$2(w, node);
+  meth.generator.writeDefinition(w, node);
   return new Value(meth.get$functionType(), w.get$text(), node.span, true);
 }
 MethodGenerator.prototype.visitCallExpression = function(node) {
   var target;
   var position = node.target;
   var name = ':call';
   if ((node.target instanceof DotExpression)) {
     var dot = node.target;
     target = dot.self.visit(this);
     name = dot.name.name;
@@ skipping 9590 matching lines @@
 $inheritsMembers(_DoubleLinkedQueueEntrySentinel_KeyValuePair_K$V, DoubleLinkedQueueEntry_KeyValuePair_K$V);
 //  ********** Globals **************
 function $static_init(){
 }
 var const$0 = new NoMoreElementsException()/*const NoMoreElementsException()*/;
 var const$2 = new EmptyQueueException()/*const EmptyQueueException()*/;
 var const$3 = new _DeletedKeySentinel()/*const _DeletedKeySentinel()*/;
 var $globals = {};
 $static_init();
 main();