Add comment check in Scanner

Since comment_t no longer is a declaration_t child, add a new check in
startElement for a comment object.  Add it to a new dictionary just
for comments.

Remove leftover debugging statement.

Author: josephsnyder

pygccxml/parser/scanner.py

@@ -152,6 +152,8 @@ def __init__(self, xml_file, decl_factory, config, *args):
         self.__calldefs = []
         # list of enums I need later
         self.__enums = []
+        # mapping of id -> comment decl
+        self.__comments = {}
         # mapping from id -> type
         self.__types = {}
         # mapping from id -> file
@@ -200,7 +202,7 @@ def read(self):
         xml.sax.parse(self.xml_file, self)
 
     def _handle_comment(self, declaration):
-        comm_decl = self.__declarations.get(declaration.comment)
+        comm_decl = self.__comments.get(declaration.comment)
         if comm_decl:
             # First acquire file_name placeholder
             file_decl = comm_decl.location.file_name
@@ -307,6 +309,11 @@ def startElement(self, name, attrs):
                 self.__read_byte_size(obj, attrs)
                 self.__read_byte_align(obj, attrs)
 
+            elif isinstance(obj, declarations.comment.comment_t):
+                self.__comments[element_id] = obj
+                self.__update_membership(attrs)
+                self.__read_attributes(obj, attrs)
+
             elif utils.is_str(obj):
 
                 self.__files[element_id] = os.path.normpath(obj)

unittests/test_comments.py

@@ -41,7 +41,6 @@ def test(self):
         tnamespace = self.global_ns.namespace("comment")
 
         self.assertIn("comment", dir(tnamespace))
-        print(tnamespace.comment)
         if tnamespace.comment.text:
             self.assertEqual(["//! Namespace Comment",
                               "//! Across multiple lines"],