admin/hakril-PythonForWindows
1
0
Fork 0
mirror of https://github.com/hakril/PythonForWindows synced 2026-06-08 14:31:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Winstruct parser accept * in array size expression

Browse Source
This commit is contained in:
hakril
2020-01-17 21:09:04 +01:00
parent 5ae6fb2634
commit c5d8faaa4a
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ctypes_generation/struct_parser.py
+2 -2
View File
@@ -17,8 +17,8 @@ class WinStructParser(Parser):
nb_rep = ComplexArrayExpression()
while type(self.peek()) != CloseSquareBracketToken:
tok = self.next_token()
if type(tok) not in (NameToken, PlusToken):
raise ValueError("Array expression only accept names/+")
if type(tok) not in (NameToken, PlusToken, StarToken):
raise ValueError("Array expression only accept names/+/*")
is_name = (type(tok) == NameToken)
nb_rep.add_token_to_expression(tok.value, is_name)
self.assert_token_type(CloseSquareBracketToken)
ctypes_generation/winstruct.py
+11 -5
View File
@@ -14,8 +14,8 @@ class BitFieldValue(object):
def __int__(self):
return self.nb_bits
def generate_ctypes(self):
return self.nb_bits
# def generate_ctypes(self):
# return self.nb_bits
class ComplexArrayExpression(object):
def __init__(self):
@@ -131,7 +131,10 @@ class WinStruct(object):
res += ["{0}._pack_ = ".format(self.pack)]
res += ["{0}._fields_ = [".format(self.name)]
for (ftype, name, nb_rep) in self.fields:
if isinstance(nb_rep, (BitFieldValue, ComplexArrayExpression)):
if isinstance(nb_rep, BitFieldValue):
res += [' ("{0}", {1}, {2}),'.format(name, ftype.generate_ctypes(), nb_rep.nb_bits)]
continue
elif isinstance(nb_rep, ComplexArrayExpression):
nb_rep = nb_rep.generate_ctypes()
if nb_rep == 1:
res+= [' ("{0}", {1}),'.format(name, ftype.generate_ctypes())]
@@ -157,11 +160,14 @@ class WinStruct(object):
res += self.generate_anonymous_union()
res += " _fields_ = [\n"""
for (ftype, name, nb_rep) in self.fields:
if isinstance(nb_rep, (BitFieldValue, ComplexArrayExpression)):
if isinstance(nb_rep, BitFieldValue):
res += ' ("{0}", {1}, {2}),\n'.format(name, ftype.generate_ctypes(), nb_rep.nb_bits)
continue
elif isinstance(nb_rep, ComplexArrayExpression):
# Should I check 'ftype' somewhere when we have a bitfield ?
nb_rep = nb_rep.generate_ctypes()
if nb_rep == 1:
res+= ' ("{0}", {1}),\n'.format(name, ftype.generate_ctypes())
else: