Refactor xmlparser.py: use pure-proc interface.

Author: kbridge

Support/Python/pdbxml/session.py

@@ -1,7 +1,7 @@
 import sys
 
 from .ctype import CTree
-from .xmlparser import XmlParser
+from .xmlparser import parse_xml
 from .sorter import sort_structs
 from .definer import Definer, BraceDefMaker
 from .primtypes import setup_goo_matcher
@@ -12,9 +12,10 @@ def __init__(self):
         self._file_index = 0
 
     def load(self, file_path):
-        parser = XmlParser(file_path)
         self._storage.begin_file(self._file_index)
-        parser.read_to_storage(self._storage)
+        name_type_pairs = parse_xml(file_path)
+        for name, type in name_type_pairs:
+            self._storage.add(name, type)
         self._storage.end_file()
         self._file_index += 1
 

Support/Python/pdbxml/xmlparser.py

@@ -137,8 +137,12 @@ def _read_func(self, id, t, conv):
             t.add(self._read_type(e_arg, True))
         return t
 
-    def read_to_storage(self, storage):
-        for e_type in self._named:
-            name = e_type.attrib['name']
-            type = self._read_named(e_type)
-            storage.add(name, type)
+    def read_all(self):
+        return [
+            (e_type.attrib['name'], self._read_named(e_type))
+            for e_type in self._named
+        ]
+
+def parse_xml(file_path):
+    parser = XmlParser(file_path)
+    return parser.read_all()