Uh oh!
There was an error while loading.Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork32.4k
gh-85283: Extending Argument Clinic to support to use the limited C API.#26080
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Closed
Uh oh!
There was an error while loading.Please reload this page.
Closed
Changes fromall commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -598,6 +598,7 @@ def __init__(self, filename): | ||
| super().__init__(filename) | ||
| self.cpp = cpp.Monitor(filename) | ||
| self.cpp.fail = fail | ||
| self.use_limited_api = False | ||
| def parse_line(self, line): | ||
| self.cpp.writeline(line) | ||
| @@ -835,7 +836,7 @@ def parser_body(prototype, *fields, declarations=''): | ||
| parser_definition = parser_body(parser_prototype, ' {option_group_parsing}') | ||
| elif not requires_defining_class and pos_only == len(parameters): | ||
| if not new_or_init and not self.use_limited_api: | ||
| # positional-only, but no option groups | ||
| # we only need one call to _PyArg_ParseStack | ||
| @@ -874,7 +875,14 @@ def parser_body(prototype, *fields, declarations=''): | ||
| """, indent=4) % (nargs, i + 1)) | ||
| parser_code.append(normalize_snippet(parsearg, indent=4)) | ||
| if self.use_limited_api: | ||
| parser_code = [normalize_snippet(""" | ||
| if (!PyArg_ParseTuple(args, "{format_units}:{name}", | ||
| {parse_arguments})) {{ | ||
| goto exit; | ||
| }} | ||
| """, indent=4)] | ||
| elif parser_code is not None: | ||
| if has_optional: | ||
| parser_code.append("skip_optional:") | ||
| else: | ||
| @@ -887,7 +895,7 @@ def parser_body(prototype, *fields, declarations=''): | ||
| """, indent=4)] | ||
| else: | ||
| parser_code = [normalize_snippet(""" | ||
| if (!_PyArg_ParseTupleAndKeywordsFast(args,kwargs, &_parser, | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others.Learn more. Why? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others.Learn more. Use the limited C API when using the use_limited_api flag, otherwise it'll use the unlimited C API. Sorry for my delay. | ||
| {parse_arguments})) {{ | ||
| goto exit; | ||
| }} | ||
| @@ -896,7 +904,7 @@ def parser_body(prototype, *fields, declarations=''): | ||
| else: | ||
| has_optional_kw = (max(pos_only, min_pos) + min_kw_only < len(converters)) | ||
| if not new_or_init and not self.use_limited_api: | ||
| flags = "METH_FASTCALL|METH_KEYWORDS" | ||
| parser_prototype = parser_prototype_fastcall_keywords | ||
| argname_fmt = 'args[%d]' | ||
| @@ -991,7 +999,25 @@ def parser_body(prototype, *fields, declarations=''): | ||
| }} | ||
| """ % add_label, indent=4)) | ||
| if self.use_limited_api: | ||
| if parser_prototype is parser_prototype_keyword: | ||
| declarations = 'static char *_keywords[] = {{{keywords} NULL}};' | ||
| parser_code = [normalize_snippet(""" | ||
| if (!PyArg_ParseTupleAndKeywords(args, kwargs, "{format_units}:{name}", _keywords, {parse_arguments})) {{ | ||
| goto exit; | ||
| }} | ||
| """, indent=4)] | ||
| else: | ||
| declarations = ( | ||
| 'static const char * const _keywords[] = {{{keywords} NULL}};\n' | ||
| 'static _PyArg_Parser _parser = {{"{format_units}:{name}", _keywords, 0}};') | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others.Learn more. This is not in the Limited API. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others.Learn more. OK, you are right. Thanks. | ||
| parser_code = [normalize_snippet(""" | ||
| if (!_PyArg_ParseStackAndKeywords(args, nargs, kwnames, &_parser{parse_arguments_comma} | ||
| {parse_arguments})) {{ | ||
| goto exit; | ||
| }} | ||
| """, indent=4)] | ||
| elif parser_code is not None: | ||
| if add_label: | ||
| parser_code.append("%s:" % add_label) | ||
| else: | ||
| @@ -2040,7 +2066,7 @@ def _module_and_class(self, fields): | ||
| return module, cls | ||
| def parse_file(filename, *, verify=True, output=None, use_limited_api=False): | ||
| if not output: | ||
| output = filename | ||
| @@ -2050,6 +2076,8 @@ def parse_file(filename, *, verify=True, output=None): | ||
| try: | ||
| language = extensions[extension](filename) | ||
| if isinstance(language, CLanguage): | ||
| language.use_limited_api = use_limited_api | ||
| except KeyError: | ||
| fail("Can't identify file type for file " + repr(filename)) | ||
| @@ -5032,6 +5060,8 @@ def main(argv): | ||
| cmdline.add_argument("-o", "--output", type=str) | ||
| cmdline.add_argument("-v", "--verbose", action='store_true') | ||
| cmdline.add_argument("--converters", action='store_true') | ||
| cmdline.add_argument("--limited_api", action='store_true', | ||
| help="Using the limited C API in the generated code.") | ||
| cmdline.add_argument("--make", action='store_true', | ||
| help="Walk --srcdir to run over all relevant files.") | ||
| cmdline.add_argument("--srcdir", type=str, default=os.curdir, | ||
| @@ -5121,7 +5151,8 @@ def main(argv): | ||
| path = os.path.join(root, filename) | ||
| if ns.verbose: | ||
| print(path) | ||
| parse_file(path, verify=not ns.force, | ||
| use_limited_api=ns.limited_api) | ||
| return | ||
| if not ns.filename: | ||
| @@ -5137,7 +5168,8 @@ def main(argv): | ||
| for filename in ns.filename: | ||
| if ns.verbose: | ||
| print(filename) | ||
| parse_file(filename, output=ns.output, verify=not ns.force, | ||
| use_limited_api=ns.limited_api) | ||
| if __name__ == "__main__": | ||
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.