Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
I
Iris
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Abel Nieto
Iris
Commits
e0d10c05
Commit
e0d10c05
authored
5 years ago
by
Robbert Krebbers
Browse files
Options
Downloads
Patches
Plain Diff
Properly set scopes for `ectx(i)_language`, like we do for `language`.
This fixes the problem in
iris/iris!275 (comment 42062)
parent
7e82f0ab
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
theories/program_logic/ectx_language.v
+7
-4
7 additions, 4 deletions
theories/program_logic/ectx_language.v
theories/program_logic/ectxi_language.v
+7
-5
7 additions, 5 deletions
theories/program_logic/ectxi_language.v
with
14 additions
and
9 deletions
theories/program_logic/ectx_language.v
+
7
−
4
View file @
e0d10c05
...
...
@@ -61,13 +61,16 @@ Structure ectxLanguage := EctxLanguage {
EctxLanguageMixin
of_val
to_val
empty_ectx
comp_ectx
fill
head_step
}
.
Bind
Scope
expr_scope
with
expr
.
Bind
Scope
val_scope
with
val
.
Arguments
EctxLanguage
{_
_
_
_
_
_
_
_
_
_
_}
_
.
Arguments
of_val
{_}
_
%
V
.
Arguments
to_val
{_}
_
%
E
.
Arguments
of_val
{_}
_
.
Arguments
to_val
{_}
_
.
Arguments
empty_ectx
{_}
.
Arguments
comp_ectx
{_}
_
_
.
Arguments
fill
{_}
_
_
%
E
.
Arguments
head_step
{_}
_
%
E
_
_
_
%
E
_
_
.
Arguments
fill
{_}
_
_
.
Arguments
head_step
{_}
_
_
_
_
_
_
.
(* From an ectx_language, we can construct a language. *)
Section
ectx_language
.
...
...
This diff is collapsed.
Click to expand it.
theories/program_logic/ectxi_language.v
+
7
−
5
View file @
e0d10c05
...
...
@@ -65,11 +65,14 @@ Structure ectxiLanguage := EctxiLanguage {
EctxiLanguageMixin
of_val
to_val
fill_item
head_step
}
.
Bind
Scope
expr_scope
with
expr
.
Bind
Scope
val_scope
with
val
.
Arguments
EctxiLanguage
{_
_
_
_
_
_
_
_
_}
_
.
Arguments
of_val
{_}
_
%
V
.
Arguments
to_val
{_}
_
%
E
.
Arguments
fill_item
{_}
_
_
%
E
.
Arguments
head_step
{_}
_
%
E
_
_
_
%
E
_
_
.
Arguments
of_val
{_}
_
.
Arguments
to_val
{_}
_
.
Arguments
fill_item
{_}
_
_
.
Arguments
head_step
{_}
_
_
_
_
_
_
.
Section
ectxi_language
.
Context
{
Λ
:
ectxiLanguage
}
.
...
...
@@ -144,7 +147,6 @@ Section ectxi_language.
Proof
.
change
(
LanguageCtx
(
fill
[
Ki
]))
.
apply
_
.
Qed
.
End
ectxi_language
.
Arguments
fill
{_}
_
_
%
E
.
Arguments
ectxi_lang_ectx
:
clear
implicits
.
Arguments
ectxi_lang
:
clear
implicits
.
Coercion
ectxi_lang_ectx
:
ectxiLanguage
>->
ectxLanguage
.
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment