Do not split attributes on getters and setters in databasebuilder.

lib/dom/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 303 matching lines @@
   return AnalyzeOperation(interface, handlers)
 
 def IsDartListType(type):
   return type == 'List' or type.startswith('sequence<')
 
 def IsDartCollectionType(type):
   return IsDartListType(type)
 
 def FindMatchingAttribute(interface, attr1):
   matches = [attr2 for attr2 in interface.attributes
-             if attr1.id == attr2.id
-             and attr1.is_fc_getter == attr2.is_fc_getter
-             and attr1.is_fc_setter == attr2.is_fc_setter]
+             if attr1.id == attr2.id]

[Anton Muhin, 2012/07/04 15:41:25]

should you check readonly'ness here?

[podivilov, 2012/07/04 16:32:47]

Nope, if attribute was declared with different "readonly'ness" in parent, we
still need to shadow it.

   if matches:
     assert len(matches) == 1
     return matches[0]
   return None
 
 
 def DartDomNameOfAttribute(attr):
   """Returns the Dart name for an IDLAttribute.
 
   attr.id is the 'native' or JavaScript name.
@@ skipping 117 matching lines @@
       return self.type_name + '.' + self.constructor_name
     else:
       return self.type_name
 
 
 def AttributeOutputOrder(a, b):
   """Canonical output ordering for attributes."""
     # Getters before setters:
   if a.id < b.id: return -1
   if a.id > b.id: return 1
-  if a.is_fc_setter < b.is_fc_setter: return -1
-  if a.is_fc_setter > b.is_fc_setter: return 1
+  if a.is_read_only < b.is_read_only: return -1

[Anton Muhin, 2012/07/04 15:41:25]

shouldn't you have a.is_read_only > b.is_read_only: return 1 her?

[podivilov, 2012/07/04 16:32:47]

Turned out this function isn't used at all :)

   return 0

[Anton Muhin, 2012/07/04 15:41:25]

overall, I'd rather code that as:

def AOO(a, b):
  return cmp([a.id, a.is_read_only], [b.id, b.is_read_only])

 
 def ConstantOutputOrder(a, b):
   """Canonical output ordering for constants."""
   if a.id < b.id: return -1
   if a.id > b.id: return 1
   return 0
 
 
 def _FormatNameList(names):
   """Returns JavaScript array literal expression with one name per line."""
@@ skipping 359 matching lines @@
 
   match = re.match(r'sequence<(\w+)>$', idl_type_name)
   if match:
     return SequenceIDLTypeInfo(idl_type_name, GetIDLTypeInfo(match.group(1)))
 
   match = re.match(r'(\w+)\[\]$', idl_type_name)
   if match:
     return SequenceIDLTypeInfo(idl_type_name, GetIDLTypeInfo(match.group(1)))
 
   return IDLTypeInfo(idl_type_name)