Provide DartDomNameOfAttribute

client/dom/scripts/systemhtml.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."""
 
 from systemfrog import *
 from systeminterface import *
@@ skipping 649 matching lines @@
     emit_events, events = self._shared.GetEventAttributes(self._interface)
     if not emit_events:
       return
     elif events:
       self.AddEventAttributes(events)
     else:
       self._EmitEventGetter(self._shared.GetParentEventsClass(self._interface))
 
   def AddAttribute(self, getter, setter):
     html_getter_name = self._shared.RenameInHtmlLibrary(
-      self._interface, getter.id, 'get:')
+      self._interface, DartDomNameOfAttribute(getter), 'get:')
     html_setter_name = self._shared.RenameInHtmlLibrary(
-      self._interface, getter.id, 'set:')
+      self._interface, DartDomNameOfAttribute(getter), 'set:')
 
     if not html_getter_name or self._shared.IsPrivate(html_getter_name):
       getter = None
     if not html_setter_name or self._shared.IsPrivate(html_setter_name):
       setter = None
     if not getter and not setter:
       return
 
     # We don't yet handle inconsistent renames of the getter and setter yet.
     if html_getter_name and html_setter_name:
@@ skipping 185 matching lines @@
     # TODO(sra): Use separate mixins for mutable implementations of List<T>.
     # TODO(sra): Use separate mixins for typed array implementations of List<T>.
     if self._interface.id != 'NodeList':
       template_file = 'immutable_list_mixin.darttemplate'
       template = self._system._templates.Load(template_file)
       self._members_emitter.Emit(template, E=DartType(element_type))
 
   def AddAttribute(self, getter, setter):
   
     html_getter_name = self._shared.RenameInHtmlLibrary(
-      self._interface, getter.id, 'get:')
+      self._interface, DartDomNameOfAttribute(getter), 'get:')
     html_setter_name = self._shared.RenameInHtmlLibrary(
-      self._interface, getter.id, 'set:')
+      self._interface, DartDomNameOfAttribute(getter), 'set:')
 
     if not html_getter_name:
       getter = None
     if not html_setter_name:
       setter = None
 
     if not getter and not setter:
       return
 
     if ((getter and (html_getter_name != getter.id or
@@ skipping 15 matching lines @@
       if getter and not setter and super_getter and not super_setter:
         if DartType(getter.type.id) == DartType(super_getter.type.id):
           # Compatible getter, use the superclass property.  This works because
           # JavaScript will do its own dynamic dispatch.
           output_type = getter and self._NarrowOutputType(getter.type.id)
           self._members_emitter.Emit(
               '\n'
               '  // Use implementation from $SUPER.\n'
               '  // final $TYPE $NAME;\n',
               SUPER=super_getter_interface.id,
-              NAME=getter.id,
+              NAME=DartDomNameOfAttribute(getter),
               TYPE=output_type)
           return
 
       self._members_emitter.Emit('\n  // Shadowing definition.')
       self._AddAttributeUsingProperties(getter, setter)
       return
 
     output_type = getter and self._NarrowOutputType(getter.type.id)
     input_type = setter and self._NarrowInputType(setter.type.id)
     if getter and setter and input_type == output_type:
       self._members_emitter.Emit(
           '\n  $TYPE $NAME;\n',
-          NAME=getter.id,
+          NAME=DartDomNameOfAttribute(getter),
           TYPE=output_type)
       return
     if getter and not setter:
       self._members_emitter.Emit(
           '\n  final $TYPE $NAME;\n',
-          NAME=getter.id,
+          NAME=DartDomNameOfAttribute(getter),
           TYPE=output_type)
       return
     self._AddAttributeUsingProperties(getter, setter)
 
   def _AddAttributeUsingProperties(self, getter, setter):
     if getter:
       self._AddGetter(getter)
     if setter:
       self._AddSetter(setter)
 
   def _AddGetter(self, attr):
-    self._AddRenamingGetter(attr, attr.id)
+    self._AddRenamingGetter(attr, DartDomNameOfAttribute(attr))
 
   def _AddSetter(self, attr):
-    self._AddRenamingSetter(attr, attr.id)
+    self._AddRenamingSetter(attr, DartDomNameOfAttribute(attr))
 
   def _AddRenamingGetter(self, attr, html_name):
     return_type = self._NarrowOutputType(attr.type.id)
     if self._shared.MaybeReturnDocument(attr.type.id):
       self._members_emitter.Emit(
         '\n  $TYPE get $(HTML_NAME)() => '
         '_FixHtmlDocumentReference(_$(HTML_NAME));\n',
         HTML_NAME=html_name,
-        NAME=attr.id,
         TYPE=return_type)
       html_name = '_' + html_name
       # For correctness this needs to be the return type of the native helper
       # method due to the fact that the real HTMLDocument object is not typed
       # as a document.  TODO(jacobr): we could simplify this.
       return_type = '_EventTargetImpl'
 
     self._members_emitter.Emit(
         '\n  $TYPE get $(HTML_NAME)() native "return $(THIS).$NAME;";\n',
         HTML_NAME=html_name,
@@ skipping 399 matching lines @@
     if getter and html_getter_name:
       self._AddGetter(getter, html_getter_name)
     if setter and html_setter_name:
       self._AddSetter(setter, html_setter_name)
 
   def _AddGetter(self, attr, html_name):
     if self._shared.MaybeReturnDocument(attr.type.id): 
       self._members_emitter.Emit(
           '\n'
           '  $TYPE get $(HTML_NAME)() => '
-          '_FixHtmlDocumentReference(_wrap($(THIS).$NAME));\n',
-          NAME=attr.id,
+          '_FixHtmlDocumentReference(_wrap($(THIS).$DOM_NAME));\n',
           HTML_NAME=html_name,
+          DOM_NAME=DartDomNameOfAttribute(attr),
           TYPE=DartType(attr.type.id),
           THIS=self.DomObjectName())
     else:
       self._members_emitter.Emit(
         '\n'
-        '  $TYPE get $(HTML_NAME)() => _wrap($(THIS).$NAME);\n',
-        NAME=attr.id,
+        '  $TYPE get $(HTML_NAME)() => _wrap($(THIS).$DOM_NAME);\n',
         HTML_NAME=html_name,
+        DOM_NAME=DartDomNameOfAttribute(attr),
         TYPE=DartType(attr.type.id),
         THIS=self.DomObjectName())
 
   def _AddSetter(self, attr, html_name):
     self._members_emitter.Emit(
         '\n'
-        '  void set $(HTML_NAME)($TYPE value) { $(THIS).$NAME = _unwrap(value); }\n',
-        NAME=attr.id,
+        '  void set $(HTML_NAME)($TYPE value) { '
+        '$(THIS).$DOM_NAME = _unwrap(value); }\n',
         HTML_NAME=html_name,
+        DOM_NAME=DartDomNameOfAttribute(attr),
         TYPE=DartType(attr.type.id),
         THIS=self.DomObjectName())
 
   def AddSecondaryAttribute(self, interface, getter, setter):
     self._SecondaryContext(interface)
     self.AddAttribute(getter, setter)
 
   def AddSecondaryOperation(self, interface, info):
     self._SecondaryContext(interface)
     self.AddOperation(info)
@@ skipping 363 matching lines @@
     # dispatch has removed f(X), leaving only f(Y), but there is no guarantee
     # that Y = Z-X, so we need to check for Y.
     true_code = emitter.Emit(
         '$(INDENT)if ($COND) {\n'
         '$!TRUE'
         '$(INDENT)}\n',
         COND=test, INDENT=indent)
     self.GenerateDispatch(
         true_code, info, indent + '  ', position + 1, positive)
     return True