coffee-script 0.1.4 → 0.1.5

data/README

@@ -26,7 +26,7 @@
   gem install coffee-script
   
   Compile a script:
-  coffee-script /path/to/script.coffee
+  coffee /path/to/script.coffee
   
   For documentation, usage, and examples, see:
   http://jashkenas.github.com/coffee-script/

data/coffee-script.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name      = 'coffee-script'
-  s.version   = '0.1.4'         # Keep version in sync with coffee-script.rb
-  s.date      = '2009-12-25'
+  s.version   = '0.1.5'         # Keep version in sync with coffee-script.rb
+  s.date      = '2009-12-26'
 
   s.homepage    = "http://jashkenas.github.com/coffee-script/"
   s.summary     = "The CoffeeScript Compiler"
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.has_rdoc          = false
 
   s.require_paths     = ['lib']
-  s.executables       = ['coffee-script']
+  s.executables       = ['coffee']
 
   s.files = Dir['bin/*', 'examples/*', 'lib/**/*', 'coffee-script.gemspec', 'LICENSE', 'README']
 end

data/examples/code.coffee

@@ -132,7 +132,7 @@ wednesday: => eat_breakfast(); go_to_work(); eat_dinner(); .
 
 # Array slice literals.
 zero_to_nine: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
-three_to_six: zero_to_nine[3, 6]
+three_to_six: zero_to_nine[3..6]
 
 # Multiline strings with inner quotes.
 story: "Lorem ipsum dolor \"sit\" amet, consectetuer adipiscing elit,

data/examples/poignant.coffee

@@ -149,5 +149,5 @@ wipe_mutterings_from: sentence =>
   while sentence.indexOf('(') >= 0
     open:     sentence.indexOf('(') - 1
     close:    sentence.indexOf(')') + 1
-    sentence: sentence[0, open] + sentence[close, sentence.length].
+    sentence: sentence[0..open] + sentence[close..sentence.length].
     sentence.

data/lib/coffee-script.rb

@@ -9,7 +9,7 @@ require "coffee_script/parse_error"
 # Namespace for all CoffeeScript internal classes.
 module CoffeeScript
 
-  VERSION = '0.1.4'   # Keep in sync with the gemspec.
+  VERSION = '0.1.5'   # Keep in sync with the gemspec.
 
   # Compile a script (String or IO) to JavaScript.
   def self.compile(script, options={})

data/lib/coffee_script/CoffeeScript.tmbundle/Syntaxes/CoffeeScript.tmLanguage

@@ -234,7 +234,7 @@
 		</dict>
 		<dict>
 			<key>match</key>
-			<string>\b(debugger)\b</string>
+			<string>\b(debugger|\\)\b</string>
 			<key>name</key>
 			<string>keyword.other.coffee</string>
 		</dict>

data/lib/coffee_script/command_line.rb

@@ -5,15 +5,15 @@ require File.expand_path(File.dirname(__FILE__) + '/../coffee-script')
 
 module CoffeeScript
 
-  # The CommandLine handles all of the functionality of the `coffee-script`
+  # The CommandLine handles all of the functionality of the `coffee`
   # utility.
   class CommandLine
 
     BANNER = <<-EOS
-coffee-script compiles CoffeeScript source files into JavaScript.
+coffee compiles CoffeeScript source files into JavaScript.
 
 Usage:
-  coffee-script path/to/script.coffee
+  coffee path/to/script.coffee
     EOS
 
     # Seconds to pause between checks for changed source files.
@@ -125,11 +125,13 @@ Usage:
     end
 
     # Compile a single source file to JavaScript.
-    def compile(script, source='')
+    def compile(script, source='error')
       begin
-        CoffeeScript.compile(script, :no_wrap => @options[:no_wrap])
-      rescue CoffeeScript::ParseError => e
-        STDERR.puts e.message(source)
+        options = {}
+        options[:no_wrap] = true if @options[:no_wrap]
+        CoffeeScript.compile(script, options)
+      rescue CoffeeScript::ParseError, SyntaxError => e
+        STDERR.puts "#{source}: #{e.message}"
         exit(1) unless @options[:watch]
         nil
       end
@@ -188,8 +190,8 @@ Usage:
           install_bundle
           exit
         end
-        opts.on_tail('--version', 'display coffee-script version') do
-          puts "coffee-script version #{CoffeeScript::VERSION}"
+        opts.on_tail('--version', 'display CoffeeScript version') do
+          puts "CoffeeScript version #{CoffeeScript::VERSION}"
           exit
         end
         opts.on_tail('-h', '--help', 'display this help message') do

data/lib/coffee_script/grammar.y

@@ -64,11 +64,11 @@ rule
 
   # The parts that are natural JavaScript expressions.
   PureExpression:
-    Literal
-  | Value
+    Value
   | Call
   | Code
   | Operation
+  | Range
   ;
 
   # We have to take extra care to convert these statements into expressions.
@@ -120,8 +120,8 @@ rule
 
   # Assignment within an object literal.
   AssignObj:
-    IDENTIFIER ASSIGN Expression    { result = AssignNode.new(val[0], val[2], :object) }
-  | STRING ASSIGN Expression        { result = AssignNode.new(val[0], val[2], :object) }
+    IDENTIFIER ASSIGN Expression    { result = AssignNode.new(ValueNode.new(val[0]), val[2], :object) }
+  | STRING ASSIGN Expression        { result = AssignNode.new(ValueNode.new(LiteralNode.new(val[0])), val[2], :object) }
   | Comment                           { result = val[0] }
   ;
 
@@ -144,10 +144,10 @@ rule
   | '-' Expression = UMINUS           { result = OpNode.new(val[0], val[1]) }
   | NOT Expression                    { result = OpNode.new(val[0], val[1]) }
   | '~' Expression                    { result = OpNode.new(val[0], val[1]) }
-  | '--' Expression                    { result = OpNode.new(val[0], val[1]) }
-  | '++' Expression                    { result = OpNode.new(val[0], val[1]) }
-  | Expression '--'                    { result = OpNode.new(val[1], val[0], nil, true) }
-  | Expression '++'                    { result = OpNode.new(val[1], val[0], nil, true) }
+  | '--' Expression                   { result = OpNode.new(val[0], val[1]) }
+  | '++' Expression                   { result = OpNode.new(val[0], val[1]) }
+  | Expression '--'                   { result = OpNode.new(val[1], val[0], nil, true) }
+  | Expression '++'                   { result = OpNode.new(val[1], val[0], nil, true) }
 
   | Expression '*' Expression         { result = OpNode.new(val[1], val[0], val[2]) }
   | Expression '/' Expression         { result = OpNode.new(val[1], val[0], val[2]) }
@@ -213,6 +213,7 @@ rule
   # Expressions that can be treated as values.
   Value:
     IDENTIFIER                        { result = ValueNode.new(val[0]) }
+  | Literal                           { result = ValueNode.new(val[0]) }
   | Array                             { result = ValueNode.new(val[0]) }
   | Object                            { result = ValueNode.new(val[0]) }
   | Parenthetical                     { result = ValueNode.new(val[0]) }
@@ -224,7 +225,7 @@ rule
   Accessor:
     PROPERTY_ACCESS IDENTIFIER        { result = AccessorNode.new(val[1]) }
   | Index                             { result = val[0] }
-  | Slice                             { result = val[0] }
+  | Range                             { result = SliceNode.new(val[0]) }
   ;
 
   # Indexing into an object or array.
@@ -232,11 +233,6 @@ rule
     "[" Expression "]"                { result = IndexNode.new(val[1]) }
   ;
 
-  # Array slice literal.
-  Slice:
-    "[" Expression "," Expression "]" { result = SliceNode.new(val[1], val[3]) }
-  ;
-
   # An object literal.
   Object:
     "{" AssignList "}"                { result = ObjectNode.new(val[1]) }
@@ -273,6 +269,12 @@ rule
     SUPER "(" ArgList ")"             { result = CallNode.new(:super, val[2]) }
   ;
 
+  # The range literal.
+  Range:
+    "[" Value "." "." Value "]"       { result = RangeNode.new(val[1], val[4]) }
+  | "[" Value "." "." "." Value "]"   { result = RangeNode.new(val[1], val[5], true) }
+  ;
+
   # The array literal.
   Array:
     "[" ArgList "]"                   { result = ArrayNode.new(val[1]) }

data/lib/coffee_script/lexer.rb

@@ -19,7 +19,7 @@ module CoffeeScript
 
     # Token matching regexes.
     IDENTIFIER = /\A([a-zA-Z$_]\w*)/
-    NUMBER     = /\A\b((0(x|X)[0-9a-fA-F]+)|([0-9]+(\.[0-9]+)?(e[+\-]?[0-9]+)?))\b/i
+    NUMBER     = /\A((\b|-)((0(x|X)[0-9a-fA-F]+)|([0-9]+(\.[0-9]+)?(e[+\-]?[0-9]+)?)))\b/i
     STRING     = /\A(""|''|"(.*?)[^\\]"|'(.*?)[^\\]')/m
     JS         = /\A(``|`(.*?)[^\\]`)/m
     OPERATOR   = /\A([+\*&|\/\-%=<>:!]+)/
@@ -75,7 +75,7 @@ module CoffeeScript
       # Keywords are special identifiers tagged with their own name, 'if' will result
       # in an [:IF, "if"] token
       tag = KEYWORDS.include?(identifier) ? identifier.upcase.to_sym : :IDENTIFIER
-      @tokens[-1][0] = :PROPERTY_ACCESS if tag == :IDENTIFIER && last_value == '.'
+      @tokens[-1][0] = :PROPERTY_ACCESS if tag == :IDENTIFIER && last_value == '.' && !(@tokens[-2][1] == '.')
       token(tag, identifier)
       @i += identifier.length
     end
@@ -130,11 +130,13 @@ module CoffeeScript
     # We treat all other single characters as a token. Eg.: ( ) , . !
     # Multi-character operators are also literal tokens, so that Racc can assign
     # the proper order of operations. Multiple newlines get merged together.
+    # Use a trailing \ to escape newlines.
     def literal_token
       value = @chunk[NEWLINE, 1]
       if value
         @line += value.length
-        token("\n", "\n") unless last_value == "\n"
+        token("\n", "\n") unless ["\n", "\\"].include?(last_value)
+        @tokens.pop if last_value == "\\"
         return @i += value.length
       end
       value = @chunk[OPERATOR, 1]

data/lib/coffee_script/narwhal/coffee-script.coffee

@@ -1,6 +1,6 @@
 # This (javascript) file is generated from lib/coffee_script/narwhal/coffee-script.coffee
 
-# Executes the `coffee-script` Ruby program to convert from CoffeeScript
+# Executes the `coffee` Ruby program to convert from CoffeeScript
 # to Javascript. Eventually this will hopefully happen entirely within JS.
 
 # Require external dependencies.
@@ -9,13 +9,13 @@ File:     require('file')
 Readline: require('readline')
 
 # The path to the CoffeeScript Compiler.
-coffeePath: File.path(module.path).dirname().dirname().dirname().dirname().dirname().join('bin', 'coffee-script')
+coffeePath: File.path(module.path).dirname().dirname().dirname().dirname().dirname().join('bin', 'coffee')
 
 # Our general-purpose error handler.
 checkForErrors: coffeeProcess =>
   return true if coffeeProcess.wait() is 0
   system.stderr.print(coffeeProcess.stderr.read())
-  throw new Error("coffee-script compile error").
+  throw new Error("CoffeeScript compile error").
 
 # Run a simple REPL, round-tripping to the CoffeeScript compiler for every
 # command.
@@ -25,7 +25,7 @@ exports.run: args =>
 
   while true
     try
-      system.stdout.write('cs> ').flush()
+      system.stdout.write('coffee> ').flush()
       result: exports.evalCS(Readline.readline())
       print(result) if result isnt undefined
     catch e

data/lib/coffee_script/narwhal/js/coffee-script.js

@@ -1,31 +1,32 @@
 (function(){
-
-  // This (javascript) file is generated from lib/coffee_script/narwhal/coffee-script.coffee Executes the `coffee-script` Ruby program to convert from CoffeeScript
+  var File, OS, Readline, checkForErrors, coffeePath;
+  // This (javascript) file is generated from lib/coffee_script/narwhal/coffee-script.coffee Executes the `coffee` Ruby program to convert from CoffeeScript
   // to Javascript. Eventually this will hopefully happen entirely within JS. Require external dependencies.
-  var OS = require('os');
-  var File = require('file');
-  var Readline = require('readline');
+  OS = require('os');
+  File = require('file');
+  Readline = require('readline');
   // The path to the CoffeeScript Compiler.
-  var coffeePath = File.path(module.path).dirname().dirname().dirname().dirname().dirname().join('bin', 'coffee-script');
+  coffeePath = File.path(module.path).dirname().dirname().dirname().dirname().dirname().join('bin', 'coffee');
   // Our general-purpose error handler.
-  var checkForErrors = function(coffeeProcess) {
+  checkForErrors = function(coffeeProcess) {
     if (coffeeProcess.wait() === 0) {
       return true;
     }
     system.stderr.print(coffeeProcess.stderr.read());
-    throw new Error("coffee-script compile error");
+    throw new Error("CoffeeScript compile error");
   };
   // Run a simple REPL, round-tripping to the CoffeeScript compiler for every
   // command.
   exports.run = function(args) {
+    var result;
     args.shift();
     if (args.length) {
       return require(File.absolute(args[0]));
     }
     while (true) {
       try {
-        system.stdout.write('cs> ').flush();
-        var result = exports.evalCS(Readline.readline());
+        system.stdout.write('coffee> ').flush();
+        result = exports.evalCS(Readline.readline());
         if (result !== undefined) {
           print(result);
         }
@@ -36,13 +37,15 @@
   };
   // Compile a given CoffeeScript file into JavaScript.
   exports.compileFile = function(path) {
-    var coffee = OS.popen([coffeePath, "--print", "--no-wrap", path]);
+    var coffee;
+    coffee = OS.popen([coffeePath, "--print", "--no-wrap", path]);
     checkForErrors(coffee);
     return coffee.stdout.read();
   };
   // Compile a string of CoffeeScript into JavaScript.
   exports.compile = function(source) {
-    var coffee = OS.popen([coffeePath, "--eval", "--no-wrap"]);
+    var coffee;
+    coffee = OS.popen([coffeePath, "--eval", "--no-wrap"]);
     coffee.stdin.write(source).flush().close();
     checkForErrors(coffee);
     return coffee.stdout.read();
@@ -53,8 +56,9 @@
   };
   // Make a factory for the CoffeeScript environment.
   exports.makeNarwhalFactory = function(path) {
-    var code = exports.compileFile(path);
-    var factoryText = "function(require,exports,module,system,print){" + code + "/**/\n}";
+    var code, factoryText;
+    code = exports.compileFile(path);
+    factoryText = "function(require,exports,module,system,print){" + code + "/**/\n}";
     if (system.engine === "rhino") {
       return Packages.org.mozilla.javascript.Context.getCurrentContext().compileFunction(global, factoryText, path, 0, null);
     } else {

data/lib/coffee_script/narwhal/js/loader.js

@@ -1,10 +1,10 @@
 (function(){
-
+  var coffeescript, factories, loader;
   // This (javascript) file is generated from lib/coffee_script/narwhal/loader.coffee
-  var coffeescript = null;
-  var factories = {
+  coffeescript = null;
+  factories = {
   };
-  var loader = {
+  loader = {
     // Reload the coffee-script environment from source.
     reload: function(topId, path) {
       coffeescript = coffeescript || require('coffee-script');

data/lib/coffee_script/nodes.rb

@@ -77,16 +77,18 @@ module CoffeeScript
     # If this is the top-level Expressions, wrap everything in a safety closure.
     def root_compile(o={})
       indent = o[:no_wrap] ? '' : TAB
-      code = compile(o.merge(:indent => indent, :scope => Scope.new))
+      code = compile(o.merge(:indent => indent, :scope => Scope.new), o[:no_wrap] ? nil : :code)
       code.gsub!(STRIP_TRAILING_WHITESPACE, '')
       o[:no_wrap] ? code : "(function(){\n#{code}\n})();"
     end
 
     # The extra fancy is to handle pushing down returns and assignments
     # recursively to the final lines of inner statements.
-    def compile(options={})
+    # Variables first defined within the Expressions body have their
+    # declarations pushed up to the top scope.
+    def compile(options={}, parent=nil)
       return root_compile(options) unless options[:scope]
-      code = @expressions.map { |node|
+      compiled = @expressions.map do |node|
         o = super(options)
         if last?(node) && (o[:return] || o[:assign])
           if o[:return]
@@ -99,14 +101,17 @@ module CoffeeScript
             if node.statement? || node.custom_assign?
               "#{o[:indent]}#{node.compile(o)}#{node.line_ending}"
             else
-              "#{o[:indent]}#{AssignNode.new(ValueNode.new(LiteralNode.new(o[:assign])), node).compile(o)};"
+              "#{o[:indent]}#{AssignNode.new(o[:assign], node).compile(o)};"
             end
           end
         else
           o.delete(:return) and o.delete(:assign)
           "#{o[:indent]}#{node.compile(o)}#{node.line_ending}"
         end
-      }.join("\n")
+      end
+      scope = options[:scope]
+      declarations = scope.any_declared? && parent == :code ? "#{options[:indent]}var #{scope.declared_variables.join(', ')};\n" : ''
+      code = declarations + compiled.join("\n")
       write(code)
     end
   end
@@ -202,7 +207,7 @@ module CoffeeScript
 
     def compile(o={})
       o = super(o)
-      args = @arguments.map{|a| a.compile(o.merge(:no_paren => true)) }.join(', ')
+      args = @arguments.map{|a| a.compile(o) }.join(', ')
       return write(compile_super(args, o)) if super?
       prefix = @new ? "new " : ''
       write("#{prefix}#{@variable.compile(o)}(#{args})")
@@ -300,28 +305,60 @@ module CoffeeScript
     end
   end
 
+  # A range literal. Ranges can be used to extract portions (slices) of arrays,
+  # or to specify a range for array comprehensions.
+  class RangeNode
+    attr_reader :from, :to
+
+    def initialize(from, to, exclusive=false)
+      @from, @to, @exclusive = from, to, exclusive
+    end
+
+    def exclusive?
+      @exclusive
+    end
+
+    def less_operator
+      @exclusive ? '<' : '<='
+    end
+
+    def greater_operator
+      @exclusive ? '>' : '>='
+    end
+
+    def compile(o, fv, tv)
+      fvv, tvv = @from.compile(o), @to.compile(o)
+      vars     = "#{fv}=#{fvv}, #{tv}=#{tvv}"
+      compare  = "(#{fvv} <= #{tvv} ? #{fv} #{less_operator} #{tv} : #{fv} #{greater_operator} #{tv})"
+      incr     = "(#{fvv} <= #{tvv} ? #{fv} += 1 : #{fv} -= 1)"
+      "#{vars}; #{compare}; #{incr}"
+    end
+
+  end
+
   # An array slice literal. Unlike JavaScript's Array#slice, the second parameter
   # specifies the index of the end of the slice (just like the first parameter)
   # is the index of the beginning.
   class SliceNode < Node
-    attr_reader :from, :to
+    attr_reader :range
 
-    def initialize(from, to)
-      @from, @to = from, to
+    def initialize(range)
+      @range = range
     end
 
     def compile(o={})
-      o = super(o)
-      write(".slice(#{@from.compile(o)}, #{@to.compile(o)} + 1)")
+      o         = super(o)
+      from      = @range.from.compile(o)
+      to        = @range.to.compile(o)
+      plus_part = @range.exclusive? ? '' : ' + 1'
+      write(".slice(#{from}, #{to}#{plus_part})")
     end
   end
 
   # Setting the value of a local variable, or the value of an object property.
   class AssignNode < Node
-    LEADING_VAR  = /\Avar\s+/
     PROTO_ASSIGN = /\A(\S+)\.prototype/
 
-    statement
     custom_return
 
     attr_reader :variable, :value, :context
@@ -336,19 +373,16 @@ module CoffeeScript
 
     def compile(o={})
       o = super(o)
-      name      = @variable.respond_to?(:compile) ? @variable.compile(o) : @variable.to_s
-      last      = @variable.respond_to?(:last) ? @variable.last.to_s : name.to_s
+      name      = @variable.compile(o)
+      last      = @variable.last.to_s
       proto     = name[PROTO_ASSIGN, 1]
-      o         = o.merge(:assign => name, :last_assign => last, :proto_assign => proto)
+      o         = o.merge(:assign => @variable, :last_assign => last, :proto_assign => proto)
       postfix   = o[:return] ? ";\n#{o[:indent]}return #{name}" : ''
-      return write("#{@variable}: #{@value.compile(o)}") if @context == :object
+      return write("#{name}: #{@value.compile(o)}") if @context == :object
       return write("#{name} = #{@value.compile(o)}#{postfix}") if @variable.properties? && !@value.custom_assign?
-      defined   = o[:scope].find(name)
-      def_part  = defined || @variable.properties? || o[:no_wrap] ? "" : "var #{name};\n#{o[:indent]}"
-      return write(def_part + @value.compile(o)) if @value.custom_assign?
-      def_part  = defined || o[:no_wrap] ? name : "var #{name}"
-      val_part  = @value.compile(o).sub(LEADING_VAR, '')
-      write("#{def_part} = #{val_part}#{postfix}")
+      o[:scope].find(name) unless @variable.properties?
+      return write(@value.compile(o)) if @value.custom_assign?
+      write("#{name} = #{@value.compile(o)}#{postfix}")
     end
   end
 
@@ -416,8 +450,8 @@ module CoffeeScript
       o[:indent] += TAB
       o.delete(:assign)
       o.delete(:no_wrap)
-      @params.each {|id| o[:scope].find(id.to_s) }
-      code = @body.compile(o)
+      @params.each {|id| o[:scope].parameter(id.to_s) }
+      code = @body.compile(o, :code)
       write("function(#{@params.join(', ')}) {\n#{code}\n#{indent}}")
     end
   end
@@ -480,7 +514,7 @@ module CoffeeScript
       o = super(o)
       o.delete(:return)
       indent = o[:indent] + TAB
-      cond = @condition.compile(o.merge(:no_paren => true))
+      cond = @condition.compile(o)
       write("while (#{cond}) {\n#{@body.compile(o.merge(:indent => indent))}\n#{o[:indent]}}")
     end
   end
@@ -506,27 +540,36 @@ module CoffeeScript
 
     def compile(o={})
       o = super(o)
+      range         = @source.is_a?(RangeNode)
       scope         = o[:scope]
       name_found    = scope.find(@name)
       index_found   = @index && scope.find(@index)
       svar          = scope.free_variable
-      ivar          = scope.free_variable
+      ivar          = range ? name : scope.free_variable
       lvar          = scope.free_variable
       rvar          = scope.free_variable
-      name_part     = name_found ? @name : "var #{@name}"
-      index_name    = @index ? (index_found ? @index : "var #{@index}") : nil
-      source_part   = "var #{svar} = #{@source.compile(o)};"
-      for_part      = "var #{ivar}=0, #{lvar}=#{svar}.length; #{ivar}<#{lvar}; #{ivar}++"
-      var_part      = "\n#{o[:indent] + TAB}#{name_part} = #{svar}[#{ivar}];\n"
-      index_part    = @index ? "#{o[:indent] + TAB}#{index_name} = #{ivar};\n" : ''
+      index_name    = @index ? @index : nil
+      if range
+        source_part = ''
+        var_part    = ''
+        index_part  = ''
+        index_var   = scope.free_variable
+        for_part    = "#{index_var}=0, #{@source.compile(o, ivar, lvar)}, #{index_var}++"
+      else
+        index_var   = nil
+        source_part = "#{svar} = #{@source.compile(o)};\n#{o[:indent]}"
+        for_part    = "#{ivar}=0, #{lvar}=#{svar}.length; #{ivar}<#{lvar}; #{ivar}++"
+        var_part    = "\n#{o[:indent] + TAB}#{@name} = #{svar}[#{ivar}];"
+        index_part  = @index ? "\n#{o[:indent] + TAB}#{index_name} = #{ivar};" : ''
+      end
       body          = @body
       suffix        = ';'
-      set_result    = "var #{rvar} = [];\n#{o[:indent]}"
-      save_result   = "#{rvar}[#{ivar}] = "
+      set_result    = "#{rvar} = [];\n#{o[:indent]}"
+      save_result   = "#{rvar}[#{index_var || ivar}] = "
       return_result = rvar
 
       if o[:return] || o[:assign]
-        return_result = "#{o[:assign]} = #{return_result}" if o[:assign]
+        return_result = "#{o[:assign].compile(o)} = #{return_result}" if o[:assign]
         return_result = "return #{return_result}" if o[:return]
         if @filter
           body = CallNode.new(ValueNode.new(LiteralNode.new(rvar), [AccessorNode.new('push')]), [@body])
@@ -541,7 +584,7 @@ module CoffeeScript
       return_result = "\n#{o[:indent]}#{return_result};"
       indent = o[:indent] + TAB
       body = body.compile(o.merge(:indent => indent))
-      write("#{source_part}\n#{o[:indent]}#{set_result}for (#{for_part}) {#{var_part}#{index_part}#{indent}#{save_result}#{body}#{suffix}\n#{o[:indent]}}#{return_result}")
+      write("#{source_part}#{set_result}for (#{for_part}) {#{var_part}#{index_part}\n#{indent}#{save_result}#{body}#{suffix}\n#{o[:indent]}}#{return_result}")
     end
   end
 
@@ -588,7 +631,9 @@ module CoffeeScript
     end
   end
 
-  # An extra set of parenthesis, supplied by the script source.
+  # An extra set of parentheses, supplied by the script source.
+  # You can't wrap parentheses around bits that get compiled into JS statements,
+  # unfortunately.
   class ParentheticalNode < Node
     attr_reader :expressions
 
@@ -597,7 +642,7 @@ module CoffeeScript
     end
 
     def statement?
-      @expressions.statement?
+      @expressions.unwrap.statement?
     end
 
     def custom_assign?
@@ -609,10 +654,11 @@ module CoffeeScript
     end
 
     def compile(o={})
+      raise SyntaxError, "parentheses can't be wrapped around a statement" if statement?
       o = super(o)
       compiled = @expressions.compile(o)
       compiled = compiled[0...-1] if compiled[-1..-1] == ';'
-      write(o[:no_paren] || statement? ? compiled : "(#{compiled})")
+      write("(#{compiled})")
     end
   end