merged
authorwenzelm
Thu, 19 Aug 2021 13:22:06 +0200
changeset 74431 b5eba4717648
parent 74428 8e2355ddce1b (current diff)
parent 74430 c6bce3633c53 (diff)
child 74432 3f371ba2b4fc
merged
--- a/src/Pure/General/time.scala	Thu Aug 19 12:31:06 2021 +0200
+++ b/src/Pure/General/time.scala	Thu Aug 19 13:22:06 2021 +0200
@@ -14,8 +14,8 @@
 object Time
 {
   def seconds(s: Double): Time = new Time((s * 1000.0).round)
-  def minutes(s: Double): Time = new Time((s * 60000.0).round)
-  def ms(m: Long): Time = new Time(m)
+  def minutes(m: Double): Time = new Time((m * 60000.0).round)
+  def ms(ms: Long): Time = new Time(ms)
   def hms(h: Int, m: Int, s: Double): Time = seconds(s + 60 * m + 3600 * h)
 
   def now(): Time = ms(System.currentTimeMillis())
--- a/src/Pure/General/timing.ML	Thu Aug 19 12:31:06 2021 +0200
+++ b/src/Pure/General/timing.ML	Thu Aug 19 13:22:06 2021 +0200
@@ -1,7 +1,7 @@
 (*  Title:      Pure/General/timing.ML
     Author:     Makarius
 
-Basic support for time measurement.
+Support for time measurement.
 *)
 
 signature BASIC_TIMING =
--- a/src/Pure/System/bash.ML	Thu Aug 19 12:31:06 2021 +0200
+++ b/src/Pure/System/bash.ML	Thu Aug 19 13:22:06 2021 +0200
@@ -1,7 +1,7 @@
 (*  Title:      Pure/System/bash.ML
     Author:     Makarius
 
-Syntax for GNU bash.
+Support for GNU bash.
 *)
 
 signature BASH =
--- a/src/Pure/System/bash.scala	Thu Aug 19 12:31:06 2021 +0200
+++ b/src/Pure/System/bash.scala	Thu Aug 19 13:22:06 2021 +0200
@@ -1,7 +1,8 @@
 /*  Title:      Pure/System/bash.scala
     Author:     Makarius
 
-GNU bash processes, with propagation of interrupts.
+Support for GNU bash: portable external processes with propagation of
+interrupts.
 */
 
 package isabelle
--- a/src/Pure/proofterm.ML	Thu Aug 19 12:31:06 2021 +0200
+++ b/src/Pure/proofterm.ML	Thu Aug 19 13:22:06 2021 +0200
@@ -266,8 +266,6 @@
   maps (fn PBody {thms, ...} => map (thm_node_consolidate o #2) thms)
   #> Lazy.consolidate #> map Lazy.force #> ignore;
 
-val consolidate_body = consolidate_bodies o single;
-
 fun make_thm_node theory_name name prop body export =
   let
     val consolidate =
@@ -1983,7 +1981,7 @@
     fun fulfill () =
       postproc (fulfill_norm_proof thy (map (apsnd Future.join) promises) (Future.join body));
   in
-    if null promises then Future.map (postproc #> tap consolidate_body) body
+    if null promises then Future.map postproc body
     else if Future.is_finished body andalso length promises = 1 then
       Future.map (fn _ => fulfill ()) (snd (hd promises))
     else