From 797c02bd1b60847f4ec858fcde2df92b0224e58f Mon Sep 17 00:00:00 2001
From: Ralf Jung <jung@mpi-sws.org>
Date: Thu, 20 May 2021 11:18:28 +0200
Subject: [PATCH] explicitly declare visibility of Scope actions
---
Makefile.coq.local | 3 ++-
iris/proofmode/string_ident.v | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/Makefile.coq.local b/Makefile.coq.local
index 7fc51f31d..6a0bc8656 100644
--- a/Makefile.coq.local
+++ b/Makefile.coq.local
@@ -13,9 +13,10 @@ NORMALIZER:=test-normalizer.sed
test: $(TESTFILES:.v=.vo)
# Make sure everything imports the options, and all Instance/Argument/Hint are qualified.
+ $(SHOW)"Performing some style checks..."
$(HIDE)for FILE in $(VFILES); do \
if ! fgrep -q 'From iris.prelude Require Import options.' "$$FILE"; then echo "ERROR: $$FILE does not import 'options'."; echo; exit 1; fi ; \
- if egrep '^\s*(Instance|Arguments|Remove|Hint (Extern|Constructors|Resolve|Immediate|Mode|Opaque|Transparent|Unfold))\s' "$$FILE"; then echo "ERROR: $$FILE contains unqualified 'Instance'/'Arguments'/'Hint' (see above)."; echo "Please add 'Global' or 'Local' as appropriate."; echo; exit 1; fi \
+ if egrep '^\s*(Instance|Arguments|Remove|Hint\s+(Extern|Constructors|Resolve|Immediate|Mode|Opaque|Transparent|Unfold)|(Open|Close)\s+Scope)\s' "$$FILE"; then echo "ERROR: $$FILE contains unqualified 'Instance'/'Arguments'/'Hint'/'Scope' (see above)."; echo "Please add 'Global' or 'Local' as appropriate."; echo; exit 1; fi \
done
# Make sure main Iris does not import other Iris packages.
$(HIDE)if egrep 'iris\.(heap_lang|deprecated|staging)' --include "*.v" -R iris; then echo "ERROR: Iris may not import modules from other Iris packages (see above for violations)."; echo; exit 1; fi
diff --git a/iris/proofmode/string_ident.v b/iris/proofmode/string_ident.v
index 594bd361a..6143cefe5 100644
--- a/iris/proofmode/string_ident.v
+++ b/iris/proofmode/string_ident.v
@@ -77,7 +77,7 @@ Module StringToIdent.
intros $ident).
End StringToIdent.
-Open Scope string_scope.
+Global Open Scope string_scope.
(** Finally we wrap everything up intro a tactic that renames a variable given
by ident [id] into the name given by string [s].
--
GitLab