Adjust method parameters in noSuchMethod helper stubs

lib/src/compiler/code_generator.dart

 // Copyright (c) 2015, 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.
 
 import 'dart:collection' show HashMap, HashSet;
 import 'dart:math' show min, max;
 
 import 'package:analyzer/analyzer.dart' hide ConstantEvaluator;
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/ast/token.dart' show Token, TokenType;
@@ skipping 76 matching lines @@
 
   // TODO(jmesserly): fuse this with notNull check.
   final _privateNames =
       new HashMap<LibraryElement, HashMap<String, JS.TemporaryId>>();
   final _initializingFormalTemps =
       new HashMap<ParameterElement, JS.TemporaryId>();
 
   final _dartxVar = new JS.Identifier('dartx');
   final _runtimeLibVar = new JS.Identifier('dart');
   final namedArgumentTemp = new JS.TemporaryId('opts');
+  final positionalArgumentsTemp = new JS.TemporaryId('positionalArgs');
 
   final _hasDeferredSupertype = new HashSet<ClassElement>();
 
   final _eagerTopLevelFields = new HashSet<Element>.identity();
 
   /// The  type provider from the current Analysis [context].
   final TypeProvider types;
 
   final LibraryElement dartCoreLibrary;
   final LibraryElement dartJSLibrary;
@@ skipping 1295 matching lines @@
   ///        noSuchMethod(Invocation invocation) => 3;
   ///     }
   ///
   /// It will generate an `eatFood` that looks like:
   ///
   ///     eatFood(food) {
   ///       return core.bool.as(this.noSuchMethod(
   ///           new dart.InvocationImpl('eatFood', [food])));
   ///     }
   JS.Method _implementMockMethod(ExecutableElement method) {
-    var positionalArgs = <JS.Identifier>[]
+    var normalArgs = <JS.Identifier>[]
       ..addAll(
-          method.type.normalParameterNames.map((a) => new JS.Identifier(a)))
+          method.type.normalParameterNames.map((a) => new JS.Identifier(a)));
+    var optionalArgs = <JS.Identifier>[]
       ..addAll(
           method.type.optionalParameterNames.map((a) => new JS.Identifier(a)));
-
-    var fnArgs = positionalArgs.toList();
+    var fnArgs = <JS.Identifier>[]..addAll(normalArgs)..addAll(optionalArgs);
 
     var invocationProps = <JS.Property>[];
     addProperty(String name, JS.Expression value) {
       invocationProps.add(new JS.Property(js.string(name), value));
     }
 
     if (method.type.namedParameterTypes.isNotEmpty) {
       fnArgs.add(namedArgumentTemp);
       addProperty('namedArguments', namedArgumentTemp);
     }
 
     if (method is MethodElement) {
       addProperty('isMethod', js.boolean(true));
     } else {
       var property = method as PropertyAccessorElement;
       if (property.isGetter) {
         addProperty('isGetter', js.boolean(true));
       } else if (property.isSetter) {
         addProperty('isSetter', js.boolean(true));
       }
     }
 
-    var fnBody =
+    var posDecl = js.statement('let # = #;',
+        [positionalArgumentsTemp, new JS.ArrayInitializer(normalArgs)]);
+
+    var fnBody = <JS.Statement>[posDecl];
+
+    if (optionalArgs.length > 0) {
+      final argTemp = new JS.TemporaryId('arg');
+      // Optional arguments must only be passed on to noSuchMethod if they were
+      // actually passed here. This code loops through them, pushing the ones
+      // that were actually passed.
+      var existenceCheckLoop = js.statement(
+          'for (let arg of #) { if (# !== void 0) { #.push(#); } }', [

[srawlins, 2016/08/01 18:30:38]

I think I need help on this line: `arg` needs to be the JS.TemporaryId from line
1448, but if I use:

'for (let # of #) { if (# !== void 0) { #.push(#); } }', and uncomment that arg
on line 1454, then ddc produces this error:

Error in MiniJsParser:
for (let # of #) { if (# !== void 0) { #.push(#); } }
         ^
         Expected ALPHA

#0      MiniJsParser.error (package:dev_compiler/src/js_ast/builder.dart:730:5)
#1      MiniJsParser.expectCategory
(package:dev_compiler/src/js_ast/builder.dart:693:30)
...

Any ideas?

+        //argTemp,
+        new JS.ArrayInitializer(optionalArgs),
+        argTemp,
+        positionalArgumentsTemp,
+        argTemp,
+      ]);
+      fnBody.add(existenceCheckLoop);
+    }
+
+    var nSMCall =
         js.call('this.noSuchMethod(new dart.InvocationImpl(#, #, #))', [
       _elementMemberName(method),
-      new JS.ArrayInitializer(positionalArgs),
+      positionalArgumentsTemp,
       new JS.ObjectInitializer(invocationProps)
     ]);
 
     if (!method.returnType.isDynamic) {
-      fnBody = js.call('#._check(#)', [_emitType(method.returnType), fnBody]);
+      nSMCall = js.call('#._check(#)', [_emitType(method.returnType), nSMCall]);
     }
 
-    var fn = new JS.Fun(fnArgs, js.statement('{ return #; }', [fnBody]),
+    fnBody.add(js.statement('return #', [nSMCall]));
+
+    var fn = new JS.Fun(fnArgs, js.statement('{ # }', [_statement(fnBody)]),
         typeParams: _emitTypeFormals(method.type.typeFormals));
 
     // TODO(jmesserly): generic type arguments will get dropped.
     // We have a similar issue with `dgsend` helpers.
     return new JS.Method(
         _elementMemberName(method,
             useExtension:
                 _extensionTypes.isNativeClass(method.enclosingElement)),
         _makeGenericFunction(fn),
         isGetter: method is PropertyAccessorElement && method.isGetter,
@@ skipping 3899 matching lines @@
 }
 
 bool isLibraryPrefix(Expression node) =>
     node is SimpleIdentifier && node.staticElement is PrefixElement;
 
 LibraryElement _getLibrary(AnalysisContext c, String uri) =>
     c.computeLibraryElement(c.sourceFactory.forUri(uri));
 
 bool _isDartRuntime(LibraryElement l) =>
     l.isInSdk && l.source.uri.toString() == 'dart:_runtime';