Skip to content

Update attribute whitelist #3443

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 4 commits into from
Jun 1, 2023
Merged

Update attribute whitelist #3443

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3cf8805
Update whitelist so that frontend tests pass
Scott-Guest May 30, 2023
9b7e03a
Update whitelist so that KEVM builds
Scott-Guest May 30, 2023
4a6507a
Add spacing in unrecognized attributes error message
Scott-Guest Jun 1, 2023
f059fcf
Merge branch 'develop' into update-whitelist
Scott-Guest Jun 1, 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
4 changes: 2 additions & 2 deletions k-distribution/tests/regression-new/bison-glr-bug/iele.k
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
module IELE-SYNTAX
imports IELE-COMMON
syntax IeleNameToken ::=
r"(?<![A-Za-z0-9\\_\\.\\-\\$])[a-zA-Z\\.\\_\\$][0-9a-zA-Z\\.\\_\\-\\$]*" [notInRules, prec(3), token]
r"(?<![A-Za-z0-9\\_\\.\\-\\$])[a-zA-Z\\.\\_\\$][0-9a-zA-Z\\.\\_\\-\\$]*" [prec(3), token]
syntax Keyword ::=
"load" [token]
| "store" [token]
Expand Down Expand Up @@ -321,7 +321,7 @@ module IELE-COMMON
List{LabeledBlock,""} [klabel(labeledBlockList)]
syntax UnlabeledBlock ::=
Instructions
syntax Blocks [flatPredicate]
syntax Blocks
syntax Blocks ::=
UnlabeledBlock LabeledBlocks [avoid]
| LabeledBlocks
Expand Down
2 changes: 1 addition & 1 deletion k-distribution/tests/regression-new/bracket-priority/test.k
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ syntax Exp ::= "(" Name ExpList ")"
syntax Exp ::= Int
| Name
syntax Name ::= Id
syntax ExpList ::= List{Exp,""} [expList]
syntax ExpList ::= List{Exp,""} [group(expList)]
syntax Name ::= BuiltinName
syntax BuiltinName ::= "+"

Expand Down
4 changes: 2 additions & 2 deletions k-distribution/tests/regression-new/checkWarns/syntaxGroups.k
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) K Team. All Rights Reserved.
module SYNTAXGROUPS-SYNTAX
syntax Exp ::= Exp "*" Exp [times, unused]
> Exp "+" Exp [plus, unused]
syntax Exp ::= Exp "*" Exp [group(times), unused]
> Exp "+" Exp [group(plus), unused]

syntax left times plus
endmodule
Expand Down
2 changes: 1 addition & 1 deletion kernel/src/main/java/org/kframework/compile/checks/CheckAtt.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ private void checkUnrecognizedAtts(Sentence sentence) {
*/
if (!sentence.att().rawKeys().isEmpty()) {
errors.add(KEMException.compilerError("Unrecognized attributes: " +
sentence.att().rawKeys().mkString("[", ",", "]") +
sentence.att().rawKeys().mkString("[", ", ", "]") +
"\nHint: User-defined groups can be added with the group(_) attribute.", sentence));
}
}
Expand Down
3 changes: 3 additions & 0 deletions kore/src/main/scala/org/kframework/attributes/Att.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,7 @@ object Att {
final val ML_BINDER = Key("mlBinder", KeyType.BuiltIn)
final val ML_OP = Key("mlOp", KeyType.BuiltIn)
final val MULTIPLICITY = Key("multiplicity", KeyType.BuiltIn)
final val NO_EVALUATORS = Key("no-evaluators", KeyType.BuiltIn)
final val NO_THREAD = Key("noThread", KeyType.BuiltIn)
final val NON_ASSOC = Key("non-assoc", KeyType.BuiltIn)
final val NON_EXECUTABLE = Key("non-executable", KeyType.BuiltIn)
Expand All @@ -200,6 +201,7 @@ object Att {
final val PARSER = Key("parser", KeyType.BuiltIn)
final val PREC = Key("prec", KeyType.BuiltIn)
final val PREFER = Key("prefer", KeyType.BuiltIn)
final val PRESERVES_DEFINEDNESS = Key("preserves-definedness", KeyType.BuiltIn)
final val PRIORITY = Key("priority", KeyType.BuiltIn)
final val PRIVATE = Key("private", KeyType.BuiltIn)
final val PUBLIC = Key("public", KeyType.BuiltIn)
Expand All @@ -213,6 +215,7 @@ object Att {
final val SMT_LEMMA = Key("smt-lemma", KeyType.BuiltIn)
final val STREAM = Key("stream", KeyType.BuiltIn)
final val STRICT = Key("strict", KeyType.BuiltIn)
final val STRUCTURAL = Key("structural", KeyType.BuiltIn)
final val SYMBOL = Key("symbol", KeyType.BuiltIn)
final val SYMBOLIC = Key("symbolic", KeyType.BuiltIn)
final val TAG = Key("tag", KeyType.BuiltIn)
Expand Down