frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hw/xwin/glx: Refactor parsing of the <proto> XML element 

Factor out duplicated code used in parsing of the <proto> XML element in the
code generator

Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
This commit is contained in:
Jon TURNEY 2015-03-16 16:14:10 +00:00
parent d3080d421b
commit 5071cb7e0a
1 changed files with 26 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
hw/xwin/glx/gen_gl_wrappers.py
View File

@ -123,6 +123,25 @@ else:
errWarn = sys.stderr errWarn = sys.stderr
diag = open(diagFilename, 'w') diag = open(diagFilename, 'w')
def ParseCmdRettype(cmd):
proto=noneStr(cmd.elem.find('proto'))
rettype=noneStr(proto.text)
if rettype.lower()!="void ":
plist = ([t for t in proto.itertext()])
rettype = ''.join(plist[:-1])
rettype=rettype.strip()
return rettype
def ParseCmdParams(cmd):
params = cmd.elem.findall('param')
plist=[]
for param in params:
paramlist = ([t for t in param.itertext()])
paramtype = ''.join(paramlist[:-1])
paramname = paramlist[-1]
plist.append((paramtype, paramname))
return plist
class PreResolveOutputGenerator(OutputGenerator): class PreResolveOutputGenerator(OutputGenerator):
def __init__(self, def __init__(self,
errFile = sys.stderr, errFile = sys.stderr,
@ -179,21 +198,11 @@ class WrapperOutputGenerator(OutputGenerator):
if prefix == 'wgl' and not name in used_wgl_ext_fns: if prefix == 'wgl' and not name in used_wgl_ext_fns:
return return
proto=noneStr(cmd.elem.find('proto')) rettype=ParseCmdRettype(cmd)
rettype=noneStr(proto.text)
if rettype.lower()!="void ":
plist = ([t for t in proto.itertext()])
rettype = ''.join(plist[:-1])
rettype=rettype.strip()
if staticwrappers: self.outFile.write("static ") if staticwrappers: self.outFile.write("static ")
self.outFile.write("%s %sWrapper("%(rettype, name)) self.outFile.write("%s %sWrapper("%(rettype, name))
params = cmd.elem.findall('param') plist=ParseCmdParams(cmd)
plist=[]
for param in params:
paramlist = ([t for t in param.itertext()])
paramtype = ''.join(paramlist[:-1])
paramname = paramlist[-1]
plist.append((paramtype, paramname))
Comma="" Comma=""
if len(plist): if len(plist):
for ptype, pname in plist: for ptype, pname in plist:
@ -270,20 +279,9 @@ class ThunkOutputGenerator(OutputGenerator):
def genCmd(self, cmd, name): def genCmd(self, cmd, name):
OutputGenerator.genCmd(self, cmd, name) OutputGenerator.genCmd(self, cmd, name)
proto=noneStr(cmd.elem.find('proto')) rettype=ParseCmdRettype(cmd)
rettype=noneStr(proto.text)
if rettype.lower()!="void ":
plist = ([t for t in proto.itertext()])
rettype = ''.join(plist[:-1])
rettype=rettype.strip()
self.outFile.write("%s %sWrapper("%(rettype, name)) self.outFile.write("%s %sWrapper("%(rettype, name))
params = cmd.elem.findall('param') plist=ParseCmdParams(cmd)
plist=[]
for param in params:
paramlist = ([t for t in param.itertext()])
paramtype = ''.join(paramlist[:-1])
paramname = paramlist[-1]
plist.append((paramtype, paramname))
Comma="" Comma=""
if len(plist): if len(plist):
for ptype, pname in plist: for ptype, pname in plist:
@ -372,20 +370,9 @@ class ShimOutputGenerator(OutputGenerator):
return return
# for GL functions which are in the ABI, generate a shim which calls the function via GetProcAddress # for GL functions which are in the ABI, generate a shim which calls the function via GetProcAddress
proto=noneStr(cmd.elem.find('proto')) rettype=ParseCmdRettype(cmd)
rettype=noneStr(proto.text)
if rettype.lower()!="void ":
plist = ([t for t in proto.itertext()])
rettype = ''.join(plist[:-1])
rettype=rettype.strip()
self.outFile.write("%s %s("%(rettype, name)) self.outFile.write("%s %s("%(rettype, name))
params = cmd.elem.findall('param') plist=ParseCmdParams(cmd)
plist=[]
for param in params:
paramlist = ([t for t in param.itertext()])
paramtype = ''.join(paramlist[:-1])
paramname = paramlist[-1]
plist.append((paramtype, paramname))
Comma="" Comma=""
if len(plist): if len(plist):
for ptype, pname in plist: for ptype, pname in plist: