~ chicken-core (chicken-5) ac8f2daddf4be1b6650ad48da14f3034bb5e310e

commit ac8f2daddf4be1b6650ad48da14f3034bb5e310e
Author:     felix <felix@call-with-current-continuation.org>
AuthorDate: Mon Aug 15 11:15:25 2011 +0200
Commit:     felix <felix@call-with-current-continuation.org>
CommitDate: Mon Aug 15 11:15:25 2011 +0200

    clear list of previous assignments in toplevel-assignment-removal for each branch in conditional (found by Paul Colby and Mario Domenench Goulart)

diff --git a/manual/Acknowledgements b/manual/Acknowledgements
index 07045638..46e7c668 100644
--- a/manual/Acknowledgements
+++ b/manual/Acknowledgements
@@ -10,40 +10,41 @@ Ashley Bone, Dominique Boucher, Terence Brannon, Roy Bryant, Adam
 Buchbinder, Hans Bulfone, "Category 5", Taylor Campbell, Naruto
 Canada, Mark Carter, Esteban U. Caamano Castro, Semih Cemiloglu,
 Franklin Chen, Joo ChurlSoo, Thomas Chust, Gian Paolo Ciceri, Fulvio
-Ciriaco, Tobia Conforto, John Cowan, Grzegorz Chrupala, James Crippen,
-Tollef Fog Heen, Drew Hess, Alejandro Forero Cuervo, Peter Danenberg,
-Linh Dang, Brian Denheyer, Sean D'Epagnier, "dgym", "Don", Chris
-Double, "Brown Dragon", David Dreisigmeyer, Jarod Eells, Petter
-Egesund, Stephen Eilert, Steve Elkins, Daniel B. Faken, Will Farr,
-Graham Fawcett, Marc Feeley, "Fizzie", Matthew Flatt, Kimura Fuyuki,
-Tony Garnock-Jones, Martin Gasbichler, Abdulaziz Ghuloum, Joey Gibson,
-Stephen C. Gilardi, Mario Domenech Goulart, Joshua Griffith, Johannes
-Groedem, Damian Gryski, Andreas Gustafsson, Sven Hartrumpf, Jun-ichiro
-itojun Hagino, Ahdi Hargo, Matthias Heiler, Karl M. Hegbloom, William
-P. Heinemann, Bill Hoffman, Bruce Hoult, Hans Huebner, Markus
-Huelsmann, Goetz Isenmann, Paulo Jabardo, Wietse Jacobs, David
-Janssens, Christian Jaeger, Matt Jones, Dale Jordan, Valentin
-Kamyshenko, Daishi Kato, Peter Keller, Brad Kind, Ron Kneusel,
-Matthias Koeppe, Krysztof Kowalczyk, Andre Kuehne, Todd R. Kueny Sr,
-Goran Krampe, David Krentzlin, Ben Kurtz, Micky Latowicki, John Lenz,
-Kirill Lisovsky, Juergen 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,
-"nicktick", Lars Nilsson, Ian Oversby, "o.t.", Gene Pavlovsky, Levi
-Pearson, Jeronimo Pellegrini, Nicolas Pelletier, Derrell Piper, Carlos
-Pita, Robin Lee Powell, Alan Post, "Pupeno", Davide Puricelli,
-"presto", Doug Quale, Imran Rafique, Eric Raible, Ivan Raikov, Santosh
-Rajan, Joel Reymont, Chris Roberts, Eric Rochester, Paul Romanchenko,
-Andreas Rottman, David Rush, Lars Rustemeier, Daniel Sadilek, Otavio
-Salvador, Burton Samograd, "Sandro", Aleksej Saushev, Oskar Schirmer,
-Reed Sheridan, Ronald Schroeder, 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,
+Ciriaco, Paul Colby, Tobia Conforto, John Cowan, Grzegorz Chrupala,
+James Crippen, Tollef Fog Heen, Drew Hess, Alejandro Forero Cuervo,
+Peter Danenberg, Linh Dang, Brian Denheyer, Sean D'Epagnier, "dgym",
+"Don", Chris Double, "Brown Dragon", David Dreisigmeyer, Jarod Eells,
+Petter Egesund, Stephen Eilert, Steve Elkins, Daniel B. Faken, Will
+Farr, Graham Fawcett, Marc Feeley, "Fizzie", Matthew Flatt, Kimura
+Fuyuki, Tony Garnock-Jones, Martin Gasbichler, Abdulaziz Ghuloum, Joey
+Gibson, Stephen C. Gilardi, Mario Domenech Goulart, Joshua Griffith,
+Johannes Groedem, Damian Gryski, Andreas Gustafsson, Sven Hartrumpf,
+Jun-ichiro itojun Hagino, Ahdi Hargo, Matthias Heiler, Karl
+M. Hegbloom, William P. Heinemann, Bill Hoffman, Bruce Hoult, Hans
+Huebner, Markus Huelsmann, Goetz Isenmann, Paulo Jabardo, Wietse
+Jacobs, David Janssens, Christian Jaeger, Matt Jones, Dale Jordan,
+Valentin Kamyshenko, Daishi Kato, Peter Keller, Brad Kind, Ron
+Kneusel, Matthias Koeppe, Krysztof Kowalczyk, Andre Kuehne, Todd
+R. Kueny Sr, Goran Krampe, David Krentzlin, Ben Kurtz, Micky
+Latowicki, John Lenz, Kirill Lisovsky, Juergen 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, "nicktick", Lars Nilsson, Ian
+Oversby, "o.t.", Gene Pavlovsky, Levi Pearson, Jeronimo Pellegrini,
+Nicolas Pelletier, Derrell Piper, Carlos Pita, Robin Lee Powell, Alan
+Post, "Pupeno", Davide Puricelli, "presto", Doug Quale, Imran Rafique,
+Eric Raible, Ivan Raikov, Santosh Rajan, Joel Reymont, Chris Roberts,
+Eric Rochester, Paul Romanchenko, Andreas Rottman, David Rush, Lars
+Rustemeier, Daniel Sadilek, Otavio Salvador, Burton Samograd,
+"Sandro", Aleksej Saushev, Oskar Schirmer, Reed Sheridan, Ronald
+Schroeder, 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, Neil van Dyke, Sam Varner,
 Taylor Venable, Sander Vesik, Jaques Vidrine, Panagiotis Vossos, Shawn
 Wagner, Peter Wang, Ed Watkeys, Brad Watson, Thomas Weidner, Goeran
diff --git a/optimizer.scm b/optimizer.scm
index 1e30ed43..48b3a86e 100644
--- a/optimizer.scm
+++ b/optimizer.scm
@@ -74,7 +74,9 @@
 	  [(if ##core#cond ##core#switch)
 	   (scan (first subs) e)
 	   (touch)
-	   (scan-each (cdr subs) e)]
+	   (scan (first subs) e)
+	   (set! previous '())
+	   (scan (second subs) e)]
 
 	  [(let)
 	   (scan-each (butlast subs) e)