diff -r 779af7c58743 -r 78b1d6c3ee9c src/HOL/MicroJava/J/WellForm.thy --- a/src/HOL/MicroJava/J/WellForm.thy Wed Dec 06 19:09:34 2000 +0100 +++ b/src/HOL/MicroJava/J/WellForm.thy Wed Dec 06 19:10:36 2000 +0100 @@ -30,14 +30,12 @@ wf_cdecl :: "'c wf_mb => 'c prog => 'c cdecl => bool" "wf_cdecl wf_mb G == - \\(C,(sc,fs,ms)). - (\\f\\set fs. wf_fdecl G f ) \\ unique fs \\ + \\(C,(D,fs,ms)). + (\\f\\set fs. wf_fdecl G f) \\ unique fs \\ (\\m\\set ms. wf_mdecl wf_mb G C m) \\ unique ms \\ - (case sc of None => C = Object - | Some D => - is_class G D \\ \\ G\\D\\C C \\ - (\\(sig,rT,b)\\set ms. \\D' rT' b'. - method(G,D) sig = Some(D',rT',b') --> G\\rT\\rT'))" + (C \\ Object \\ is_class G D \\ \\G\\D\\C C \\ + (\\(sig,rT,b)\\set ms. \\D' rT' b'. + method(G,D) sig = Some(D',rT',b') --> G\\rT\\rT'))" wf_prog :: "'c wf_mb => 'c prog => bool" "wf_prog wf_mb G ==