-
Notifications
You must be signed in to change notification settings - Fork 13
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 our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Extend the feature modeling language with XOR, OR grouping and optionality #125
Open
Lycheers
wants to merge
23
commits into
isselab:main
Choose a base branch
from
Lycheers:cross-tree
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
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
# Conflicts: # src/main/resources/META-INF/plugin.xml
…rking for feature-to-file)
# Conflicts: # src/main/java/se/isselab/HAnS/actions/FindChildrenAction.java
…ules incorrectly defined
…solve, also OPTIONAL token is not matched at all
…es the coming feature(on the same indentation level) to unused feature and I tried with changing the highlighting for xor, or, ?, but they only changed the color shortly and then got covered
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description
We extended the feature model editor with the following options:
We modified the grammar rule in FeatureModel.bnf to enable new operators and then added the definition of new tokens in the FeatureModel.flex. After that, we did the same thing for the FeatureModelHighlightingLexer.flex to allow a distinct coloring. We also need to define the tokens in the class FeatureModelSyntaxHighlighter.java and include cases when xor, or and ? are detected. Lastly, we have to change a minor part in FeatureModelAnnotator.java to disable the enforced feature coloring.
Related Issue
#42
Motivation and Context
Feature models in Clafer require support for grouping operators to match the language specification. With more boolean operators enabled, we are allowed to do more designs in the feature models. These changes improve usability and compliance with Clafer’s feature modeling semantics.
How Has This Been Tested?
We included the operators xor, or and ? into the given feature-model file in the Snake project and checked if errors occur. We also wrote a small test to check if xor, or and ? are really recognized as our defined tokens.
Demo:
Cross-Tree.dependency_demo.mp4
Types of changes
Checklist: