This repository was archived by the owner on Aug 5, 2022. It is now read-only.
Xml generation: check conflicting elements #329
Merged
Conversation
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
dawagner
force-pushed
the
xmlgeneration-check-conflicting-elements
branch
from
74ca17a to
37f085b
Compare
dawagner
changed the title
Contributor
Author
|
@krocard please review. |
test/xml-generator/test.py
Outdated
Contributor
There was a problem hiding this comment.
- deep copy ?
- Would it not be better to have nominal_pfconfig a NON static variable to avoid all those copy.
Contributor
|
👎 |
dawagner
force-pushed
the
xmlgeneration-check-conflicting-elements
branch
2 times, most recently
from
b9546ba to
fab7ae8
Compare
Contributor
|
👎 |
There was only one user of this method and it was better off using split(). This simplifies the tokenizer. Signed-off-by: David Wagner <david.wagner@intel.com>
- Use C++11's initializer lists. - Use catch's "THEN" clauses to describe the expected behaviour more accurately. Signed-off-by: David Wagner <david.wagner@intel.com>
The tokenizer was ignoring leading and trailing delimiters and also considering multiple consecutive delimiters as one. This behaviour made it behave similarly to a shell tokenizer but made it impossible to produce empty tokens. Another, optional, behaviour is introduced that will produce no token if the string is empty or N+1 tokens if there are N delimiters. Signed-off-by: David Wagner <david.wagner@intel.com>
The domain generator was using the "merge delimiters" behaviour of the tokenizer which made it impossible to have empty tokens; e.g.: - empty rules; - empty config/domain names (even though this is forbidden, this is not for the generator to decide); - empty string parameter value; - ... It now uses the new "don't merge delimiters" behaviour. Signed-off-by: David Wagner <david.wagner@intel.com>
Signed-off-by: David Wagner <david.wagner@intel.com>
They don't make much sense and make it harder to be parsed. Even though user-oriented output is not meant to be parsed, it is very common to have user-oriented output be more or less machine-friendly. It actually is the case of the Parameter Framework's remote commands, except for these leading newlines. Signed-off-by: David Wagner <david.wagner@intel.com>
Conflicting elements are elements belonging to more than one domain. The behaviour in such a case is unspecified. In the context of XML generation from user input, this denotes a mistake from the user. We now warn him and fail the generation. This commit includes testing. Signed-off-by: David Wagner <david.wagner@intel.com>
A criteria cannot have duplicated allowed values. When the user provides such a criterion, the generation should fail. Signed-off-by: David Wagner <david.wagner@intel.com>
dawagner
force-pushed
the
xmlgeneration-check-conflicting-elements
branch
from
fab7ae8 to
576f444
Compare
Contributor
Author
There was a problem hiding this comment.
nope: it is 98 chars long.
krocard
added a commit
that referenced
this pull request
Jan 12, 2016
…-elements Xml generation: check conflicting elements Conflicting elements are elements belonging to more than one domain. The behaviour in such a case is unspecified. In the context of XML generation from user input, this denotes a mistake from the user. We now warn him and fail the generation.
krocard
changed the title
Contributor
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
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.
Conflicting elements are elements belonging to more than one domain. The behaviour in such a case is unspecified.
In the context of XML generation from user input, this denotes a mistake from the user. We now warn him and fail the generation.
