# HG changeset patch # User wenzelm # Date 1326554062 -3600 # Node ID d86ef6b960973ae007a2849e2c5f86e2f0cf881c # Parent 2616e68877c9516d18f512d2618d9026de8e9c8b tuned white space; diff -r 2616e68877c9 -r d86ef6b96097 src/HOL/Bali/Conform.thy --- a/src/HOL/Bali/Conform.thy Sat Jan 14 16:12:09 2012 +0100 +++ b/src/HOL/Bali/Conform.thy Sat Jan 14 16:14:22 2012 +0100 @@ -380,8 +380,7 @@ conforms :: "state \ env' \ bool" ("_\\_" [71,71] 70) where "xs\\E = (let (G, L) = E; s = snd xs; l = locals s in - (\r. \obj\globs s r: G,s\obj \\\r) \ - \ G,s\l [\\\]L\ \ + (\r. \obj\globs s r: G,s\obj \\\r) \ G,s\l [\\\]L \ (\a. fst xs=Some(Xcpt (Loc a)) \ G,s\Addr a\\ Class (SXcpt Throwable)) \ (fst xs=Some(Jump Ret) \ l Result \ None))" diff -r 2616e68877c9 -r d86ef6b96097 src/HOL/Bali/Decl.thy --- a/src/HOL/Bali/Decl.thy Sat Jan 14 16:12:09 2012 +0100 +++ b/src/HOL/Bali/Decl.thy Sat Jan 14 16:14:22 2012 +0100 @@ -70,7 +70,7 @@ fix x y z::acc_modi show "(x < y) = (x \ y \ \ y \ x)" by (auto simp add: le_acc_def less_acc_def split add: acc_modi.split) - show "x \ x" \\ -- reflexivity + show "x \ x" -- reflexivity by (auto simp add: le_acc_def) { assume "x \ y" "y \ z" -- transitivity @@ -766,8 +766,7 @@ section "general recursion operators for the interface and class hiearchies" -function - iface_rec :: "prog \ qtname \ \(qtname \ iface \ 'a set \ 'a) \ 'a" +function iface_rec :: "prog \ qtname \ (qtname \ iface \ 'a set \ 'a) \ 'a" where [simp del]: "iface_rec G I f = (case iface G I of diff -r 2616e68877c9 -r d86ef6b96097 src/HOL/Bali/Example.thy --- a/src/HOL/Bali/Example.thy Sat Jan 14 16:12:09 2012 +0100 +++ b/src/HOL/Bali/Example.thy Sat Jan 14 16:14:22 2012 +0100 @@ -275,8 +275,8 @@ definition test :: "(ty)list \ stmt" where "test pTs = (e:==NewC Ext;; - \ Try Expr({Main,ClassT Base,IntVir}!!e\foo({pTs}[Lit Null])) - \ Catch((SXcpt NullPointer) z) + Try Expr({Main,ClassT Base,IntVir}!!e\foo({pTs}[Lit Null])) + Catch((SXcpt NullPointer) z) (lab1\ While(Acc (Acc (arr_viewed_from Main Ext).[Lit (Intg 2)])) Skip))" diff -r 2616e68877c9 -r d86ef6b96097 src/HOL/Bali/Table.thy --- a/src/HOL/Bali/Table.thy Sat Jan 14 16:12:09 2012 +0100 +++ b/src/HOL/Bali/Table.thy Sat Jan 14 16:14:22 2012 +0100 @@ -280,9 +280,8 @@ done -definition - Un_tables :: "('a, 'b) tables set \ ('a, 'b) tables" - where "Un_tables ts\\= (\k. \t\ts. t k)" +definition Un_tables :: "('a, 'b) tables set \ ('a, 'b) tables" + where "Un_tables ts = (\k. \t\ts. t k)" definition overrides_t :: "('a, 'b) tables \ ('a, 'b) tables \ ('a, 'b) tables" (infixl "\\" 100) diff -r 2616e68877c9 -r d86ef6b96097 src/HOL/Bali/TypeRel.thy --- a/src/HOL/Bali/TypeRel.thy Sat Jan 14 16:12:09 2012 +0100 +++ b/src/HOL/Bali/TypeRel.thy Sat Jan 14 16:14:22 2012 +0100 @@ -337,9 +337,9 @@ implmt :: "prog \ qtname \ qtname \ bool" ("_\_\_" [71,71,71] 70) for G :: prog where - direct: "G\C\1J \\ \ G\C\J" -| subint: "\G\C\1I; G\I\I J\ \ G\C\J" -| subcls1: "\G\C\\<^sub>C1D; G\D\J \ \ G\C\J" + direct: "G\C\1J \ G\C\J" +| subint: "G\C\1I \ G\I\I J \ G\C\J" +| subcls1: "G\C\\<^sub>C1D \ G\D\J \ G\C\J" lemma implmtD: "G\C\J \ (\I. G\C\1I \ G\I\I J) \ (\D. G\C\\<^sub>C1D \ G\D\J)" apply (erule implmt.induct) @@ -602,9 +602,9 @@ | obj_arr: "G\Class Object\T.[]" | int_cls: "G\ Iface I\Class C" | subint: "imethds G I hidings imethds G J entails - (\(md, mh ) (md',mh').\G\mrt mh\mrt mh') \ - \G\I\I J \\\\ G\ Iface I\Iface J" -| array: "G\RefT S\RefT T \\ G\ RefT S.[]\RefT T.[]" + (\(md, mh ) (md',mh'). G\mrt mh\mrt mh') \ + \G\I\I J \ G\ Iface I\Iface J" +| array: "G\RefT S\RefT T \ G\ RefT S.[]\RefT T.[]" (*unused*) lemma narrow_RefT: "G\RefT R\T \ \t. T=RefT t" diff -r 2616e68877c9 -r d86ef6b96097 src/HOL/Bali/WellForm.thy --- a/src/HOL/Bali/WellForm.thy Sat Jan 14 16:12:09 2012 +0100 +++ b/src/HOL/Bali/WellForm.thy Sat Jan 14 16:14:22 2012 +0100 @@ -58,9 +58,9 @@ definition wf_mhead :: "prog \ pname \ sig \ mhead \ bool" where "wf_mhead G P = (\ sig mh. length (parTs sig) = length (pars mh) \ - \ ( \T\set (parTs sig). is_acc_type G P T) \ + ( \T\set (parTs sig). is_acc_type G P T) \ is_acc_type G P (resTy mh) \ - \ distinct (pars mh))" + distinct (pars mh))" text {* diff -r 2616e68877c9 -r d86ef6b96097 src/HOL/Bali/WellType.thy --- a/src/HOL/Bali/WellType.thy Sat Jan 14 16:12:09 2012 +0100 +++ b/src/HOL/Bali/WellType.thy Sat Jan 14 16:14:22 2012 +0100 @@ -108,7 +108,7 @@ definition --{* applicable methods, cf. 15.11.2.1 *} - appl_methds :: "prog \ qtname \ ref_ty \ sig \ (emhead \ ty list)\ set" where + appl_methds :: "prog \ qtname \ ref_ty \ sig \ (emhead \ ty list) set" where "appl_methds G S rt = (\ sig. {(mh,pTs') |mh pTs'. mh \ mheads G S rt \name=name sig,parTs=pTs'\ \ G\(parTs sig)[\]pTs'})" @@ -121,7 +121,7 @@ definition --{* maximally specific methods, cf. 15.11.2.2 *} - max_spec :: "prog \ qtname \ ref_ty \ sig \ (emhead \ ty list)\ set" where + max_spec :: "prog \ qtname \ ref_ty \ sig \ (emhead \ ty list) set" where "max_spec G S rt sig = {m. m \appl_methds G S rt sig \ (\m'\appl_methds G S rt sig. more_spec G m' m \ m'=m)}"