diff -r 321e220a6baa -r 034150db9d91 ProgTutorial/Package/Ind_Code.thy --- a/ProgTutorial/Package/Ind_Code.thy Tue May 21 16:22:30 2019 +0200 +++ b/ProgTutorial/Package/Ind_Code.thy Wed May 22 12:38:51 2019 +0200 @@ -580,10 +580,14 @@ \ ML %grayML\fun chop_print params1 params2 prems1 prems2 ctxt = let - val pps = [Pretty.big_list "Params1 from the rule:" (map (pretty_cterm ctxt) params1), - Pretty.big_list "Params2 from the predicate:" (map (pretty_cterm ctxt) params2), - Pretty.big_list "Prems1 from the rule:" (map (pretty_thm ctxt) prems1), - Pretty.big_list "Prems2 from the predicate:" (map (pretty_thm ctxt) prems2)] + val pps = [Pretty.big_list "Params1 from the rule:" + (map (pretty_cterm ctxt) params1), + Pretty.big_list "Params2 from the predicate:" + (map (pretty_cterm ctxt) params2), + Pretty.big_list "Prems1 from the rule:" + (map (pretty_thm ctxt) prems1), + Pretty.big_list "Prems2 from the predicate:" + (map (pretty_thm ctxt) prems2)] in pps |> Pretty.chunks |> Pretty.string_of @@ -650,12 +654,11 @@ \fresh\\\ \Prems1 from the rule:\\\ @{term "a \ b"}\\ - @{text [break] -"\fresh. - (\a b. a \ b \ fresh a (Var b)) \ - (\a t s. fresh a t \ fresh a s \ fresh a (App t s)) \ - (\a t. fresh a (Lam a t)) \ - (\a b t. a \ b \ fresh a t \ fresh a (Lam b t)) \ fresh a t"}\\ + @{text "\fresh."}\\ + @{text "(\a b. a \ b \ fresh a (Var b)) \"}\\ + @{text "(\a t s. fresh a t \ fresh a s \ fresh a (App t s)) \"}\\ + @{text "(\a t. fresh a (Lam a t)) \ "}\\ + @{text "(\a b t. a \ b \ fresh a t \ fresh a (Lam b t)) \ fresh a t"}\\ \Prems2 from the predicate:\\\ @{term "\a b. a \ b \ fresh a (Var b)"}\\ @{term "\a t s. fresh a t \ fresh a s \ fresh a (App t s)"}\\ @@ -682,7 +685,8 @@ val (params1, params2) = chop (length cparams - length preds) cparams val (prems1, prems2) = chop (length prems - length rules) prems in - resolve_tac context [Object_Logic.rulify context (all_elims params1 (nth prems2 i))] 1 + resolve_tac context + [Object_Logic.rulify context (all_elims params1 (nth prems2 i))] 1 end)\ text \ @@ -755,7 +759,8 @@ val (params1, params2) = chop (length cparams - length preds) cparams val (prems1, prems2) = chop (length prems - length rules) prems in - resolve_tac context [Object_Logic.rulify context (all_elims params1 (nth prems2 i))] 1 + resolve_tac context + [Object_Logic.rulify context (all_elims params1 (nth prems2 i))] 1 THEN EVERY1 (map (prepare_prem context params2 prems2) prems1) end)\ @@ -854,7 +859,8 @@ val (params1, params2) = chop (length cparams - length preds) cparams val (prems1, prems2) = chop (length prems - length rules) prems in - resolve_tac context [Object_Logic.rulify context (all_elims params1 (nth prems2 i))] 1 + resolve_tac context + [Object_Logic.rulify context (all_elims params1 (nth prems2 i))] 1 THEN EVERY1 (map (prepare_prem params2 prems2 context) prems1) end)\