diff options
Diffstat (limited to 'mathcomp/algebra')
| -rw-r--r-- | mathcomp/algebra/Makefile | 22 | ||||
| -rw-r--r-- | mathcomp/algebra/fraction.v | 4 | ||||
| -rw-r--r-- | mathcomp/algebra/matrix.v | 4 | ||||
| -rw-r--r-- | mathcomp/algebra/mxalgebra.v | 4 | ||||
| -rw-r--r-- | mathcomp/algebra/mxpoly.v | 2 | ||||
| -rw-r--r-- | mathcomp/algebra/opam | 2 | ||||
| -rw-r--r-- | mathcomp/algebra/poly.v | 2 | ||||
| -rw-r--r-- | mathcomp/algebra/vector.v | 2 |
8 files changed, 12 insertions, 30 deletions
diff --git a/mathcomp/algebra/Makefile b/mathcomp/algebra/Makefile index 8f03823..d4e1bca 100644 --- a/mathcomp/algebra/Makefile +++ b/mathcomp/algebra/Makefile @@ -4,25 +4,7 @@ ifeq "$(COQBIN)" "" COQBIN=$(dir $(shell which coqtop))/ endif -BRANCH_coq = $(shell $(COQBIN)/coqtop -v | head -1 | sed 's/.*version \([0-9]\.[0-9]\)[^ ]* .*/v\1/') - -HASH_coq = $(shell echo Quit. | $(COQBIN)/coqtop 2>&1 | head -1 | sed 's/^.*(\([a-f0-9]*\)).*/\1/' ) - -HASH_coq_v85beta1 = eaa3d0b15adf4eb11ffb00ab087746a5b15c4d5d - - -ifeq "$(HASH_coq)" "$(HASH_coq_v85beta1)" -V=v8.5beta1 -else -V=$(BRANCH_coq) -endif - -ifeq "$V" "v8.4" -COQDEP=../../etc/utils/ssrcoqdep -else COQDEP=$(COQBIN)/coqdep -endif - OLD_MAKEFLAGS:=$(MAKEFLAGS) MAKEFLAGS+=-B @@ -30,13 +12,13 @@ MAKEFLAGS+=-B %: $(H)[ -e Makefile.coq ] || $(COQBIN)/coq_makefile -f Make -o Makefile.coq - $(H)MAKEFLAGS=$(OLD_MAKEFLAGS) $(MAKE) --no-print-directory \ + $(H)MAKEFLAGS="$(OLD_MAKEFLAGS)" $(MAKE) --no-print-directory \ -f Makefile.coq $* \ COQDEP='$(COQDEP) -c' .PHONY: clean clean: - $(H)MAKEFLAGS=$(OLD_MAKEFLAGS) $(MAKE) --no-print-directory \ + $(H)MAKEFLAGS="$(OLD_MAKEFLAGS)" $(MAKE) --no-print-directory \ -f Makefile.coq clean $(H)rm -f Makefile.coq diff --git a/mathcomp/algebra/fraction.v b/mathcomp/algebra/fraction.v index 8cf811a..98eb9f1 100644 --- a/mathcomp/algebra/fraction.v +++ b/mathcomp/algebra/fraction.v @@ -16,8 +16,8 @@ Unset Strict Implicit. Unset Printing Implicit Defensive. Import GRing.Theory. -Open Local Scope ring_scope. -Open Local Scope quotient_scope. +Local Open Scope ring_scope. +Local Open Scope quotient_scope. Reserved Notation "{ 'ratio' T }" (at level 0, format "{ 'ratio' T }"). Reserved Notation "{ 'fraction' T }" (at level 0, format "{ 'fraction' T }"). diff --git a/mathcomp/algebra/matrix.v b/mathcomp/algebra/matrix.v index 2aa117d..5f47691 100644 --- a/mathcomp/algebra/matrix.v +++ b/mathcomp/algebra/matrix.v @@ -147,7 +147,7 @@ Unset Printing Implicit Defensive. Import GroupScope. Import GRing.Theory. -Open Local Scope ring_scope. +Local Open Scope ring_scope. Reserved Notation "''M_' n" (at level 8, n at level 2, format "''M_' n"). Reserved Notation "''rV_' n" (at level 8, n at level 2, format "''rV_' n"). @@ -193,7 +193,7 @@ Reserved Notation "\tr A" (at level 10, A at level 8, format "\tr A"). Reserved Notation "\det A" (at level 10, A at level 8, format "\det A"). Reserved Notation "\adj A" (at level 10, A at level 8, format "\adj A"). -Notation Local simp := (Monoid.Theory.simpm, oppr0). +Local Notation simp := (Monoid.Theory.simpm, oppr0). (*****************************************************************************) (****************************Type Definition**********************************) diff --git a/mathcomp/algebra/mxalgebra.v b/mathcomp/algebra/mxalgebra.v index 3b3ca5d..da61dfb 100644 --- a/mathcomp/algebra/mxalgebra.v +++ b/mathcomp/algebra/mxalgebra.v @@ -135,7 +135,7 @@ Unset Printing Implicit Defensive. Import GroupScope. Import GRing.Theory. -Open Local Scope ring_scope. +Local Open Scope ring_scope. Reserved Notation "\rank A" (at level 10, A at level 8, format "\rank A"). Reserved Notation "A ^C" (at level 8, format "A ^C"). @@ -160,7 +160,7 @@ Notation "''A' [ F ]_ n" := 'A[F]_(n) Delimit Scope matrix_set_scope with MS. -Notation Local simp := (Monoid.Theory.simpm, oppr0). +Local Notation simp := (Monoid.Theory.simpm, oppr0). (*****************************************************************************) (******************** Rank and row-space theory ******************************) diff --git a/mathcomp/algebra/mxpoly.v b/mathcomp/algebra/mxpoly.v index 1301a94..eeece16 100644 --- a/mathcomp/algebra/mxpoly.v +++ b/mathcomp/algebra/mxpoly.v @@ -64,7 +64,7 @@ Unset Printing Implicit Defensive. Import GRing.Theory. Import Monoid.Theory. -Open Local Scope ring_scope. +Local Open Scope ring_scope. Import Pdiv.Idomain. (* Row vector <-> bounded degree polynomial bijection *) diff --git a/mathcomp/algebra/opam b/mathcomp/algebra/opam index a94d17b..59dd47d 100644 --- a/mathcomp/algebra/opam +++ b/mathcomp/algebra/opam @@ -3,7 +3,7 @@ name: "coq-mathcomp-algebra" version: "dev" maintainer: "Mathematical Components <mathcomp-dev@sympa.inria.fr>" -homepage: "http://ssr.msr-inria.inria.fr/" +homepage: "http://math-comp.github.io/math-comp/" bug-reports: "Mathematical Components <mathcomp-dev@sympa.inria.fr>" license: "CeCILL-B" diff --git a/mathcomp/algebra/poly.v b/mathcomp/algebra/poly.v index 22caa4a..56493dd 100644 --- a/mathcomp/algebra/poly.v +++ b/mathcomp/algebra/poly.v @@ -101,7 +101,7 @@ Unset Strict Implicit. Unset Printing Implicit Defensive. Import GRing.Theory. -Open Local Scope ring_scope. +Local Open Scope ring_scope. Reserved Notation "{ 'poly' T }" (at level 0, format "{ 'poly' T }"). Reserved Notation "c %:P" (at level 2, format "c %:P"). diff --git a/mathcomp/algebra/vector.v b/mathcomp/algebra/vector.v index da6dc59..b7a9052 100644 --- a/mathcomp/algebra/vector.v +++ b/mathcomp/algebra/vector.v @@ -93,7 +93,7 @@ Require Import finfun tuple ssralg matrix mxalgebra zmodp. Set Implicit Arguments. Unset Strict Implicit. Unset Printing Implicit Defensive. -Open Local Scope ring_scope. +Local Open Scope ring_scope. Reserved Notation "{ 'vspace' T }" (at level 0, format "{ 'vspace' T }"). Reserved Notation "''Hom' ( T , rT )" (at level 8, format "''Hom' ( T , rT )"). |