Refactor a bunch of common code from the "leaf" scripts to a new functions,

parse_GL_API, in gl_XML.py.

diff --git a/src/mesa/glapi/glX_XML.py b/src/mesa/glapi/glX_XML.py
index 81c94a5223000031265aa748476d0a824a6d809a..53f89b31bd5ff94a2fcb092fb88ce09a1a7d9e79 100644 (file)
--- a/src/mesa/glapi/glX_XML.py
+++ b/src/mesa/glapi/glX_XML.py
@@ -25,10 +25,6 @@
 # Authors:
 #    Ian Romanick <idr@us.ibm.com>
 
-from xml.sax import saxutils
-from xml.sax import make_parser
-from xml.sax.handler import feature_namespaces
-
 import gl_XML
 import license
 import sys, getopt, string

diff --git a/src/mesa/glapi/glX_doc.py b/src/mesa/glapi/glX_doc.py
index ea90d53f714c46e2454073c488f40803ccae7226..fa2d812974c2e787320daea53e5c8adcb97b4a6e 100644 (file)
--- a/src/mesa/glapi/glX_doc.py
+++ b/src/mesa/glapi/glX_doc.py
@@ -25,10 +25,6 @@
 # Authors:
 #    Ian Romanick <idr@us.ibm.com>
 
-from xml.sax import saxutils
-from xml.sax import make_parser
-from xml.sax.handler import feature_namespaces
-
 import gl_XML
 import glX_XML
 import license
@@ -266,13 +262,4 @@ if __name__ == '__main__':
                        file_name = val
 
        dh = PrintGlxProtoText()
-
-       parser = make_parser()
-       parser.setFeature(feature_namespaces, 1)
-       parser.setContentHandler(dh)
-
-       f = open(file_name)
-
-       dh.printHeader()
-       parser.parse(f)
-       dh.printFooter()
+       gl_XML.parse_GL_API( dh, file_name )

diff --git a/src/mesa/glapi/glX_proto_send.py b/src/mesa/glapi/glX_proto_send.py
index d78e07ee5e925b42881f0255c93f4bef7eefefac..1ac46c3b4cdac772029f8f584447278ce2c6d3b6 100644 (file)
--- a/src/mesa/glapi/glX_proto_send.py
+++ b/src/mesa/glapi/glX_proto_send.py
@@ -25,10 +25,6 @@
 # Authors:
 #    Ian Romanick <idr@us.ibm.com>
 
-from xml.sax import saxutils
-from xml.sax import make_parser
-from xml.sax.handler import feature_namespaces
-
 import gl_XML
 import glX_XML
 import license
@@ -889,13 +885,6 @@ if __name__ == '__main__':
        else:
                show_usage()
 
-       parser = make_parser()
-       parser.setFeature(feature_namespaces, 1)
-       parser.setContentHandler(dh)
-
-       f = open(file_name)
 
        dh.debug = debug
-       dh.printHeader()
-       parser.parse(f)
-       dh.printFooter()
+       gl_XML.parse_GL_API( dh, file_name )

diff --git a/src/mesa/glapi/glX_proto_size.py b/src/mesa/glapi/glX_proto_size.py
index 50495452223330cee74da537b5fabec6c561e52b..a1c0497ae7434b779184aec72c170e83ab88a631 100644 (file)
--- a/src/mesa/glapi/glX_proto_size.py
+++ b/src/mesa/glapi/glX_proto_size.py
@@ -25,10 +25,6 @@
 # Authors:
 #    Ian Romanick <idr@us.ibm.com>
 
-from xml.sax import saxutils
-from xml.sax import make_parser
-from xml.sax.handler import feature_namespaces
-
 import gl_XML
 import glX_XML
 import license
@@ -533,12 +529,4 @@ if __name__ == '__main__':
        else:
                show_usage()
 
-       parser = make_parser()
-       parser.setFeature(feature_namespaces, 1)
-       parser.setContentHandler(dh)
-
-       f = open(file_name)
-
-       dh.printHeader()
-       parser.parse(f)
-       dh.printFooter()
+       gl_XML.parse_GL_API( dh, file_name )

diff --git a/src/mesa/glapi/gl_SPARC_asm.py b/src/mesa/glapi/gl_SPARC_asm.py
index 2623e1beea72e7d408d282ea2208c61ca4b95d8c..76a545d90c9ec7e8bfce63c9103bcf1556da66be 100644 (file)
--- a/src/mesa/glapi/gl_SPARC_asm.py
+++ b/src/mesa/glapi/gl_SPARC_asm.py
@@ -25,10 +25,6 @@
 # Authors:
 #    Ian Romanick <idr@us.ibm.com>
 
-from xml.sax import saxutils
-from xml.sax import make_parser
-from xml.sax.handler import feature_namespaces
-
 import gl_XML
 import license
 import sys, getopt
@@ -123,12 +119,4 @@ if __name__ == '__main__':
                print "ERROR: Invalid mode \"%s\" specified." % mode
                show_usage()
 
-       parser = make_parser()
-       parser.setFeature(feature_namespaces, 1)
-       parser.setContentHandler(dh)
-
-       f = open(file_name)
-
-       dh.printHeader()
-       parser.parse(f)
-       dh.printFooter()
+       gl_XML.parse_GL_API( dh, file_name )

diff --git a/src/mesa/glapi/gl_XML.py b/src/mesa/glapi/gl_XML.py
index 38ccc53465ff69bb15c177fd4caa387e229b0bf1..64422be913d6c783a4ddcbeaa06a4b520a63856b 100644 (file)
--- a/src/mesa/glapi/gl_XML.py
+++ b/src/mesa/glapi/gl_XML.py
@@ -48,6 +48,24 @@ def is_attr_true( attrs, name ):
                raise RuntimeError('Invalid value "%s" for boolean "%s".' % (value, name))
 
 
+def parse_GL_API( handler, file_name ):
+       """Boiler-plate code to create an XML parser and use it.
+
+       Creates an XML parser and uses that parser with the application
+       supplied SAX callback, which should be derived from
+       FilterGLAPISpecBase.
+       """
+       parser = make_parser()
+       parser.setFeature(feature_namespaces, 1)
+       parser.setContentHandler( handler )
+
+       handler.printHeader()
+       parser.parse( file_name )
+
+       handler.printFooter()
+       return
+       
+
 class glItem:
        """Generic class on which all other API entity types are based."""
 

diff --git a/src/mesa/glapi/gl_apitemp.py b/src/mesa/glapi/gl_apitemp.py
index 4c4bcd40ff367405ee28baf401fbe12ba47d6747..6f30a16d99404a0202c26831c9b19f3f2a25e030 100644 (file)
--- a/src/mesa/glapi/gl_apitemp.py
+++ b/src/mesa/glapi/gl_apitemp.py
@@ -25,10 +25,6 @@
 # Authors:
 #    Ian Romanick <idr@us.ibm.com>
 
-from xml.sax import saxutils
-from xml.sax import make_parser
-from xml.sax.handler import feature_namespaces
-
 import gl_XML
 import license
 import sys, getopt
@@ -216,14 +212,4 @@ if __name__ == '__main__':
                        file_name = val
 
        dh = PrintGlOffsets()
-
-       parser = make_parser()
-       parser.setFeature(feature_namespaces, 1)
-       parser.setContentHandler(dh)
-
-       f = open(file_name)
-
-       dh.printHeader()
-       parser.parse(f)
-       dh.printFooter()
-
+       gl_XML.parse_GL_API( dh, file_name )

diff --git a/src/mesa/glapi/gl_enums.py b/src/mesa/glapi/gl_enums.py
index 177c95f6eddf1bab51c1370b9f6b88d3ac66f1cc..615f79729cf2f2a8ffbfbfb3c641b5aff687bb6a 100644 (file)
--- a/src/mesa/glapi/gl_enums.py
+++ b/src/mesa/glapi/gl_enums.py
@@ -26,10 +26,6 @@
 # Authors:
 #    Zack Rusin <zack@kde.org>
 
-from xml.sax import saxutils
-from xml.sax import make_parser
-from xml.sax.handler import feature_namespaces
-
 import license
 import gl_XML
 import sys, getopt
@@ -235,13 +231,4 @@ if __name__ == '__main__':
                        file_name = val
 
        dh = PrintGlEnums()
-
-       parser = make_parser()
-       parser.setFeature(feature_namespaces, 1)
-       parser.setContentHandler(dh)
-
-       f = open(file_name)
-
-       dh.printHeader()
-       parser.parse(f)
-       dh.printFooter()
+       gl_XML.parse_GL_API( dh, file_name )

diff --git a/src/mesa/glapi/gl_offsets.py b/src/mesa/glapi/gl_offsets.py
index 95657b80e027bba8d2a87b26c9d986beb166513d..f47eaa26b30be7567c5319df129e6d268f334051 100644 (file)
--- a/src/mesa/glapi/gl_offsets.py
+++ b/src/mesa/glapi/gl_offsets.py
@@ -25,10 +25,6 @@
 # Authors:
 #    Ian Romanick <idr@us.ibm.com>
 
-from xml.sax import saxutils
-from xml.sax import make_parser
-from xml.sax.handler import feature_namespaces
-
 import gl_XML
 import license
 import sys, getopt
@@ -65,13 +61,4 @@ if __name__ == '__main__':
                        file_name = val
 
        dh = PrintGlOffsets()
-
-       parser = make_parser()
-       parser.setFeature(feature_namespaces, 1)
-       parser.setContentHandler(dh)
-
-       f = open(file_name)
-
-       dh.printHeader()
-       parser.parse(f)
-       dh.printFooter()
+       gl_XML.parse_GL_API( dh, file_name )

diff --git a/src/mesa/glapi/gl_procs.py b/src/mesa/glapi/gl_procs.py
index b5d51b0b40458b96fa5fc08f324740827c22b3ca..75bb844a335823c138ed7288d0000a934d3614cd 100644 (file)
--- a/src/mesa/glapi/gl_procs.py
+++ b/src/mesa/glapi/gl_procs.py
@@ -25,10 +25,6 @@
 # Authors:
 #    Ian Romanick <idr@us.ibm.com>
 
-from xml.sax import saxutils
-from xml.sax import make_parser
-from xml.sax.handler import feature_namespaces
-
 import license
 import gl_XML
 import sys, getopt
@@ -128,7 +124,7 @@ def show_usage():
 
 if __name__ == '__main__':
        file_name = "gl_API.xml"
-    
+
        try:
                (args, trail) = getopt.getopt(sys.argv[1:], "f:m:")
        except Exception,e:
@@ -147,13 +143,4 @@ if __name__ == '__main__':
                                show_usage()
 
        dh = PrintGlProcs( long_string )
-
-       parser = make_parser()
-       parser.setFeature(feature_namespaces, 1)
-       parser.setContentHandler(dh)
-
-       f = open(file_name)
-
-       dh.printHeader()
-       parser.parse(f)
-       dh.printFooter()
+       gl_XML.parse_GL_API( dh, file_name )

diff --git a/src/mesa/glapi/gl_table.py b/src/mesa/glapi/gl_table.py
index 30dcd4149fb36ac67c30ab4d0a8800140c3875b6..3b8f1ca411a8b6d564021a9b10a55b5c736d2cda 100644 (file)
--- a/src/mesa/glapi/gl_table.py
+++ b/src/mesa/glapi/gl_table.py
@@ -25,10 +25,6 @@
 # Authors:
 #    Ian Romanick <idr@us.ibm.com>
 
-from xml.sax import saxutils
-from xml.sax import make_parser
-from xml.sax.handler import feature_namespaces
-
 import gl_XML
 import license
 import sys, getopt
@@ -82,13 +78,4 @@ if __name__ == '__main__':
                        file_name = val
 
        dh = PrintGlTable()
-
-       parser = make_parser()
-       parser.setFeature(feature_namespaces, 1)
-       parser.setContentHandler(dh)
-
-       f = open(file_name)
-
-       dh.printHeader()
-       parser.parse(f)
-       dh.printFooter()
+       gl_XML.parse_GL_API( dh, file_name )

diff --git a/src/mesa/glapi/gl_x86_asm.py b/src/mesa/glapi/gl_x86_asm.py
index 02dafa5c629c0503da30b230195da3bd0ec89ebc..85a5c2be0500d0bfe6903b5e27a3c712283c694a 100644 (file)
--- a/src/mesa/glapi/gl_x86_asm.py
+++ b/src/mesa/glapi/gl_x86_asm.py
@@ -25,10 +25,6 @@
 # Authors:
 #    Ian Romanick <idr@us.ibm.com>
 
-from xml.sax import saxutils
-from xml.sax import make_parser
-from xml.sax.handler import feature_namespaces
-
 import gl_XML
 import license
 import sys, getopt
@@ -247,12 +243,4 @@ if __name__ == '__main__':
                print "ERROR: Invalid mode \"%s\" specified." % mode
                show_usage()
 
-       parser = make_parser()
-       parser.setFeature(feature_namespaces, 1)
-       parser.setContentHandler(dh)
-
-       f = open(file_name)
-
-       dh.printHeader()
-       parser.parse(f)
-       dh.printFooter()
+       gl_XML.parse_GL_API( dh, file_name )