diff options
| author | Pierre Boutillier | 2014-08-05 11:53:36 +0200 |
|---|---|---|
| committer | Pierre Boutillier | 2014-08-05 11:53:44 +0200 |
| commit | e497afaccc78e92b71e60878d593273dce0036a1 (patch) | |
| tree | 52ef75f681c8a4c827977e39f5285591b4334331 | |
| parent | 87a60c55292e6e9f8dbcfec4d64cb9ae940618f9 (diff) | |
Better fix of e5c025
| -rw-r--r-- | interp/constrintern.ml | 2 | ||||
| -rw-r--r-- | plugins/setoid_ring/Ring_polynom.v | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/interp/constrintern.ml b/interp/constrintern.ml index b5693ebe84..fb232762cd 100644 --- a/interp/constrintern.ml +++ b/interp/constrintern.ml @@ -1179,7 +1179,7 @@ let drop_notations_pattern looked_for = | CPatDelimiters (loc, key, e) -> in_pat top {env with scopes=find_delimiters_scope loc key::env.scopes; tmp_scope = None} e - | CPatPrim (loc,p) -> fst (Notation.interp_prim_token_cases_pattern_expr loc (ensure_kind false loc) p + | CPatPrim (loc,p) -> fst (Notation.interp_prim_token_cases_pattern_expr loc (test_kind false) p (env.tmp_scope,env.scopes)) | CPatAtom (loc, Some id) -> begin diff --git a/plugins/setoid_ring/Ring_polynom.v b/plugins/setoid_ring/Ring_polynom.v index 9e88b6c900..5ec73950bd 100644 --- a/plugins/setoid_ring/Ring_polynom.v +++ b/plugins/setoid_ring/Ring_polynom.v @@ -1397,7 +1397,7 @@ Qed. match p with | xI _ => rpow r (Cp_phi (Npos p)) | xO _ => rpow r (Cp_phi (Npos p)) - | 1%positive => r + | 1 => r end == pow_pos rmul r p. Proof. destruct p; now rewrite ?pow_th.(rpow_pow_N). Qed. |