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

Improve ctypes_generation function parser for new MSDN format of [in] [out] parameters

Browse Source
This commit is contained in:
clement rouault
2022-04-19 14:51:20 +02:00
parent 5fa4ca6aae
commit a7d547f994
1 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ctypes_generation/func_parser.py
+18 -10
View File
@@ -53,16 +53,24 @@ class WinFuncParser(Parser):
default_calling_convention = "WINFUNCTYPE"
def assert_argument_io_info(self):
io_info = self.assert_token_type(NameToken)
if io_info.value not in self.known_io_info_type:
if io_info.value not in self.known_io_info_with_param:
raise ParsingError("Was expection IO_INFO got {0} instead".format(io_info))
# Ignore IO infos params.
self.assert_token_type(OpenParenthesisToken)
while type(self.peek()) is not CloseParenthesisToken:
self.next_token()
self.assert_token_type(CloseParenthesisToken)
return io_info
if type(self.peek()) == NameToken:
# Old IO infos format based on known_io_info_type & co
io_info = self.assert_token_type(NameToken)
if io_info.value not in self.known_io_info_type:
if io_info.value not in self.known_io_info_with_param:
raise ParsingError("Was expection IO_INFO got {0} instead".format(io_info))
# Ignore IO infos params.
self.assert_token_type(OpenParenthesisToken)
while type(self.peek()) is not CloseParenthesisToken:
self.next_token()
self.assert_token_type(CloseParenthesisToken)
else:
# New format: [xxx, yyy, xxx]
self.assert_token_type(OpenSquareBracketToken)
while type(self.peek()) is not CloseSquareBracketToken:
self.next_token() # Assert Name/Comma & co ?
self.assert_token_type(CloseSquareBracketToken)
return None
def parse_func_arg(self, has_winapi):
type_ptr = False