mirrors
/
cpython
mirror of https://github.com/python/cpython.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added support for optional modifiers to functions/methods (such as C++ const, 

static for methods, inline, etc).
This commit is contained in:
Jack Jansen 2005-06-21 20:54:51 +00:00
parent da99d1cbfe
commit 8ceeaba012
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Tools/bgen/bgen/bgenVariable.py
View File

@ -14,6 +14,7 @@
ReturnMode = 8+OutMode # this is the function return value ReturnMode = 8+OutMode # this is the function return value
ErrorMode = 16+OutMode # this is an error status -- turn it into an exception ErrorMode = 16+OutMode # this is an error status -- turn it into an exception
RefMode = 32 RefMode = 32
ConstMode = 64
class Variable: class Variable:
@ -47,7 +48,8 @@ def declare(self):
def getDeclaration(self): def getDeclaration(self):
"""Return the unadorned declaration of the variable, """Return the unadorned declaration of the variable,
suitable for use in a formal parameter list.""" suitable for use in a formal parameter list."""
return self.type.getDeclaration(self.name) refmode = (self.flags & RefMode)
return self.type.getDeclaration(self.name, reference=refmode)
def getargsFormat(self): def getargsFormat(self):
"""Call the type's getargsFormatmethod.""" """Call the type's getargsFormatmethod."""

21
Tools/bgen/bgen/scantools.py
View File

@ -479,6 +479,7 @@ def processrawspec(self, raw):
self.report("(but type matched)") self.report("(but type matched)")
return return
type, name, args = match.group('type', 'name', 'args') type, name, args = match.group('type', 'name', 'args')
modifiers = self.getmodifiers(match)
type = self.pythonizename(type) type = self.pythonizename(type)
name = self.pythonizename(name) name = self.pythonizename(name)
if name in self.alreadydone: if name in self.alreadydone:
@ -499,8 +500,14 @@ def processrawspec(self, raw):
self.report("*** %s %s unmanageable", type, name) self.report("*** %s %s unmanageable", type, name)
return return
self.alreadydone.append(name) self.alreadydone.append(name)
self.generate(type, name, arglist) if modifiers:
self.generate(type, name, arglist, modifiers)
else:
self.generate(type, name, arglist)
def getmodifiers(self, match):
return []
def pythonizename(self, name): def pythonizename(self, name):
name = re.sub("\*", " ptr", name) name = re.sub("\*", " ptr", name)
name = name.strip() name = name.strip()
@ -592,12 +599,16 @@ def substituteargs(self, pattern, replacement, old):
##self.report("new: %r", new) ##self.report("new: %r", new)
return new return new
def generate(self, type, name, arglist): def generate(self, tp, name, arglist, modifiers=[]):
self.typeused(type, 'return')
classname, listname = self.destination(type, name, arglist) self.typeused(tp, 'return')
if modifiers:
classname, listname = self.destination(tp, name, arglist, modifiers)
else:
classname, listname = self.destination(tp, name, arglist)
if not classname or not listname: return if not classname or not listname: return
if not self.specfile: return if not self.specfile: return
self.specfile.write("f = %s(%s, %r,\n" % (classname, type, name)) self.specfile.write("f = %s(%s, %r,\n" % (classname, tp, name))
for atype, aname, amode in arglist: for atype, aname, amode in arglist:
self.typeused(atype, amode) self.typeused(atype, amode)
self.specfile.write(" (%s, %r, %s),\n" % self.specfile.write(" (%s, %r, %s),\n" %