Skip to content

Allow macros on hooked sorts #2489

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
Mar 22, 2022
Merged

Allow macros on hooked sorts #2489

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
a6fe63f
Allow macros on hooked sorts
Mar 17, 2022
7d5151e
Merge branch 'master' into allow-macro-on-hooked-sorts
Mar 17, 2022
c2d68fb
Merge branch 'master' into allow-macro-on-hooked-sorts
Mar 21, 2022
1fd5102
Merge branch 'master' into allow-macro-on-hooked-sorts
rv-jenkins Mar 22, 2022
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
6 changes: 5 additions & 1 deletion k-distribution/tests/regression-new/macro_vars/macro-vars.k
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,8 @@ module MACRO-VARS
syntax CPPType ::= underlyingType(CPPType) [function]
syntax CPPType ::= "cppEnumType"
rule cppEnumType => bar(_, scopedEnum() #Or unscopedEnum() ) [macro, unboundVariables(_)]
endmodule

syntax Int ::= "hookedMacro" [macro]
rule hookedMacro => 5

endmodule
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 @@ -51,7 +51,7 @@ private void check(Production prod) {
Att sortAtt = m.sortAttributesFor().getOrElse(prod.sort().head(), () -> Att.empty());
if (sortAtt.contains(Att.HOOK()) && !sortAtt.get(Att.HOOK()).equals("ARRAY.Array") && !(sortAtt.get(Att.HOOK()).equals("KVAR.KVar") && isSymbolicKast)) {
if (!prod.att().contains(Att.FUNCTION()) && !prod.att().contains(Att.BRACKET()) &&
!prod.att().contains("token") && !(prod.klabel().isDefined() && macros.contains(prod.klabel().get()))) {
!prod.att().contains("token") && !prod.att().contains("macro") && !(prod.klabel().isDefined() && macros.contains(prod.klabel().get()))) {
Copy link
Copy Markdown
Contributor

@Baltoli Baltoli Mar 22, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This isn't a change to this specific PR (which looks good to me), but it would be nice in general to have this kind of deeply nested / long chain code factored out into a helper method with a comment explaining the logic. Perhaps it would be worth someone spending some time on the API design of the frontend to make this kind of code easier to write

if (!(prod.sort().equals(Sorts.K()) && ((prod.klabel().isDefined() && (prod.klabel().get().name().equals("#EmptyK") || prod.klabel().get().name().equals("#KSequence"))) || prod.isSubsort()))) {
if (!(sortAtt.contains("cellCollection") && prod.isSubsort())) {
errors.add(KEMException.compilerError("Cannot add new constructors to hooked sort " + prod.sort(), prod));
Expand Down