Fix ApiDoc to work with new dart:html code. Tweak dart:html generator to generate clearer @domName …

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 350 matching lines @@
 class IDLInterface(IDLNode):
   """IDLInterface node contains operations, attributes, constants,
   as well as parent references."""
 
   def __init__(self, ast):
     IDLNode.__init__(self, ast)
     self._convert_ext_attrs(ast)
     self._convert_annotations(ast)
     self.parents = self._convert_all(ast, 'ParentInterface',
       IDLParentInterface)
-    self.operations = self._convert_all(ast, 'Operation', IDLOperation)
-    self.attributes = self._convert_all(ast, 'Attribute', IDLAttribute)
-    self.constants = self._convert_all(ast, 'Const', IDLConstant)
+    self.javascript_binding_name = self.id

[sra1, 2012/04/12 17:58:21]

Since this field is about documentation and not the targeted JS code, the name
should contain 'doc', e.g.
doc_js_name and doc_js_interface_name

[Jacob, 2012/04/13 08:56:01]

Done.

+    self.operations = self._convert_all(ast, 'Operation', 
+      lambda ast: IDLOperation(ast, self.javascript_binding_name))
+    self.attributes = self._convert_all(ast, 'Attribute',
+      lambda ast: IDLAttribute(ast, self.javascript_binding_name))
+    self.constants = self._convert_all(ast, 'Const',
+      lambda ast: IDLConstant(ast, self.javascript_binding_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
-    self.javascript_binding_name = self.id
 
   def has_attribute(self, candidate):
     for attribute in self.attributes:
       if (attribute.id == candidate.id and
           attribute.is_fc_getter == candidate.is_fc_getter and
           attribute.is_fc_setter == candidate.is_fc_setter):
         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)
     self.type = self._convert_first(ast, 'InterfaceType', IDLType)
 
 
 class IDLMember(IDLNode):
   """A base class for constants, attributes and operations."""
 
-  def __init__(self, ast):
+  def __init__(self, ast, interface_javascript_binding_name):
     IDLNode.__init__(self, ast)
     self.type = self._convert_first(ast, 'Type', IDLType)
     self._convert_ext_attrs(ast)
     self._convert_annotations(ast)
+    self.interface_javascript_binding_name = interface_javascript_binding_name
     self.is_fc_suppressed = 'Suppressed' in self.ext_attrs
 
 
 class IDLOperation(IDLMember):
   """IDLNode specialization for 'type name(args)' declarations."""
-  def __init__(self, ast):
-    IDLMember.__init__(self, ast)
+  def __init__(self, ast, interface_javascript_binding_name):
+    IDLMember.__init__(self, ast, interface_javascript_binding_name)
     self.type = self._convert_first(ast, 'ReturnType', IDLType)
     self.arguments = self._convert_all(ast, 'Argument', IDLArgument)
     self.raises = self._convert_first(ast, 'Raises', IDLType)
     self.specials = self._find_all(ast, 'Special')
     self.is_stringifier = self._has(ast, 'Stringifier')
     self.is_static = self._has(ast, 'Static')
   def _extra_repr(self):
     return [self.arguments]
 
 
 class IDLAttribute(IDLMember):
   """IDLNode specialization for 'attribute type name' declarations."""
-  def __init__(self, ast):
-    IDLMember.__init__(self, ast)
+  def __init__(self, ast, interface_javascript_binding_name):
+    IDLMember.__init__(self, ast, interface_javascript_binding_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):
-    IDLMember.__init__(self, ast)
+  def __init__(self, ast, interface_javascript_binding_name):
+    IDLMember.__init__(self, ast, interface_javascript_binding_name)
     self.value = self._find_first(ast, 'ConstExpr')
 
 
 class IDLArgument(IDLNode):
   """IDLNode specialization for operation arguments."""
   def __init__(self, ast):
     IDLNode.__init__(self, ast)
     self.type = self._convert_first(ast, 'Type', IDLType)
     self._convert_ext_attrs(ast)
     # WebKit and Web IDL differ in how Optional is declared:
@@ skipping 28 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