Verify that correct number of arguments was passed.

tools/dom/scripts/htmldartgenerator.py

 #!/usr/bin/python
 # 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.
 
 """This module provides shared functionality for the system to generate
 dart:html APIs from the IDL database."""
 
 import emitter
 from generator import AnalyzeOperation, ConstantOutputOrder, \
@@ skipping 180 matching lines @@
         self.EmitOperation(info, '_item')
       return
 
     if declare_only:
       self.DeclareOperation(info,
           self.SecureOutputType(info.type_name), method_name)
     else:
       self.EmitOperation(info, method_name)
 
   def _GenerateOverloadDispatcher(self,
+      info,
       signatures,
       is_void,
-      parameter_names,
       declaration,
       generate_call,
       is_optional,
       can_omit_type_check=lambda type, pos: False):
 
+    parameter_names = [p.name for p in info.param_infos]
+    number_of_required_in_dart = info.NumberOfRequiredInDart()
+
     body_emitter = self._members_emitter.Emit(
         '\n'
         '  $DECLARATION {\n'
         '$!BODY'
         '  }\n',
         DECLARATION=declaration)
 
     version = [0]
     def GenerateCall(signature_index, argument_count, checks):
       if checks:
@@ skipping 20 matching lines @@
       for i in range(0, argument_count):
         argument = signatures[signature_index][i]
         parameter_name = parameter_names[i]
         test_type = self._DartType(argument.type.id)
 
         if test_type in ['dynamic', 'Object']:
           checks.append('?%s' % parameter_name)
         elif not can_omit_type_check(test_type, i):
           checks.append('(%s is %s || %s == null)' % (
               parameter_name, test_type, parameter_name))
-        else:
-          for signature in signatures:
-            if (len(signature) <= i or signature[i].id not in
-                parameter_name.split('_OR_')):
-
-              checks.append('?%s' % parameter_name)
-              break
+        elif i >= number_of_required_in_dart:
+          checks.append('?%s' % parameter_name)
 
       # There can be multiple presence checks.  We need them all since a later
       # optional argument could have been passed by name, leaving 'holes'.
       checks.extend(['!?%s' % name for name in parameter_names[argument_count:]])
 
       GenerateCall(signature_index, argument_count, checks)
 
     # TODO: Optimize the dispatch to avoid repeated checks.
     if len(signatures) > 1:
       index_swaps = {}
@@ skipping 34 matching lines @@
           # Consider foo(x, optional y, [Default=NullString] optional z)
           # (as of now it's modelled after HTMLMediaElement.webkitAddKey).
           # y is optional in WebCore, while z is not.
           # In this case, if y was actually passed, we'd like to emit foo(x, y, z) invocation,
           # not foo(x, y).
           GenerateCall(0, argument_count, [check])
           argument_count = argument_position
       GenerateCall(0, argument_count, [])
 
   def _GenerateDispatcherBody(self,
+      info,
       operations,
-      parameter_names,
       declaration,
       generate_call,
       is_optional,
       can_omit_type_check=lambda type, pos: False):
 
     def GenerateCall(
         stmts_emitter, call_emitter, version, signature_index, argument_count):
       generate_call(
           stmts_emitter, call_emitter,
           version, operations[signature_index], argument_count)
 
     def IsOptional(signature_index, argument):
       return is_optional(operations[signature_index], argument)
 
     self._GenerateOverloadDispatcher(
+        info,
         [operation.arguments for operation in operations],
         operations[0].type.id == 'void',
-        parameter_names,
         declaration,
         GenerateCall,
         IsOptional,
         can_omit_type_check)
 
   def AdditionalImplementedInterfaces(self):
     # TODO: Include all implemented interfaces, including other Lists.
     implements = []
     if self._interface_type_info.list_item_type():
       item_type_info = self._type_registry.TypeInfo(
@@ skipping 90 matching lines @@
             constructor_info, name,
             constructor_info.idl_args[signature_index][:argument_count])
 
       def IsOptional(signature_index, argument):
         return self.IsConstructorArgumentOptional(argument)
 
       custom_factory_ctr = self._interface.id in _custom_factories
       constructor_full_name = constructor_info._ConstructorFullName(
           self._DartType)
       self._GenerateOverloadDispatcher(
+          constructor_info,
           constructor_info.idl_args,
           False,
-          [info.name for info in constructor_info.param_infos],
           emitter.Format('$(METADATA)$FACTORY_KEYWORD $CTOR($PARAMS)',
             FACTORY_KEYWORD=('factory' if not custom_factory_ctr else
                 'static %s' % constructor_full_name),
             CTOR=(('' if not custom_factory_ctr else '_factory')
                 + constructor_full_name),
             METADATA=metadata,
             PARAMS=constructor_info.ParametersDeclaration(self._DartType)),
           GenerateCall,
           IsOptional)
 
@@ skipping 136 matching lines @@
     if interface.parents:
       parent = interface.parents[0]
       if IsPureInterface(parent.type.id):
         walk(interface.parents)
       else:
         walk(interface.parents[1:])
     return result
 
   def _DartType(self, type_name):
     return self._type_registry.DartType(type_name)