# HG changeset patch
# User wenzelm
# Date 1120639298 -7200
# Node ID 33f38450cab674115e4406fab036fee4e4f3fe44
# Parent  89cc9172f0beb1192f53cb280f31abf90eb61ea7
tuned;

diff -r 89cc9172f0be -r 33f38450cab6 Admin/profiling_report
--- a/Admin/profiling_report	Wed Jul 06 10:34:07 2005 +0200
+++ b/Admin/profiling_report	Wed Jul 06 10:41:38 2005 +0200
@@ -14,6 +14,8 @@
     if (m,^([ 0-9]{10}) (\S+$|GARBAGE COLLECTION.*$),) {
 	my $count = $1;
 	my $fun = $2;
+	$fun =~ s,-?\(\d+\).*$,,g;
+	$fun =~ s,/\d+$,,g;
 	if ($count =~ m,^\s*(\d)+$,) {
 	    if (defined($log{$fun})) {
 		$log{$fun} += $count;
diff -r 89cc9172f0be -r 33f38450cab6 src/Pure/library.ML
--- a/src/Pure/library.ML	Wed Jul 06 10:34:07 2005 +0200
+++ b/src/Pure/library.ML	Wed Jul 06 10:41:38 2005 +0200
@@ -298,13 +298,13 @@
 fun I x = x;
 fun K x = fn y => x;
 
-(*reverse apply*)
-fun (x |> f) = f x;
-fun ((x, y) |-> f) = f x y;
-fun ((x, y) |>> f) = (f x, y);
-fun ((x, y) ||> f) = (x, f y);
-fun ((x, y) |>>> f) = let val (x', z) = f x in (x', (y, z)) end;
-fun ((x, y) ||>> f) = let val (z, y') = f y in ((x, z), y') end;
+(*reverse application and structured results*)
+fun x |> f = f x;
+fun (x, y) |-> f = f x y;
+fun (x, y) |>> f = (f x, y);
+fun (x, y) ||> f = (x, f y);
+fun (x, y) |>>> f = let val (x', z) = f x in (x', (y, z)) end;
+fun (x, y) ||>> f = let val (z, y') = f y in ((x, z), y') end;
 
 (*application of (infix) operator to its left or right argument*)
 fun apl (x, f) y = f (x, y);
@@ -475,21 +475,11 @@
     fun fold_aux [] y = ([], y)
       | fold_aux (x :: xs) y =
           let
-            val (x', y') = f x y
-            val (xs', y'') = fold_aux xs y'
+            val (x', y') = f x y;
+            val (xs', y'') = fold_aux xs y';
           in (x' :: xs', y'') end;
   in fold_aux end;
 
-fun foldl_map f =
-  let
-    fun fold_aux (x, []) = (x, [])
-      | fold_aux (x, y :: ys) =
-          let
-            val (x', y') = f (x, y);
-            val (x'', ys') = fold_aux (x', ys);
-          in (x'', y' :: ys') end;
-  in fold_aux end;
-
 (*the following versions of fold are designed to fit nicely with infixes*)
 
 (*  (op @) (e, [x1, ..., xn])  ===>  ((e @ x1) @ x2) ... @ xn
@@ -515,6 +505,16 @@
 
 fun foldln f xs e = fst (foldl (fn ((e,i), x) => (f (x,i) e, i+1)) ((e,1),xs));
 
+fun foldl_map f =
+  let
+    fun fold_aux (x, []) = (x, [])
+      | fold_aux (x, y :: ys) =
+          let
+            val (x', y') = f (x, y);
+            val (x'', ys') = fold_aux (x', ys);
+          in (x'', y' :: ys') end;
+  in fold_aux end;
+
 
 (* basic list functions *)