more aggressive compaction of multi-goal proof terms (see also a8babbb6d5ea, 4dd0ba632e40);
--- a/src/Pure/Isar/proof.ML Tue Jul 14 11:29:43 2015 +0200
+++ b/src/Pure/Isar/proof.ML Tue Jul 14 19:01:46 2015 +0200
@@ -498,7 +498,7 @@
fun err_lost () = error ("Lost goal structure:\n" ^ Display.string_of_thm ctxt goal);
val th =
- (Goal.conclude (if length (flat propss) > 1 then Thm.norm_proof goal else goal)
+ (Goal.conclude (if length (flat propss) > 1 then Thm.close_derivation goal else goal)
handle THM _ => err_lost ())
|> Drule.flexflex_unique (SOME ctxt)
|> Thm.check_shyps (Variable.sorts_of ctxt)
--- a/src/Pure/goal.ML Tue Jul 14 11:29:43 2015 +0200
+++ b/src/Pure/goal.ML Tue Jul 14 19:01:46 2015 +0200
@@ -231,7 +231,7 @@
(Thm.term_of stmt);
in
res
- |> length props > 1 ? Thm.norm_proof
+ |> length props > 1 ? Thm.close_derivation
|> Conjunction.elim_balanced (length props)
|> map (Assumption.export false ctxt' ctxt)
|> Variable.export ctxt' ctxt