This repository has been archived by the owner on Sep 21, 2020. It is now read-only.
add default parameter support #53
Merged
Conversation
This file contains 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
Pull Request Test Coverage Report for Build 113
💛 - Coveralls |
agateau
suggested changes
Dec 1, 2019
doxyqml/qmlparser.py
Outdated
| @@ -207,12 +212,18 @@ def consume_wo_comments(self): | |||
| if not is_comment_token(token): | |||
| return token | |||
|
|
|||
| def consume_expecting(self, type, value=None): | |||
| def consume_expecting(self, expect_type, value=None): | |||
There was a problem hiding this comment.
Since expect_type can also be a list I would rename it expected_types.
doxyqml/qmlparser.py
Outdated
| if token.type != type: | ||
| raise QmlParserError("Expected token of type '%s', got '%s' instead" % (type, token.type), token) | ||
| if type(expect_type) is list: | ||
| if not (token.type in expect_type): |
There was a problem hiding this comment.
This would be more pythonic:
Suggested change
| if not (token.type in expect_type): | |
| if token.type not in expected_types: |
Comment on lines
40
to
57
| /** | ||
| * Function with int default parameter | ||
| * @param arg A parameter with a defaultvalue | ||
| * @return the result | ||
| */ | ||
| int intDefaultParameter(int arg); | ||
| /** | ||
| * Function with string default parameter | ||
| * @param arg A parameter with a default value | ||
| * @return the result | ||
| */ | ||
| string stringDefaultParameter(string arg); | ||
| /** | ||
| * Function with property as default parameter | ||
| * @param arg A parameter with a default value | ||
| * @return the result | ||
| */ | ||
| int propDefaultParameter(int arg); |
There was a problem hiding this comment.
I would expect the produced C++ function declarations would contain the default values. Is this something you plan to do? (not mandatory for now: making the parser not confused with default values is already nice)
cryoma01
force-pushed
the
js_default_parameter_support
branch
from
eb7b9bf
to
b5d309f
Compare
|
Looks great, thanks! |
agateau
approved these changes
Dec 9, 2019
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Since Qt5.12, Qt QML module supports ECMAScript 7 (https://doc.qt.io/qt-5/whatsnew512.html). This includes an upgrade to ECMAScript 6 which includes handling of default parameters values (http://es6-features.org/#DefaultParameterValues).
The goal of this pull request is to fix the error raised by doxyqml when parsing QML with default parameters values.