Guest User

Untitled

a guest
Jul 22nd, 2018
84
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 2.16 KB | None | 0 0
  1. diff --git a/Instances.v b/Instances.v
  2. index 1a2e08f..ef9a2e6 100644
  3. --- a/Instances.v
  4. +++ b/Instances.v
  5. @@ -13,8 +13,8 @@
  6. Require Export AAC.
  7.  
  8. Module Peano.
  9. - Require Import Arith NArith Max.
  10. - Program Instance aac_plus : @Op_AC nat eq plus 0 := @Build_Op_AC nat (@eq nat) plus 0 _ plus_0_l plus_assoc plus_comm.
  11. + Require Import Arith Max.
  12. + Instance aac_plus : @Op_AC nat eq plus 0 := @Build_Op_AC nat (@eq nat) plus 0 _ plus_0_l plus_assoc plus_comm.
  13.  
  14.  
  15. Program Instance aac_mult : Op_AC eq mult 1 := Build_Op_AC _ _ _ mult_assoc mult_comm.
  16. diff --git a/coq.ml b/coq.ml
  17. index 731204c..9994fe0 100644
  18. --- a/coq.ml
  19. +++ b/coq.ml
  20. @@ -29,7 +29,7 @@ let init_constant dir s = find_constant contrib_name dir s
  21. in the goal *)
  22. let nowhere =
  23. { Tacexpr.onhyps = Some [];
  24. - Tacexpr.concl_occs = Rawterm.no_occurrences_expr
  25. + Tacexpr.concl_occs = Glob_term.no_occurrences_expr
  26. }
  27.  
  28.  
  29. @@ -97,7 +97,7 @@ end
  30.  
  31. module Pos = struct
  32.  
  33. - let path = ["Coq" ; "NArith"; "BinPos"]
  34. + let path = ["Coq" ; "PArith"; "BinPos"]
  35. let typ = lazy (init_constant path "positive")
  36. let xI = lazy (init_constant path "xI")
  37. let xO = lazy (init_constant path "xO")
  38. @@ -144,7 +144,7 @@ end
  39.  
  40. (** Lists from the standard library*)
  41. module List = struct
  42. - let path = ["Coq"; "Lists"; "List"]
  43. + let path = ["Coq"; "Init"; "Datatypes"]
  44. let typ = lazy (init_constant path "list")
  45. let nil = lazy (init_constant path "nil")
  46. let cons = lazy (init_constant path "cons")
  47. diff --git a/theory.ml b/theory.ml
  48. index 45a76f1..08a2dcb 100644
  49. --- a/theory.ml
  50. +++ b/theory.ml
  51. @@ -666,13 +666,11 @@ module Trans = struct
  52. let env_sum, env_sum_letin = Coq.mk_letin "env_sum_name" (s.env_sum) in
  53. let s = {env_sym = env_sym; env_prd = env_prd; env_sum = env_sum} in
  54. let rb , tac = mk_reif_builders (fst eqt) (s.env_sym) in
  55. - let evar_map = Tacmach.project goal in
  56. let tac = Tacticals.tclTHENLIST (
  57. - [ Refiner.tclEVARS evar_map;
  58. - env_prd_letin ;
  59. - env_sum_letin ;
  60. - env_sym_letin ;
  61. - tac
  62. + [ env_prd_letin ;
  63. + env_sum_letin ;
  64. + env_sym_letin ;
  65. + tac
  66. ]) in
  67. s, (sm, rb), tac
Add Comment
Please, Sign In to add comment