Pepper: Clean up IDLNode internals.

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 IDLAttribute, IDLFile, IDLNode
+from idl_node import IDLNode
 from idl_option import GetOption
 from idl_visitor import IDLVisitor
-from idl_release import IDLReleaseList, IDLReleaseMap
+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'])
 
 
@@ skipping 13 matching lines @@
     # On completion of the Label, apply to the parent File if the
     # name of the label matches the generation label.
     if node.IsA('Label') and node.GetName() == GetOption('label'):
       try:
         node.parent.release_map = IDLReleaseMap(childdata)
       except Exception as err:
         node.Error('Unable to build release map: %s' % str(err))
 
     # For File objects, set the minimum version
     if node.IsA('File'):
-      file_min, file_max = node.release_map.GetReleaseRange()
+      file_min, _ = node.release_map.GetReleaseRange()
       node.SetMin(file_min)
 
     return None
 
 
 #
 # IDLNamespaceVersionResolver
 #
 # A specialized visitor which traverses the AST, building a namespace tree
 # as it goes.  The namespace tree is mapping from a name to a version list.
 # Labels must already be resolved to use.
 #
 class IDLNamespaceVersionResolver(IDLVisitor):
   NamespaceSet = set(['AST', 'Callspec', 'Interface', 'Member', 'Struct'])
   #
   # When we arrive at a node we must assign it a namespace and if the
   # node is named, then place it in the appropriate namespace.
   #
   def Arrive(self, node, parent_namespace):
     # If we are a File, grab the Min version and replease mapping
     if node.IsA('File'):
       self.rmin = node.GetMinMax()[0]
       self.release_map = node.release_map
 
     # Set the min version on any non Label within the File
     if not node.IsA('AST', 'File', 'Label', 'LabelItem'):
-      my_min, my_max = node.GetMinMax()
+      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())
 
@@ skipping 28 matching lines @@
   def VisitFilter(self, node, data):
     return not node.IsA('Comment', 'Copyright')
 
   def Arrive(self, node, filenode):
     # Track the file node to update errors
     if node.IsA('File'):
       node.SetProperty('FILE', node)
       filenode = node
 
     if not node.IsA('AST'):
-      file_min, file_max = filenode.release_map.GetReleaseRange()
+      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')
     if typeref:
       node.typelist = node.parent.namespace.FindList(typeref)
       if not node.typelist:
         node.Error('Could not resolve %s.' % typeref)
@@ skipping 40 matching lines @@
 
     # 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'):
-      self.errors += int(filenode.GetProperty('ERRORS', 0))
+      errors = filenode.GetProperty('ERRORS')
+      if errors:
+        self.errors += errors