project reader: try to simplify code

Align variable names
Remove superfluous loops
Regroup code

Author: iMichka

src/pygccxml/parser/project_reader.py

@@ -321,14 +321,7 @@ def __parse_file_by_file(self, files):
         self.logger.debug(
             "Cache has been flushed in %.1f secs",
             (timeit.default_timer() - start_time))
-        namespaces = []
-        self.logger.debug("Joining namespaces ...")
-        for file_nss in namespaces:
-            namespaces = self._join_top_namespaces(namespaces, file_nss)
-        self.logger.debug("Joining declarations ...")
-        for namespace in namespaces:
-            if isinstance(namespace, pygccxml.declarations.namespace_t):
-                declarations_joiner.join_declarations(namespace)
+        namespaces = self.__join_namespaces_and_declarations(namespaces, namespaces)
         leaved_classes = self._join_class_hierarchy(namespaces)
         types = self.__declarated_types(namespaces)
         self.logger.debug("Relinking declared types ...")
@@ -354,7 +347,12 @@ def __parse_all_at_once(self, files):
                     '#include "%s" %s' %
                     (header, os.linesep))
         namespaces = self.read_string(''.join(header_content))
-        namespaces = self._join_top_namespaces(namespaces, [])
+        return self.__join_namespaces_and_declarations(namespaces, namespaces)
+
+    def __join_namespaces_and_declarations(self, main_ns_list, other_ns_list):
+        self.logger.debug("Joining namespaces ...")
+        namespaces = self._join_top_namespaces(main_ns_list, other_ns_list)
+        self.logger.debug("Joining declarations ...")
         for namespace in namespaces:
             if isinstance(namespace, pygccxml.declarations.namespace_t):
                 declarations_joiner.join_declarations(namespace)