From 51e80484e2a72532f310f000355ae64de6bb13d8 Mon Sep 17 00:00:00 2001 From: Jeremy Ashkenas Date: Tue, 16 Feb 2010 10:12:40 -0500 Subject: [PATCH] fixing an overzealous access in the rewriter --- lib/coffee_script/rewriter.js | 2 +- src/rewriter.coffee | 2 +- test/fixtures/execution/test_funky_comments.coffee | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/coffee_script/rewriter.js b/lib/coffee_script/rewriter.js index 1d3e6780..152f1e77 100644 --- a/lib/coffee_script/rewriter.js +++ b/lib/coffee_script/rewriter.js @@ -94,7 +94,7 @@ this.tokens.splice(i + 2, 1); this.tokens.splice(i - 2, 1); return 0; - } else if (prev && prev[0] === 'TERMINATOR' && after[0] === 'INDENT') { + } else if (prev && prev[0] === 'TERMINATOR' && after && after[0] === 'INDENT') { this.tokens.splice(i + 2, 1); this.tokens[i - 1] = after; return 1; diff --git a/src/rewriter.coffee b/src/rewriter.coffee index ece7a35b..b571636f 100644 --- a/src/rewriter.coffee +++ b/src/rewriter.coffee @@ -80,7 +80,7 @@ re::adjust_comments: -> @tokens.splice(i + 2, 1) @tokens.splice(i - 2, 1) return 0 - else if prev and prev[0] is 'TERMINATOR' and after[0] is 'INDENT' + else if prev and prev[0] is 'TERMINATOR' and after and after[0] is 'INDENT' @tokens.splice(i + 2, 1) @tokens[i - 1]: after return 1 diff --git a/test/fixtures/execution/test_funky_comments.coffee b/test/fixtures/execution/test_funky_comments.coffee index 6a0940f1..3067b210 100644 --- a/test/fixtures/execution/test_funky_comments.coffee +++ b/test/fixtures/execution/test_funky_comments.coffee @@ -19,3 +19,7 @@ switch 'string' # comment puts func() + +func +func +# Line3