# HG changeset patch # User oheimb # Date 962785709 -7200 # Node ID 91423cd08c6f553ffae6ffc1b4974245c1d73a89 # Parent 428385c4bc50801ad696fa844649ba58616a781a corrected symbol for casting relation diff -r 428385c4bc50 -r 91423cd08c6f src/HOL/MicroJava/J/JTypeSafe.ML --- a/src/HOL/MicroJava/J/JTypeSafe.ML Tue Jul 04 15:58:11 2000 +0200 +++ b/src/HOL/MicroJava/J/JTypeSafe.ML Wed Jul 05 10:28:29 2000 +0200 @@ -30,7 +30,7 @@ qed "NewC_conforms"; Goalw [cast_ok_def] - "\\ wf_prog wf_mb G; G,h\\v\\\\Tb; G\\Tb\\? T'; cast_ok G T' h v\\ \ + "\\ wf_prog wf_mb G; G,h\\v\\\\Tb; G\\Tb\\? T'; cast_ok G T' h v\\ \ \ \\ G,h\\v\\\\T'"; by( case_tac1 "v = Null" 1); by( Asm_full_simp_tac 1); diff -r 428385c4bc50 -r 91423cd08c6f src/HOL/MicroJava/J/TypeRel.ML --- a/src/HOL/MicroJava/J/TypeRel.ML Tue Jul 04 15:58:11 2000 +0200 +++ b/src/HOL/MicroJava/J/TypeRel.ML Wed Jul 05 10:28:29 2000 +0200 @@ -117,14 +117,14 @@ val prove_cast_lemma = prove_typerel_lemma [] cast.elim; -val cast_RefT = prove_typerel "G\\RefT R\\? T \\ \\t. T=RefT t" +val cast_RefT = prove_typerel "G\\RefT R\\? T \\ \\t. T=RefT t" [prove_typerel_lemma [widen_RefT] cast.elim - "G\\S\\? T \\ S=RefT R \\ (\\t. T=RefT t)"]; + "G\\S\\? T \\ S=RefT R \\ (\\t. T=RefT t)"]; -val cast_RefT2 = prove_typerel "G\\S\\? RefT R \\ \\t. S=RefT t" +val cast_RefT2 = prove_typerel "G\\S\\? RefT R \\ \\t. S=RefT t" [prove_typerel_lemma [widen_RefT2] cast.elim - "G\\S\\? T \\ T=RefT R \\ (\\t. S=RefT t)"]; + "G\\S\\? T \\ T=RefT R \\ (\\t. S=RefT t)"]; -val cast_PrimT2 = prove_typerel "G\\S\\? PrimT pt \\ G\\S\\PrimT pt" - [prove_cast_lemma "G\\S\\? T \\ T=PrimT pt \\ G\\S\\PrimT pt"]; +val cast_PrimT2 = prove_typerel "G\\S\\? PrimT pt \\ G\\S\\PrimT pt" + [prove_cast_lemma "G\\S\\? T \\ T=PrimT pt \\ G\\S\\PrimT pt"]; diff -r 428385c4bc50 -r 91423cd08c6f src/HOL/MicroJava/J/TypeRel.thy --- a/src/HOL/MicroJava/J/TypeRel.thy Tue Jul 04 15:58:11 2000 +0200 +++ b/src/HOL/MicroJava/J/TypeRel.thy Wed Jul 05 10:28:29 2000 +0200 @@ -17,13 +17,13 @@ subcls1 :: "'c prog \\ [cname, cname] \\ bool" ("_\\_\\C1_" [71,71,71] 70) subcls :: "'c prog \\ [cname, cname] \\ bool" ("_\\_\\C _" [71,71,71] 70) widen :: "'c prog \\ [ty, ty] \\ bool" ("_\\_\\_" [71,71,71] 70) - cast :: "'c prog \\ [ty, ty] \\ bool" ("_\\_\\? _"[71,71,71] 70) + cast :: "'c prog \\ [ty, ty] \\ bool" ("_\\_\\? _"[71,71,71] 70) translations "G\\C \\C1 D" == "(C,D) \\ subcls1 G" "G\\C \\C D" == "(C,D) \\ (subcls1 G)^*" "G\\S \\ T" == "(S,T) \\ widen G" - "G\\S \\? T" == "(S,T) \\ cast G" + "G\\S \\? T" == "(S,T) \\ cast G" defs @@ -69,8 +69,8 @@ subcls "G\\C\\C D \\ G\\Class C \\ Class D" null "G\\ NT \\ RefT R" -inductive "cast G" intrs (* casting / narr.ref. conversion, cf. 5.5 / 5.1.5 *) - widen "G\\S\\T \\ G\\ S \\? T" - subcls "G\\C\\C D \\ G\\Class D \\? Class C" +inductive "cast G" intrs (* casting conversion, cf. 5.5 / 5.1.5 *) + widen "G\\S\\T \\ G\\ S \\? T" + subcls "G\\C\\C D \\ G\\Class D \\? Class C" end diff -r 428385c4bc50 -r 91423cd08c6f src/HOL/MicroJava/J/WellType.thy --- a/src/HOL/MicroJava/J/WellType.thy Tue Jul 04 15:58:11 2000 +0200 +++ b/src/HOL/MicroJava/J/WellType.thy Wed Jul 05 10:28:29 2000 +0200 @@ -96,7 +96,7 @@ (* cf. 15.15 *) Cast "\\E\\e\\T; - prg E\\T\\? T'\\ \\ + prg E\\T\\? T'\\ \\ E\\Cast T' e\\T'" (* cf. 15.7.1 *)