Skip to content

Commit e6db84d

Browse files
committed
Fix errors caused by HOL deleting various quotient_*Theory
1 parent 3cf115c commit e6db84d

File tree

7 files changed

+14
-18
lines changed

7 files changed

+14
-18
lines changed

candle/overloading/syntax/holSyntaxExtraScript.sml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6865,7 +6865,7 @@ Proof
68656865
`!l ty1 ty2. equal_upto l ty1 ty2 ==> l = [] ==> ty1 = ty2`
68666866
suffices_by metis_tac[]
68676867
\\ ho_match_mp_tac equal_upto_ind \\ fs[]
6868-
\\ CONV_TAC(DEPTH_CONV ETA_CONV) \\ fs[quotient_listTheory.LIST_REL_EQ]
6868+
\\ CONV_TAC(DEPTH_CONV ETA_CONV) \\ fs[]
68696869

68706870
QED
68716871

compiler/backend/proofs/backendProofScript.sml

+2-2
Original file line numberDiff line numberDiff line change
@@ -485,8 +485,8 @@ Proof
485485
simp [keep_progs_def, FUN_EQ_THM]
486486
QED
487487

488-
Triviality compile_inc_progs_defs = LIST_CONJ
489-
[compile_inc_progs_def, keep_progs_T, quotient_pairTheory.PAIR_MAP_I]
488+
Triviality compile_inc_progs_defs =
489+
LIST_CONJ [compile_inc_progs_def, keep_progs_T]
490490

491491
Theorem cake_orac_eqs:
492492
state_co (\c (env_id, decs). inc_compile env_id c

compiler/backend/proofs/bvi_tailrecProofScript.sml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1070,7 +1070,7 @@ Proof
10701070
\\ fs[state_rel_def] )
10711071
\\ imp_res_tac state_rel_const
10721072
\\ fs[case_eq_thms]
1073-
\\ rveq \\ fs[OPTREL_def,quotient_pairTheory.PAIR_REL_THM]
1073+
\\ rveq \\ fs[OPTREL_def,PAIR_REL_THM]
10741074
\\ fs[state_rel_def]
10751075
QED
10761076

@@ -1087,7 +1087,7 @@ Proof
10871087
\\ first_x_assum(qspec_then`vs`strip_assume_tac)
10881088
\\ fs[case_eq_thms,OPTREL_def] \\ rw[] \\ rfs[]
10891089
\\ fs[PULL_EXISTS]
1090-
\\ rveq \\ fs[quotient_pairTheory.PAIR_REL]
1090+
\\ rveq \\ fs[PAIR_REL]
10911091
\\ TRY(pairarg_tac \\ fs[])
10921092
\\ imp_res_tac state_rel_const
10931093
\\ fs[bvlSemTheory.do_app_def,case_eq_thms,bvl_to_bvi_id]

compiler/backend/proofs/clos_annotateProofScript.sml

+2-2
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,7 @@ Proof
386386
\\ imp_res_tac v_to_list \\ fs[] \\ rw[]
387387
\\ TRY (strip_tac \\ rw[])
388388
\\ fs[EVERY2_MAP,v_rel_Number]
389-
\\ fsrw_tac[ETA_ss][EQ_SYM_EQ,quotient_listTheory.LIST_REL_EQ]
389+
\\ fsrw_tac[ETA_ss][EQ_SYM_EQ]
390390
\\ fs[LIST_EQ_REWRITE,EL_MAP,LIST_REL_EL_EQN] \\ rfs[EL_MAP]
391391
\\ METIS_TAC[EL_MAP,o_DEF]
392392
QED
@@ -401,7 +401,7 @@ Proof
401401
\\ imp_res_tac v_to_list \\ fs[] \\ rw[]
402402
\\ TRY (strip_tac \\ rw[])
403403
\\ fs[EVERY2_MAP,v_rel_Number]
404-
\\ fsrw_tac[ETA_ss][EQ_SYM_EQ,quotient_listTheory.LIST_REL_EQ]
404+
\\ fsrw_tac[ETA_ss][EQ_SYM_EQ]
405405
\\ fs[LIST_EQ_REWRITE,EL_MAP,LIST_REL_EL_EQN] \\ rfs[EL_MAP]
406406
\\ METIS_TAC[EL_MAP,o_DEF]
407407
QED

compiler/backend/proofs/flat_patternProofScript.sml

-3
Original file line numberDiff line numberDiff line change
@@ -685,9 +685,6 @@ Theorem v_rel_l_cases = TypeBase.nchotomy_of ``: v``
685685
val env_rel_def = ``env_rel N env1 env2``
686686
|> SIMP_CONV bool_ss [v_rel_cases]
687687

688-
val add_q = augment_srw_ss [simpLib.named_rewrites "pair_rel_thm"
689-
[quotient_pairTheory.PAIR_REL_THM]];
690-
691688
Definition install_conf_rel_def:
692689
install_conf_rel pat_cfg ic1 ic2 <=>
693690
(ic2.compile_oracle =

compiler/backend/proofs/source_evalProofScript.sml

+5-6
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ Proof
126126
Induct
127127
\\ simp [FORALL_PROD, EXISTS_PROD]
128128
\\ rw []
129-
\\ fs [namespaceTheory.nsBindList_def, quotient_pairTheory.PAIR_REL_THM]
129+
\\ fs [namespaceTheory.nsBindList_def]
130130
\\ irule env_rel_add_nsBind
131131
\\ simp []
132132
QED
@@ -428,8 +428,7 @@ Theorem pmatch:
428428
Proof
429429
disch_tac
430430
\\ ho_match_mp_tac pmatch_ind
431-
\\ rw [pmatch_def, match_result_rel_def,
432-
quotient_pairTheory.PAIR_REL_THM]
431+
\\ rw [pmatch_def, match_result_rel_def]
433432
\\ rveq \\ fs []
434433
\\ imp_res_tac v_to_env_id_SOME
435434
\\ fs [pmatch_def]
@@ -1010,7 +1009,7 @@ Proof
10101009
\\ simp [build_rec_env_merge, nsAppend_to_nsBindList]
10111010
\\ irule env_rel_add_nsBindList
10121011
\\ simp [LIST_REL_MAP1, SIMP_RULE (bool_ss ++ ETA_ss) [] LIST_REL_MAP2]
1013-
\\ simp [ELIM_UNCURRY, quotient_pairTheory.PAIR_REL_THM, EVERY2_refl]
1012+
\\ simp [ELIM_UNCURRY, EVERY2_refl]
10141013
)
10151014
>~ [‘getOpClass op = Icing’]
10161015
>- (
@@ -1141,7 +1140,7 @@ Proof
11411140
\\ simp [build_rec_env_merge, nsAppend_to_nsBindList]
11421141
\\ irule env_rel_add_nsBindList
11431142
\\ simp [LIST_REL_MAP1, SIMP_RULE (bool_ss ++ ETA_ss) [] LIST_REL_MAP2]
1144-
\\ simp [quotient_pairTheory.PAIR_REL_THM, ELIM_UNCURRY]
1143+
\\ simp [ELIM_UNCURRY]
11451144
\\ simp [GSYM pairarg_to_pair_map, ELIM_UNCURRY, EVERY2_refl]
11461145
QED
11471146

@@ -1198,7 +1197,7 @@ Proof
11981197
\\ irule env_rel_add_nsBindList
11991198
\\ simp []
12001199
\\ simp [LIST_REL_MAP1, SIMP_RULE (bool_ss ++ ETA_ss) [] LIST_REL_MAP2]
1201-
\\ simp [quotient_pairTheory.PAIR_REL_THM, ELIM_UNCURRY]
1200+
\\ simp [ELIM_UNCURRY]
12021201
\\ simp [EVERY2_refl]
12031202
QED
12041203

compiler/inference/proofs/inferPropsScript.sml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4081,7 +4081,7 @@ Proof
40814081
match_mp_tac nsAll_alist_to_ns
40824082
\\ simp[EVERY_MAP,every_zip_snd]
40834083
\\ imp_res_tac generalise_inf_set_tids
4084-
\\ fs[GSYM LIST_REL_MAP_inv_image, quotient_listTheory.LIST_REL_EQ]
4084+
\\ fs[GSYM LIST_REL_MAP_inv_image]
40854085
\\ simp[GSYM (Q.ISPEC`inf_set_tids`(CONV_RULE SWAP_FORALL_CONV EVERY_MAP))]
40864086
\\ pop_assum(assume_tac o SYM)
40874087
\\ simp[]
@@ -4120,7 +4120,7 @@ Proof
41204120
\\ simp[MAP2_MAP, UNCURRY, EVERY_MAP]
41214121
\\ simp[every_zip_snd]
41224122
\\ imp_res_tac generalise_inf_set_tids
4123-
\\ fs[GSYM LIST_REL_MAP_inv_image, quotient_listTheory.LIST_REL_EQ]
4123+
\\ fs[GSYM LIST_REL_MAP_inv_image]
41244124
\\ simp[GSYM (Q.ISPEC`inf_set_tids`(CONV_RULE SWAP_FORALL_CONV EVERY_MAP))]
41254125
\\ pop_assum(assume_tac o SYM)
41264126
\\ simp[]

0 commit comments

Comments
 (0)