Revert of Clean up rewriter.

test/webkit/eval-throw-return.js

Index: test/webkit/eval-throw-return.js
diff --git a/test/webkit/eval-throw-return.js b/test/webkit/eval-throw-return.js
index ba3176246eb1a2447063683aae46fdb02b896c34..a5fd9f5d78b861b61cadfe36280b8c7775f13581 100644
--- a/test/webkit/eval-throw-return.js
+++ b/test/webkit/eval-throw-return.js
@@ -38,17 +38,17 @@
 
 shouldBe('eval("1;")', "1");
 shouldBe('eval("1; try { foo = [2,3,throwFunc(), 4]; } catch (e){}")', "1");
-shouldBe('eval("1; try { 2; throw \\"\\"; } catch (e){}")', "1");
-shouldBe('eval("1; try { 2; throwFunc(); } catch (e){}")', "1");
+shouldBe('eval("1; try { 2; throw \\"\\"; } catch (e){}")', "2");
+shouldBe('eval("1; try { 2; throwFunc(); } catch (e){}")', "2");
 shouldBe('eval("1; try { 2; throwFunc(); } catch (e){3;} finally {}")', "3");
 shouldBe('eval("1; try { 2; throwFunc(); } catch (e){3;} finally {4;}")', "4");
 shouldBe('eval("function blah() { 1; }\\n blah();")', "undefined");
 shouldBe('eval("var x = 1;")', "undefined");
 shouldBe('eval("if (true) { 1; } else { 2; }")', "1");
 shouldBe('eval("if (false) { 1; } else { 2; }")', "2");
-shouldBe('eval("try{1; if (true) { 2; throw \\"\\"; } else { 2; }} catch(e){}")', "undefined");
+shouldBe('eval("try{1; if (true) { 2; throw \\"\\"; } else { 2; }} catch(e){}")', "2");
 shouldBe('eval("1; var i = 0; do { ++i; 2; } while(i!=1);")', "2");
-//shouldBe('eval("try{1; var i = 0; do { ++i; 2; throw \\"\\"; } while(i!=1);} catch(e){}")', "undefined");
-shouldBe('eval("1; try{2; throwOnReturn();} catch(e){}")', "1");
+shouldBe('eval("try{1; var i = 0; do { ++i; 2; throw \\"\\"; } while(i!=1);} catch(e){}")', "2");
+shouldBe('eval("1; try{2; throwOnReturn();} catch(e){}")', "2");
 shouldBe('eval("1; twoFunc();")', "undefined");
 shouldBe('eval("1; with ( { a: 0 } ) { 2; }")', "2");