Support proper parsing of sequence<T>.

lib/html/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 299 matching lines @@
   return and input types. IDLType matches AST labels such as ScopedName,
   StringType, VoidType, IntegerType, etc."""
 
   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)

[podivilov, 2012/09/13 13:01:57]

The new code is very hard to read. Please replace the line above with something
like self.id = findType(...) and keep overall structure as is.

[Anton Muhin, 2012/09/13 13:10:47]

Sorry, do not quite follow, may you provide some more details?

Technically there can be nested structures like sequence<sequence<int>>

-            break
+        def findType(ast):
+          for childAst in ast:

[podivilov, 2012/09/13 14:01:39]

nit: for (label, childAst) in ast

[Anton Muhin, 2012/09/13 14:47:53]

There are some technical issues with it, but as you ask me rewrite this function
anyway, let's see what I can do.

+            (label, childAst) = childAst
+            if label.endswith('Type'):
+              type = self._label_to_type(label, ast)
+              if type == 'sequence':

[podivilov, 2012/09/13 14:01:39]

Please move this code out of the loop and use early returns instead of nested
ifs.

+                type_ast = self._find_first(childAst, 'Type')
+                if type_ast:
+                  type_argument = findType(type_ast)
+                  if type_argument:
+                    type = 'sequence<%s>' % type_argument
+              return type
+        self.id = findType(ast)
       array_modifiers = self._find_first(ast, 'ArrayModifiers')
       if array_modifiers:
         self.id += array_modifiers
     elif isinstance(ast, tuple):
       (label, value) = ast
       if label == 'ScopedName':
         self.id = value
       else:
         self.id = self._label_to_type(label, ast)
     elif isinstance(ast, str):
@@ skipping 149 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