Pepper: More IDL generator cleanup.

ppapi/generators/idl_ast.py

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Nodes for PPAPI IDL AST."""
 
 from idl_namespace import IDLNamespace
 from idl_node import IDLNode
 from idl_option import GetOption
 from idl_visitor import IDLVisitor
 from idl_release import IDLReleaseMap
 
 #
-# IDL Predefined types
-#
-BuiltIn = set(['int8_t', 'int16_t', 'int32_t', 'int64_t', 'uint8_t',
-               'uint16_t', 'uint32_t', 'uint64_t', 'double_t', 'float_t',
-               'handle_t', 'interface_t', 'char', 'mem_t', 'mem_ptr_t',
-               'str_t', 'void'])
-
-
-#
 # IDLLabelResolver
 #
 # A specialized visitor which traverses the AST, building a mapping of
 # Release names to Versions numbers and calculating a min version.
 # The mapping is applied to the File nodes within the AST.
 #
 class IDLLabelResolver(IDLVisitor):
   def Depart(self, node, ignore, childdata):
     # Build list of Release=Version
     if node.IsA('LabelItem'):
@@ skipping 38 matching lines @@
     if not node.IsA('AST', 'File', 'Label', 'LabelItem'):
       my_min, _ = node.GetMinMax()
       if not my_min:
         node.SetMin(self.rmin)
 
     # If this object is not a namespace aware object, use the parent's one
     if node.cls not in self.NamespaceSet:
       node.namespace = parent_namespace
     else:
     # otherwise create one.
-      node.namespace = IDLNamespace(parent_namespace, node.GetName())
+      node.namespace = IDLNamespace(parent_namespace)
 
     # If this node is named, place it in its parent's namespace
     if parent_namespace and node.cls in IDLNode.NamedSet:
       # Set version min and max based on properties
       if self.release_map:
         vmin = node.GetProperty('version')
         vmax = node.GetProperty('deprecate')
         # If no min is available, the use the parent File's min
         if vmin == None:
           rmin = self.rmin
@@ skipping 25 matching lines @@
       node.SetProperty('FILE', node)
       filenode = node
 
     if not node.IsA('AST'):
       file_min, _ = filenode.release_map.GetReleaseRange()
       if not file_min:
         print 'Resetting min on %s to %s' % (node, file_min)
         node.SetMinRange(file_min)
 
     # If this node has a TYPEREF, resolve it to a version list
-    typeref = node.property_node.GetPropertyLocal('TYPEREF')
+    typeref = node.GetPropertyLocal('TYPEREF')
     if typeref:
       node.typelist = node.parent.namespace.FindList(typeref)
       if not node.typelist:
         node.Error('Could not resolve %s.' % typeref)
     else:
       node.typelist = None
     return filenode
 
 #
 # IDLReleaseResolver
@@ skipping 19 matching lines @@
 class IDLAst(IDLNode):
   def __init__(self, children):
     IDLNode.__init__(self, 'AST', 'BuiltIn', 1, 0, children)
     self.Resolve()
 
   def Resolve(self):
     # Set the appropriate Release=Version mapping for each File
     IDLLabelResolver().Visit(self, None)
 
     # Generate the Namesapce Tree
-    self.namespace = IDLNamespace(None, 'AST')
+    self.namespace = IDLNamespace(None)
     IDLNamespaceVersionResolver().Visit(self, self.namespace)
 
     # Using the namespace, resolve type references
     IDLFileTypeResolver().Visit(self, None)
 
     # Build an ordered list of all releases
     releases = set()
     for filenode in self.GetListOf('File'):
       releases |= set(filenode.release_map.GetReleases())
 
     # Generate a per node list of releases and release mapping
     IDLReleaseResolver().Visit(self, sorted(releases))
 
     for filenode in self.GetListOf('File'):
       errors = filenode.GetProperty('ERRORS')
       if errors:
         self.errors += errors