From 13ef1a8075cf7151413d3cba2b2c32eec0a04f5d Mon Sep 17 00:00:00 2001
From: Peter Bex <address@hidden>
Date: Sat, 4 Jul 2015 15:06:53 +0200
Subject: [PATCH] Replace calls to deleted "remove" with "filter" in
 chicken-profile.

We also simplify the filter, as #f never occurs in the call count position
and the rest of the code does not handle #f there either.
---
 chicken-profile.scm     | 28 +++++++++++++---------------
 manual/Acknowledgements | 34 +++++++++++++++++-----------------
 2 files changed, 30 insertions(+), 32 deletions(-)

diff --git a/chicken-profile.scm b/chicken-profile.scm
index d65c0da..0a375bb 100644
--- a/chicken-profile.scm
+++ b/chicken-profile.scm
@@ -211,29 +211,27 @@ EOF
     (if (< 0 top (length data))
 	(set! data (take data top)))
     (set! data (map (lambda (entry)
-		      (let ([c (second entry)] ; count
-			    [t (third entry)]  ; total time
-			    [a (fourth entry)] ; average time
-			    [p (fifth entry)] ) ; % of max time
+		      (let ((c (second entry)) ; count
+			    (t (third entry))  ; total time
+			    (a (fourth entry)) ; average time
+			    (p (fifth entry)) ) ; % of max time
 			(list (##sys#symbol->qualified-string (first entry))
 			      (if (not c) "overflow" (number->string c))
 			      (format-real (/ t 1000) seconds-digits)
 			      (format-real (/ a 1000) average-digits)
 			      (format-real p percent-digits))))
-		    (remove (lambda (entry) 
-			      (if (second entry) 
-				  (and (zero? (second entry)) no-unused)
-				  #f) )
-			    data)))
-    (let* ([headers (list "procedure" "calls" "seconds" "average" "percent")]
-	   [alignments (list #f #t #t #t #t)]
-	   [spacing 2]
-	   [spacer (make-string spacing #\space)]
-	   [column-widths (foldl
+		    (if no-unused
+			(filter (lambda (entry) (> (second entry) 0)) data)
+			data)))
+    (let* ((headers (list "procedure" "calls" "seconds" "average" "percent"))
+	   (alignments (list #f #t #t #t #t))
+	   (spacing 2)
+	   (spacer (make-string spacing #\space))
+	   (column-widths (foldl
 			   (lambda (max-widths row)
 			     (map max (map string-length row) max-widths))
 			   (list 0 0 0 0 0)
-			   (cons headers data))])
+			   (cons headers data))))
       (define (print-row row)
 	(print (string-intersperse (map format-string row column-widths alignments) spacer)))
       (print-row headers)
diff --git a/manual/Acknowledgements b/manual/Acknowledgements
index c8c4f09..5e4fc72 100644
--- a/manual/Acknowledgements
+++ b/manual/Acknowledgements
@@ -29,23 +29,23 @@ Peter Keller, Christian Kellermann, Brad Kind, Ron Kneusel, Matthias
 Köppe, Krysztof Kowalczyk, Andre Kühne, Todd R. Kueny Sr, Goran
 Krampe, David Krentzlin, Ben Kurtz, Michele La Monaca, Micky
 Latowicki, Kristian Lein-Mathisen, John Lenz, Kirill Lisovsky, Jürgen
-Lorenz, Kon Lovett, Lam Luu, Vitaly Magerya, Leonardo Valeri Manera,
-Claude Marinier, Dennis Marti, Charles Martin, Bob McIsaac, "megane",
-Alain Mellan, Eric Merrit, Perry Metzger, Scott G. Miller, Mikael,
-Karel Miklav, Bruce Mitchener, Fadi Moukayed, Chris Moline, Eric
-E. Moore, Julian Morrison, Dan Muresan, David N. Murray, Timo Myyrä,
-"nicktick", Lars Nilsson, Ian Oversby, "o.t.", Gene Pavlovsky, Levi
-Pearson, Jeronimo Pellegrini, Nicolas Pelletier, Derrell Piper, Carlos
-Pita, "Pluijzer", Robin Lee Powell, Alan Post, "Pupeno", Davide
-Puricelli, "presto", Doug Quale, Imran Rafique, Eric Raible, Ivan
-Raikov, Santosh Rajan, Joel Reymont, "rivo", Chris Roberts, Eric
-Rochester, Paul Romanchenko, Andreas Rottman, David Rush, Lars
-Rustemeier, Daniel Sadilek, Otavio Salvador, Burton Samograd,
-"Sandro", "satori", Aleksej Saushev, Oskar Schirmer, Reed Sheridan,
-Ronald Schröder, Spencer Schumann, Ivan Shcheklein, Alex Shinn, Ivan
-Shmakov, "Shmul", Tony Sidaway, Jeffrey B. Siegal, Andrey Sidorenko,
-Michele Simionato, Iruata Souza, Volker Stolz, Jon Strait, Dorai
-Sitaram, Robert Skeels, Jason Songhurst, Clifford Stein, David
+Lorenz, Kon Lovett, Lam Luu, Arthur Maciel, Vitaly Magerya, Leonardo
+Valeri Manera, Claude Marinier, Dennis Marti, Charles Martin, Bob
+McIsaac, "megane", Alain Mellan, Eric Merrit, Perry Metzger, Scott
+G. Miller, Mikael, Karel Miklav, Bruce Mitchener, Fadi Moukayed, Chris
+Moline, Eric E. Moore, Julian Morrison, Dan Muresan, David N. Murray,
+Timo Myyrä, "nicktick", Lars Nilsson, Ian Oversby, "o.t.", Gene
+Pavlovsky, Levi Pearson, Jeronimo Pellegrini, Nicolas Pelletier,
+Derrell Piper, Carlos Pita, "Pluijzer", Robin Lee Powell, Alan Post,
+"Pupeno", Davide Puricelli, "presto", Doug Quale, Imran Rafique, Eric
+Raible, Ivan Raikov, Santosh Rajan, Joel Reymont, "rivo", Chris
+Roberts, Eric Rochester, Paul Romanchenko, Andreas Rottman, David
+Rush, Lars Rustemeier, Daniel Sadilek, Otavio Salvador, Burton
+Samograd, "Sandro", "satori", Aleksej Saushev, Oskar Schirmer, Reed
+Sheridan, Ronald Schröder, Spencer Schumann, Ivan Shcheklein, Alex
+Shinn, Ivan Shmakov, "Shmul", Tony Sidaway, Jeffrey B. Siegal, Andrey
+Sidorenko, Michele Simionato, Iruata Souza, Volker Stolz, Jon Strait,
+Dorai Sitaram, Robert Skeels, Jason Songhurst, Clifford Stein, David
 Steiner, Sunnan, Zbigniew Szadkowski, Rick Taube, Nathan Thern, Mike
 Thomas, Minh Thu, Christian Tismer, Andre van Tonder, John Tobey,
 Henrik Tramberend, Vladimir Tsichevsky, James Ursetto, Neil van Dyke,
-- 
2.1.4