Refactor common functionality.

lib/html/scripts/generator.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 systems to generate
 Dart APIs from the IDL database."""
 
 import copy
 import re
@@ skipping 328 matching lines @@
     overloads: A list of IDL operation overloads with the same name.
     name: A string, the simple name of the operation.
     constructor_name: A string, the name of the constructor iff the constructor
        is named, e.g. 'fromList' in  Int8Array.fromList(list).
     type_name: A string, the name of the return type of the operation.
     param_infos: A list of ParamInfo.
   """
 
   def ParametersInterfaceDeclaration(self, rename_type):
     """Returns a formatted string declaring the parameters for the interface."""
-    def type_function(param):
-      # TODO(podivilov): replace param.dart_type field with param.is_optional
-      dart_type = param.dart_type
-      if dart_type != 'Dynamic':
-        dart_type = rename_type(dart_type)
-      return TypeOrNothing(dart_type, param.type_id)
-    return self._FormatParams(self.param_infos, type_function)
+    return self._FormatParams(self.param_infos, rename_type, True)
 
   def ParametersImplementationDeclaration(self, rename_type):
     """Returns a formatted string declaring the parameters for the
     implementation.
 
     Args:
       rename_type: A function that allows the types to be renamed.
         The function is applied to the parameter's dart_type.
     """
-    def type_function(param):
-      # TODO(podivilov): replace param.dart_type field with param.is_optional
-      dart_type = param.dart_type
-      if dart_type != 'Dynamic':
-        dart_type = rename_type(dart_type)
-      return TypeOrNothing(dart_type)
-    return self._FormatParams(self.param_infos, type_function)
+    return self._FormatParams(self.param_infos, rename_type, False)
 
   def ParametersAsArgumentList(self, parameter_count = None):
     """Returns a string of the parameter names suitable for passing the
     parameters as arguments.
     """
     if parameter_count is None:
       parameter_count = len(self.param_infos)
     return ', '.join(map(
         lambda param_info: param_info.name,
         self.param_infos[:parameter_count]))
 
-  def _FormatParams(self, params, type_fn):
+  def _FormatParams(self, params, rename_type, provide_comments):

[Anton Muhin, 2012/10/17 12:30:16]

we can simplify logic even further if we unify interface and implementation
declarations which looks like a good thing imho

[podivilov, 2012/10/17 12:38:04]

I agree.

     def FormatParam(param):
-      """Returns a parameter declaration fragment for an ParamInfo."""
-      return '%s%s' % (type_fn(param), param.name)
+      # TODO(podivilov): replace param.dart_type field with param.is_optional
+      dart_type = param.dart_type
+      if dart_type != 'Dynamic':
+        dart_type = rename_type(dart_type)
+      type = TypeOrNothing(dart_type, param.type_id if provide_comments else None)
+      return '%s%s' % (type, param.name)
 
     required = []
     optional = []
     for param_info in params:
       if param_info.is_optional:
         optional.append(param_info)
       else:
         if optional:
           raise Exception('Optional parameters cannot precede required ones: '
                           + str(params))
@@ skipping 706 matching lines @@
             self._database.GetInterface(type_name))
       else:
         dart_interface_name = type_name
       return InterfaceIDLTypeInfo(type_name, type_data, dart_interface_name)
 
     if type_data.clazz == 'ListLike':
       return ListLikeIDLTypeInfo(type_name, type_data, self.TypeInfo(type_data.item_type))
 
     class_name = '%sIDLTypeInfo' % type_data.clazz
     return globals()[class_name](type_name, type_data)