Skip to content
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

detect bogus #[key] attribute #480

Merged
merged 2 commits into from
Dec 12, 2024
Merged

detect bogus #[key] attribute #480

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a5f9712
detect bogus #[key] attribute
gares Dec 12, 2024
7d8cf23
Apply suggestions from code review
gares Dec 12, 2024
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
23 changes: 15 additions & 8 deletions HB/factory.elpi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,19 +96,26 @@ kind asset type.
type asset-mixin asset.
type asset-factory asset.

pred check-key-attribute-consistency i:id.
check-key-attribute-consistency _ :- not(get-option "key" _), !.
check-key-attribute-consistency ID :- get-option "key" ID, !.
check-key-attribute-consistency ID :- get-option "key" ID1,
coq.error "HB:" {calc ("The #[key=\"" ^ ID1 ^ "\"] attribute")}
"does not match the selected subject" ID.

pred is-key i:indt-decl.
pred is-key i:arity.
pred is-key i:context-decl.
is-key (parameter _ _ _ _\ record _ _ _ _) :- !.
is-key (parameter _ _ _ _\ inductive _ _ _ _) :- !.
is-key (parameter _ _ _ _\ arity _) :- !.
is-key (context-item _ _ _ _ _\ context-end) :- !.
is-key (parameter ID _ _ _\ record _ _ _ _) :- !, check-key-attribute-consistency ID.
is-key (parameter ID _ _ _\ inductive _ _ _ _) :- !, check-key-attribute-consistency ID.
is-key (parameter ID _ _ _\ arity _) :- !, check-key-attribute-consistency ID.
is-key (context-item ID _ _ _ _\ context-end) :- !, check-key-attribute-consistency ID.
is-key (parameter ID _ _ _) :- get-option "key" ID, !.
is-key (context-item ID _ _ _ _) :- get-option "key" ID, !.
is-key (parameter _ _ _ p\ parameter _ _ (M p) _) :-
pi p\ factory? (M p) _, !.
is-key (context-item _ _ _ _ p\ context-item _ _ (M p) _ _) :-
pi p\ factory? (M p) _, !.
is-key (parameter ID _ _ p\ parameter _ _ (M p) _) :-
pi p\ factory? (M p) _, !, check-key-attribute-consistency ID.
is-key (context-item ID _ _ _ p\ context-item _ _ (M p) _ _) :-
pi p\ factory? (M p) _, !, check-key-attribute-consistency ID.

pred mixin-decl-w-mixins i:string, i:string, i:term, i:(term -> A),
i:(A -> pair (list (w-args mixinname)) A -> prop),
Expand Down
1 change: 1 addition & 0 deletions Makefile.test-suite.coq.local
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ post-all::
$(call DIFF, tests/compress_coe.v)
$(call DIFF, tests/about.v)
$(call DIFF, tests/howto.v)
$(call DIFF, tests/err_miss_key.v)
$(call DIFF, tests/missing_join_error.v)
$(call DIFF, tests/not_same_key.v)
$(call DIFF, tests/hnf.v)
4 changes: 4 additions & 0 deletions tests/err_miss_key.v
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
From HB Require Import structures.

Fail #[key="Tmiss"]
HB.mixin Record Foo T := {}.
2 changes: 2 additions & 0 deletions tests/err_miss_key.v.out
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
The command has indeed failed with message:
HB: The #[key="Tmiss"] attribute does not match the selected subject T
Loading