Skip to content

Commit b6216dd

Browse files
committed
More factorization to help C++ support.
1 parent 02c64d5 commit b6216dd

6 files changed

Lines changed: 51 additions & 18 deletions

File tree

‎Tools/bgen/bgen/bgenBuffer.py‎

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,11 @@ def __init__(self, size, datatype = 'char', sizetype = 'int', sizeformat = None)
3838
self.sizeformat = sizeformat or type2format[sizetype]
3939
self.label_needed = 0
4040

41-
def getDeclarations(self, name, reference=False):
41+
def getArgDeclarations(self, name, reference=False):
4242
if reference:
4343
raise RuntimeError, "Cannot pass buffer types by reference"
44-
return self.getBufferDeclarations(name) + self.getSizeDeclarations(name)
44+
return (self.getBufferDeclarations(name) +
45+
self.getSizeDeclarations(name))
4546

4647
def getBufferDeclarations(self, name):
4748
return self.getInputBufferDeclarations(name) + self.getOutputBufferDeclarations(name)
@@ -53,10 +54,10 @@ def getOutputBufferDeclarations(self, name):
5354
return ["%s %s__out__[%s]" % (self.datatype, name, self.size)]
5455

5556
def getSizeDeclarations(self, name):
56-
return [
57-
"%s %s__len__" %(self.sizetype, name),
58-
"int %s__in_len__" %(name)
59-
]
57+
return ["%s %s__len__" %(self.sizetype, name)]
58+
59+
def getAuxDeclarations(self, name):
60+
return ["int %s__in_len__" %(name)]
6061

6162
def getargsFormat(self):
6263
return "s#"
@@ -189,6 +190,9 @@ def getInputBufferDeclarations(self, name):
189190
return ["%s *%s__in__" % (self.type, name)]
190191

191192
def getSizeDeclarations(self, name):
193+
return []
194+
195+
def getAuxDeclarations(self, name):
192196
return ["int %s__in_len__" % (name)]
193197

194198
def getOutputBufferDeclarations(self, name):
@@ -248,6 +252,9 @@ class StructOutputBufferType(OutputOnlyBufferMixIn, StructInputOutputBufferType)
248252
def getSizeDeclarations(self, name):
249253
return []
250254

255+
def getAuxDeclarations(self, name):
256+
return []
257+
251258
def passOutput(self, name):
252259
return "&%s__out__" % name
253260

@@ -262,5 +269,8 @@ class ArrayOutputBufferType(OutputOnlyBufferMixIn, StructInputOutputBufferType):
262269
def getSizeDeclarations(self, name):
263270
return []
264271

272+
def getAuxDeclarations(self, name):
273+
return []
274+
265275
def passOutput(self, name):
266276
return "%s__out__" % name

‎Tools/bgen/bgen/bgenStackBuffer.py‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ class VarStackOutputBufferType(StackOutputBufferType):
2323
"""
2424

2525
def getSizeDeclarations(self, name):
26+
return []
27+
28+
def getAuxDeclarations(self, name):
2629
return ["int %s__len__ = %s" % (name, self.size)]
2730

2831
def passOutput(self, name):

‎Tools/bgen/bgen/bgenStringBuffer.py‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ class StringBufferMixIn:
2626
def getSizeDeclarations(self, name):
2727
return []
2828

29+
def getAuxDeclarations(self, name):
30+
return []
31+
2932
def getargsFormat(self):
3033
return "s"
3134

‎Tools/bgen/bgen/bgenType.py‎

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,25 @@ def declare(self, name, reference=False):
2424
2525
Example: int.declare('spam') prints "int spam;"
2626
"""
27-
for decl in self.getDeclarations(name, reference):
27+
for decl in self.getArgDeclarations(name, reference):
28+
Output("%s;", decl)
29+
for decl in self.getAuxDeclarations(name):
2830
Output("%s;", decl)
2931

30-
def getDeclarations(self, name, reference=False):
31-
"""Return a string declaring a variable or argument, without
32-
any syntactic adornment"""
32+
def getArgDeclarations(self, name, reference=False):
33+
"""Return the main part of the declarations for this type: the items
34+
that will be passed as arguments in the C/C++ function call."""
3335
if reference:
3436
return ["%s& %s" % (self.typeName, name)]
3537
else:
3638
return ["%s %s" % (self.typeName, name)]
3739

40+
def getAuxDeclarations(self, name):
41+
"""Return any auxiliary declarations needed for implementing this
42+
type, such as helper variables used to hold sizes, etc. These declarations
43+
are not part of the C/C++ function call interface."""
44+
return []
45+
3846
def getargs(self):
3947
return self.getargsFormat(), self.getargsArgs()
4048

@@ -187,7 +195,10 @@ def __init__(self, substitute):
187195
self.substitute = substitute
188196
self.typeName = None # Don't show this argument in __doc__ string
189197

190-
def getDeclarations(self, name, reference=False):
198+
def getArgDeclarations(self, name, reference=False):
199+
return []
200+
201+
def getAuxDeclarations(self, name, reference=False):
191202
return []
192203

193204
def getargsFormat(self):

‎Tools/bgen/bgen/bgenVariable.py‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,12 @@ def declare(self):
4545
elif self.flags != SelfMode:
4646
self.type.declare(self.name)
4747

48-
def getDeclarations(self):
49-
"""Return the unadorned declaration of the variable,
50-
suitable for use in a formal parameter list."""
48+
def getArgDeclarations(self):
5149
refmode = (self.flags & RefMode)
52-
return self.type.getDeclarations(self.name, reference=refmode)
50+
return self.type.getArgDeclarations(self.name, reference=refmode)
51+
52+
def getAuxDeclarations(self):
53+
return self.type.getAuxDeclarations(self.name)
5354

5455
def getargsFormat(self):
5556
"""Call the type's getargsFormatmethod."""

‎Tools/bgen/bgen/scantools.py‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -482,8 +482,7 @@ def processrawspec(self, raw):
482482
modifiers = self.getmodifiers(match)
483483
type = self.pythonizename(type)
484484
name = self.pythonizename(name)
485-
if name in self.alreadydone:
486-
self.report("Name has already been defined: %r", name)
485+
if self.checkduplicate(name):
487486
return
488487
self.report("==> %s %s <==", type, name)
489488
if self.blacklisted(type, name):
@@ -499,7 +498,6 @@ def processrawspec(self, raw):
499498
## self.report(" %r", arg)
500499
self.report("*** %s %s unmanageable", type, name)
501500
return
502-
self.alreadydone.append(name)
503501
if modifiers:
504502
self.generate(type, name, arglist, modifiers)
505503
else:
@@ -508,6 +506,13 @@ def processrawspec(self, raw):
508506
def getmodifiers(self, match):
509507
return []
510508

509+
def checkduplicate(self, name):
510+
if name in self.alreadydone:
511+
self.report("Name has already been defined: %r", name)
512+
return True
513+
self.alreadydone.append(name)
514+
return False
515+
511516
def pythonizename(self, name):
512517
name = re.sub("\*", " ptr", name)
513518
name = name.strip()

0 commit comments

Comments
 (0)