Fix parsing of DOMString[] in IDL

client/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 302 matching lines @@
   def __init__(self, ast):
     IDLNode.__init__(self, ast)
     # Search for a 'ScopedName' or any label ending with 'Type'.
     if isinstance(ast, list):
       self.id = self._find_first(ast, 'ScopedName')
       if not self.id:
         # FIXME: use regexp search instead
         for childAst in ast:
           (label, childAst) = childAst
           if label.endswith('Type'):
-            self.id = self.__label_to_type(label, ast)
+            self.id = self._label_to_type(label, ast)
             break
     elif isinstance(ast, tuple):
       (label, value) = ast
       if label == 'ScopedName':
         self.id = value
       else:
-        self.id = self.__label_to_type(label, ast)
+        self.id = self._label_to_type(label, ast)
     elif isinstance(ast, str):
       self.id = ast
     if not self.id:
       raise SyntaxError('Could not parse type %s' % (ast))
 
-  def __label_to_type(self, label, ast):
-    if label.endswith('Type'):
+  def _label_to_type(self, label, ast):
+    if label == 'AnyArrayType':
+      return 'any[]'
+    if label == 'DOMStringArrayType':
+      return 'DOMString[]'
+    if label == 'LongLongType':
+      label = 'long long'
+    elif label.endswith('Type'):
       # Omit 'Type' suffix and lowercase the rest.
       label = '%s%s' % (label[0].lower(), label[1:-4])
-      if label == 'longLong':
-        # Special case for LongLongType:
-        label = 'long long'
-      if label == 'anyArray':
-        label = 'any[]'
 
     # Add unsigned qualifier.
     if self._has(ast, 'Unsigned'):
       label = 'unsigned %s' % label
     return label
 
 
 class IDLTypeDef(IDLNode):
   """IDLNode for 'typedef [type] [id]' declarations."""
   def __init__(self, ast):
@@ skipping 128 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