Skip to content

Commit 309c4e3

Browse files
committed
Report some simple inference errors
1 parent 84bfd9a commit 309c4e3

File tree

3 files changed

+90
-80
lines changed

3 files changed

+90
-80
lines changed

typing/pure_inferencePropsScript.sml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1371,9 +1371,6 @@ Proof
13711371
recInduct infer'_ind >> rw[infer'_def, infer_def] >>
13721372
rw[infer'_prim_def |> DefnBase.one_line_ify NONE] >>
13731373
simp[apply_foldr_def, FOLDR_MAP] >> gvs[NULL_EQ]
1374-
>- ( (* Prim - no arguments *)
1375-
TOP_CASE_TAC >> rw[infer_def]
1376-
)
13771374
>- ( (* Prim *)
13781375
TOP_CASE_TAC >> rw[infer_def]
13791376
>- foldr_eq_tac
@@ -1394,8 +1391,8 @@ Proof
13941391
pairarg_tac >> gvs[] >> rpt (AP_TERM_TAC ORELSE AP_THM_TAC) >> rw[FUN_EQ_THM] >>
13951392
last_x_assum drule >> rw[]
13961393
) >>
1397-
qmatch_goalsub_abbrev_tac `case css of [] => _ | _::_ => foo` >>
1398-
`(case css of [] => fail (Unknown d) | _::_ => foo) = foo` by (
1394+
qmatch_goalsub_abbrev_tac `case css of [] => err | _::_ => foo` >>
1395+
`(case css of [] => err | _::_ => foo) = foo` by (
13991396
Cases_on `css` >> gvs[]) >>
14001397
pop_assum SUBST_ALL_TAC >> unabbrev_all_tac >> rw[LAMBDA_PROD, FUN_EQ_THM] >>
14011398
ntac 2 (rpt (AP_TERM_TAC ORELSE AP_THM_TAC) >> rw[FUN_EQ_THM]) >>
@@ -1419,8 +1416,8 @@ Proof
14191416
ntac 2 (TOP_CASE_TAC >> gvs[]) >> pairarg_tac >> gvs[] >>
14201417
simp[return_def] >> rw[] >> simp[oreturn_def, return_def]
14211418
) >>
1422-
simp[return_def, infer_bind_def] >> rename1 `oreturn _ _ n` >>
1423-
qsuff_tac `oreturn (Unknown d) (oHD tys) n = OK (HD tys, n)` >> simp[] >>
1419+
simp[return_def, infer_bind_def] >> rename1 `oreturn err _ n` >>
1420+
qsuff_tac `oreturn err (oHD tys) n = OK (HD tys, n)` >> simp[] >>
14241421
qsuff_tac `LENGTH tys = LENGTH css`
14251422
>- (rw[] >> Cases_on `tys` >> gvs[oreturn_def, return_def]) >>
14261423
qpat_x_assum `FOLDR _ _ _ _ = _` mp_tac >> rpt $ pop_assum kall_tac >>

0 commit comments

Comments
 (0)