~ chicken-core (chicken-5) e9db7f89efab0e06709c070076cb23623b308c79


commit e9db7f89efab0e06709c070076cb23623b308c79
Author:     Peter Bex <peter@more-magic.net>
AuthorDate: Sat Jul 4 15:06:53 2015 +0200
Commit:     Evan Hanson <evhan@foldling.org>
CommitDate: Mon Jul 13 09:52:21 2015 +1200

    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.
    
    Signed-off-by: Evan Hanson <evhan@foldling.org>

diff --git a/chicken-profile.scm b/chicken-profile.scm
index d65c0da9..0a375bbd 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 c8c4f090..71972210 100644
--- a/manual/Acknowledgements
+++ b/manual/Acknowledgements
@@ -29,32 +29,31 @@ 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
+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,
-Sam Varner, Taylor Venable, Sander Vesik, Jaques Vidrine, Panagiotis
-Vossos, Shawn Wagner, Peter Wang, Ed Watkeys, Brad Watson, Thomas
-Weidner, Göran Weinholt, Matthew Welland, Drake Wilson, Jörg
-Wittenberger, Peter Wright, Mark Wutka, Adam Young, Richard Zidlicky,
-Houman Zolfaghari and Florian Zumbiehl for bug-fixes, tips and
-suggestions.
+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, Sam Varner, Taylor Venable,
+Sander Vesik, Jaques Vidrine, Panagiotis Vossos, Shawn Wagner, Peter
+Wang, Ed Watkeys, Brad Watson, Thomas Weidner, Göran Weinholt, Matthew
+Welland, Drake Wilson, Jörg Wittenberger, Peter Wright, Mark Wutka, Adam
+Young, Richard Zidlicky, Houman Zolfaghari and Florian Zumbiehl for
+bug-fixes, tips and suggestions.
 
 Special thanks to Brandon van Every for contributing the (now defunct)
 [[http://www.cmake.org|CMake]] support and for helping with Windows
Trap