Do not split attributes on getters and setters in databasebuilder.

lib/dom/scripts/idlnode.py

 #!/usr/bin/python
 # Copyright (c) 2011, 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 sys
 
 
 class IDLNode(object):
   """Base class for all IDL elements.
@@ skipping 363 matching lines @@
     self.attributes = self._convert_all(ast, 'Attribute',
       lambda ast: IDLAttribute(ast, self.doc_js_name))
     self.constants = self._convert_all(ast, 'Const',
       lambda ast: IDLConstant(ast, self.doc_js_name))
     self.is_supplemental = 'Supplemental' in self.ext_attrs
     self.is_no_interface_object = 'NoInterfaceObject' in self.ext_attrs
     self.is_fc_suppressed = 'Suppressed' in self.ext_attrs
 
   def has_attribute(self, candidate):
     for attribute in self.attributes:
       if (attribute.id == candidate.id and

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

if AOO(attribute, candidate) == 0?

And, btw, maybe it's time to have this AOO as __cmp__ method?

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

This is the only place where we compare nodes.

-          attribute.is_fc_getter == candidate.is_fc_getter and
-          attribute.is_fc_setter == candidate.is_fc_setter):
+          attribute.is_read_only == candidate.is_read_only):
         return True
     return False
 
 
 class IDLParentInterface(IDLNode):
   """This IDLNode specialization is for 'Interface Child : Parent {}'
   declarations."""
   def __init__(self, ast):
     IDLNode.__init__(self, ast)
     self._convert_annotations(ast)
@@ skipping 30 matching lines @@
   """IDLNode specialization for 'attribute type name' declarations."""
   def __init__(self, ast, doc_js_interface_name):
     IDLMember.__init__(self, ast, doc_js_interface_name)
     self.is_read_only = self._has(ast, 'ReadOnly')
     # There are various ways to define exceptions for attributes:
     self.raises = self._convert_first(ast, 'Raises', IDLType)
     self.get_raises = self.raises \
       or self._convert_first(ast, 'GetRaises', IDLType)
     self.set_raises = self.raises \
       or self._convert_first(ast, 'SetRaises', IDLType)
-    # FremontCut IDL syntax defines getters and setters separately:
-    self.is_fc_getter = self._has(ast, 'AttrGetter')
-    self.is_fc_setter = self._has(ast, 'AttrSetter')
   def _extra_repr(self):
     extra = []
-    if self.is_fc_getter: extra.append('get')
-    if self.is_fc_setter: extra.append('set')
     if self.is_read_only: extra.append('readonly')
     if self.raises: extra.append('raises')
     return extra
 
 class IDLConstant(IDLMember):
   """IDLNode specialization for 'const type name = value' declarations."""
   def __init__(self, ast, doc_js_interface_name):
     IDLMember.__init__(self, ast, doc_js_interface_name)
     self.value = self._find_first(ast, 'ConstExpr')
 
@@ skipping 36 matching lines @@
   """IDLDictNode specialization for one annotation."""
   def __init__(self, ast=None):
     IDLDictNode.__init__(self, ast)
     self.id = None
     if not ast:
       return
     for arg in self._find_all(ast, 'AnnotationArg'):
       name = self._find_first(arg, 'Id')
       value = self._find_first(arg, 'AnnotationArgValue')
       self[name] = value