Skip to content

Make the attribute whitelist opt-out #3455

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.

Sign up for GitHub

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

Merged
rv-jenkins merged 6 commits into from
Jun 13, 2023
Merged

Make the attribute whitelist opt-out #3455

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c0fe2df
Make the attribute whitelist opt-out
Scott-Guest Jun 7, 2023
6e5594f
Merge branch 'develop' into whitelist-opt-out
Scott-Guest Jun 8, 2023
d391779
Wrap user-defined attributes in k-tutorial.
Scott-Guest Jun 9, 2023
f709960
Merge branch 'develop' into whitelist-opt-out
Scott-Guest Jun 12, 2023
594ffa5
Merge branch 'develop' into whitelist-opt-out
rv-jenkins Jun 13, 2023
745e90f
Merge branch 'develop' into whitelist-opt-out
rv-jenkins Jun 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions k-distribution/k-tutorial/1_basic/04_disambiguation/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,12 +200,12 @@ will express the exact same grammar as `lesson-04-b.k`
```k
module LESSON-04-D

syntax Boolean ::= "true" [literal] | "false" [literal]
| "(" Boolean ")" [atom, bracket]
| "!" Boolean [not, function]
| Boolean "&&" Boolean [and, function]
| Boolean "^" Boolean [xor, function]
| Boolean "||" Boolean [or, function]
syntax Boolean ::= "true" [group(literal)] | "false" [group(literal)]
| "(" Boolean ")" [group(atom), bracket]
| "!" Boolean [group(not), function]
| Boolean "&&" Boolean [group(and), function]
| Boolean "^" Boolean [group(xor), function]
| Boolean "||" Boolean [group(or), function]

syntax priorities literal atom > not > and > xor > or
syntax left and
Expand Down
4 changes: 2 additions & 2 deletions k-distribution/k-tutorial/1_basic/11_casts/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,8 @@ example, consider the following definition:
module LESSON-11-C
imports INT

syntax Exp ::= Int | Exp "+" Exp [exp]
syntax Exp2 ::= Exp | Exp2 "+" Exp2 [exp2]
syntax Exp ::= Int | Exp "+" Exp [group(exp)]
syntax Exp2 ::= Exp | Exp2 "+" Exp2 [group(exp2)]
endmodule
```

Expand Down
1 change: 0 additions & 1 deletion k-distribution/tests/regression-new/group/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,5 @@ DEF=test
EXT=test
TESTDIR=.
KOMPILE_BACKEND=llvm
KOMPILE_FLAGS=--pedantic-attributes

include ../../../include/kframework/ktest.mak
2 changes: 1 addition & 1 deletion k-distribution/tests/regression-new/issue-1169/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ include ../../../include/kframework/ktest.mak

$(KOMPILED_DIR)/timestamp: $(DEF).k
$(KOMPILE) $(DEF).k -E > $(DEF2).k
$(KOMPILE) $(DEF2).k --no-prelude --main-module TEST --syntax-module TEST
$(KOMPILE) $(DEF2).k --no-pedantic-attributes --no-prelude --main-module TEST --syntax-module TEST
rm -rf $(KOMPILED_DIR)
mv test2-kompiled $(KOMPILED_DIR)

Expand Down
3 changes: 1 addition & 2 deletions k-distribution/tests/regression-new/pedanticAttributes/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
KOMPILE_FLAGS=-w none --syntax-module TEST --pedantic-attributes

KOMPILE_FLAGS=-w none --syntax-module TEST
include ../../../include/kframework/ktest-fail.mak
6 changes: 3 additions & 3 deletions kernel/src/main/java/org/kframework/utils/options/OuterParsingOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public synchronized File mainDefinitionFile(FileUtil files) {
@Parameter(names="--md-selector", description="Preprocessor: for .md files, select only the md code blocks that match the selector expression. Ex:'k&(!a|b)'.")
public String mdSelector = "k";

@Parameter(names="--pedantic-attributes", description="Require that all attributes are known built-ins. " +
"User-defined groups must be added through the group(_) attribute.")
public boolean pedanticAttributes = false;
@Parameter(names="--no-pedantic-attributes", description="Do not enforce that all attributes are known built-ins.",
hidden = true)
public boolean pedanticAttributes = true;
}