Get rid of gccxml version of __read_location method

Author: iMichka

pygccxml/parser/scanner.py

@@ -158,10 +158,20 @@ def __init__(self, xml_file, decl_factory, config, *args):
         self.__mangled_suffix = ' *INTERNAL* '
         self.__mangled_suffix_len = len(self.__mangled_suffix)
 
-        self.__name_attrs_to_skip = []
-        self.__read_location = \
-            lambda decl, attrs, to_skip: self.__read_location_bootstrap(
-                self, decl, attrs, to_skip)
+        # These fields are generated by clang, and have no location.
+        # Just set an empty location for them.
+        # bug #19: gp_offset, fp_offset, overflow_arg_area, reg_save_area
+        # bug #32: isa, flags, str and length were added in llvm 3.9
+        self.__name_attrs_to_skip = [
+            "gp_offset",
+            "fp_offset",
+            "overflow_arg_area",
+            "reg_save_area",
+            "isa",
+            "flags",
+            "str",
+            "length",
+        ]
 
         self.__xml_generator_from_xml_file = None
 
@@ -275,41 +285,8 @@ def endElement(self, name):
         if name in self.deep_declarations:
             self.__inst = None
 
-    def __read_location_bootstrap(self, inst, decl, attrs, _):
-        """ This function monkey patches the __read_location function to either
-        __read_location_gccxml or __read_location_castxml depending on the
-        xml generator in use
-        """
-
-        if self.__xml_generator_from_xml_file.is_castxml:
-            # These fields are generated by clang, and have no location.
-            # Just set an empty location for them. Gccxml does not have
-            # this problem.
-            # bug #19: gp_offset, fp_offset, overflow_arg_area, reg_save_area
-            # bug #32: isa, flags, str and length were added in llvm 3.9
-            inst.__name_attrs_to_skip = [
-                "gp_offset",
-                "fp_offset",
-                "overflow_arg_area",
-                "reg_save_area",
-                "isa",
-                "flags",
-                "str",
-                "length"
-            ]
-            inst.__read_location = inst.__read_location_castxml
-        else:
-            inst.__read_location = inst.__read_location_gccxml
-        return inst.__read_location(decl, attrs, inst.__name_attrs_to_skip)
-
-    @staticmethod
-    def __read_location_gccxml(decl, attrs, _):
-        decl.location = declarations.location_t(
-            file_name=attrs[XML_AN_FILE],
-            line=int(attrs[XML_AN_LINE]))
-
     @staticmethod
-    def __read_location_castxml(decl, attrs, to_skip):
+    def __read_location(decl, attrs, to_skip):
         if "name" in attrs and attrs["name"] in to_skip:
             decl.location = declarations.location_t('', -1)
         else: