diff --git a/Makefile.coq.local b/Makefile.coq.local index 7fc51f31d8c557396809147585a0acbf270366cf..6a0bc865635542d7b1864c6c811bee0ad6220df1 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 594bd361ae3c682fd694061ecc8c2d32f718c863..6143cefe537971fd5f5b72867dac2ad8defaa0d7 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].