coffee-script 0.2.1 → 0.2.2

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

@@ -29,7 +29,7 @@ exports.run: args =>
   while true
     try
       system.stdout.write('coffee> ').flush()
-      result: exports.evalCS(Readline.readline())
+      result: exports.evalCS(Readline.readline(), ['--globals'])
       print(result) if result isnt undefined
     catch e
       print(e)
@@ -41,15 +41,15 @@ exports.compileFile: path =>
   coffee.stdout.read()
 
 # Compile a string of CoffeeScript into JavaScript.
-exports.compile: source =>
-  coffee: OS.popen([coffeePath, "--eval", "--no-wrap"])
+exports.compile: source, flags =>
+  coffee: OS.popen([coffeePath, "--eval", "--no-wrap"].concat(flags or []))
   coffee.stdin.write(source).flush().close()
   checkForErrors(coffee)
   coffee.stdout.read()
 
 # Evaluating a string of CoffeeScript first compiles it externally.
-exports.evalCS: source =>
-  eval(exports.compile(source))
+exports.evalCS: source, flags =>
+  eval(exports.compile(source, flags))
 
 # Make a factory for the CoffeeScript environment.
 exports.makeNarwhalFactory: path =>

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

@@ -20,25 +20,24 @@
   // Run a simple REPL, round-tripping to the CoffeeScript compiler for every
   // command.
   exports.run = function run(args) {
-    var __a, __b, __c, i, path, result;
+    var __a, __b, i, result;
     if (args.length) {
       __a = args;
-      __b = [];
-      for (i in __a) {
-        if (__a.hasOwnProperty(i)) {
-          path = __a[i];
-          exports.evalCS(File.read(path));
-          __c = delete args[i];
-          __b.push(__c);
-        }
+      __b = function(path, i) {
+        exports.evalCS(File.read(path));
+        delete args[i];
+      };
+      if (__a instanceof Array) {
+        for (i=0; i<__a.length; i++) __b(__a[i], i);
+      } else {
+        for (i in __a) { if (__a.hasOwnProperty(i)) __b(__a[i], i); }
       }
-      __b;
       return true;
     }
     while (true) {
       try {
         system.stdout.write('coffee> ').flush();
-        result = exports.evalCS(Readline.readline());
+        result = exports.evalCS(Readline.readline(), ['--globals']);
         if (result !== undefined) {
           print(result);
         }
@@ -46,6 +45,7 @@
         print(e);
       }
     }
+    return null;
   };
   // Compile a given CoffeeScript file into JavaScript.
   exports.compileFile = function compileFile(path) {
@@ -55,16 +55,16 @@
     return coffee.stdout.read();
   };
   // Compile a string of CoffeeScript into JavaScript.
-  exports.compile = function compile(source) {
+  exports.compile = function compile(source, flags) {
     var coffee;
-    coffee = OS.popen([coffeePath, "--eval", "--no-wrap"]);
+    coffee = OS.popen([coffeePath, "--eval", "--no-wrap"].concat(flags || []));
     coffee.stdin.write(source).flush().close();
     checkForErrors(coffee);
     return coffee.stdout.read();
   };
   // Evaluating a string of CoffeeScript first compiles it externally.
-  exports.evalCS = function evalCS(source) {
-    return eval(exports.compile(source));
+  exports.evalCS = function evalCS(source, flags) {
+    return eval(exports.compile(source, flags));
   };
   // Make a factory for the CoffeeScript environment.
   exports.makeNarwhalFactory = function makeNarwhalFactory(path) {

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

@@ -8,9 +8,9 @@
     // Reload the coffee-script environment from source.
     reload: function reload(topId, path) {
       coffeescript = coffeescript || require('coffee-script');
-      return (factories[topId] = function() {
+      return factories[topId] = function() {
         return coffeescript.makeNarwhalFactory(path);
-      });
+      };
     },
     // Ensure that the coffee-script environment is loaded.
     load: function load(topId, path) {

data/lib/coffee_script/nodes.rb

@@ -29,6 +29,7 @@ module CoffeeScript
     # already been asked to return the result.
     def compile(o={})
       @options = o.dup
+      @indent  = o[:indent]
       top = self.is_a?(ForNode) ? @options[:top] : @options.delete(:top)
       closure = statement? && !statement_only? && !top && !@options[:return]
       closure ? compile_closure(@options) : compile_node(@options)
@@ -36,10 +37,15 @@ module CoffeeScript
 
     def compile_closure(o={})
       indent = o[:indent]
-      o[:indent] += TAB
+      @indent = (o[:indent] = idt(1))
       "(function() {\n#{compile_node(o.merge(:return => true))}\n#{indent}})()"
     end
 
+    # Quick method for the current indentation level, plus tabs out.
+    def idt(tabs=0)
+      @indent + (TAB * tabs)
+    end
+
     # Default implementations of the common node methods.
     def unwrap;           self;   end
     def statement?;       false;  end
@@ -95,16 +101,22 @@ module CoffeeScript
     def compile_node(options={})
       compiled = @expressions.map do |node|
         o = options.dup
+        @indent = o[:indent]
         returns = o.delete(:return)
         if last?(node) && returns && !node.statement_only?
           if node.statement?
             node.compile(o.merge(:return => true))
           else
-            "#{o[:indent]}return #{node.compile(o)};"
+            if o[:top] && o[:last_assign] && o[:last_assign][0..0][/[A-Z]/]
+              temp = o[:scope].free_variable
+              "#{idt}#{temp} = #{node.compile(o)};\n#{idt}return #{o[:last_assign]} === this.constructor ? this : #{temp};"
+            else
+              "#{idt}return #{node.compile(o)};"
+            end
           end
         else
           ending = node.statement? ? '' : ';'
-          indent = node.statement? ? '' : o[:indent]
+          indent = node.statement? ? '' : idt
           "#{indent}#{node.compile(o.merge(:top => true))}#{ending}"
         end
       end
@@ -114,8 +126,9 @@ module CoffeeScript
     # If this is the top-level Expressions, wrap everything in a safety closure.
     def compile_root(o={})
       indent = o[:no_wrap] ? '' : TAB
+      @indent = indent
       o.merge!(:indent => indent, :scope => Scope.new(nil, self))
-      code = o[:no_wrap] ? compile_node(o) : compile_with_declarations(o)
+      code = o[:globals] ? compile_node(o) : compile_with_declarations(o)
       code.gsub!(STRIP_TRAILING_WHITESPACE, '')
       o[:no_wrap] ? code : "(function(){\n#{code}\n})();"
     end
@@ -123,7 +136,7 @@ module CoffeeScript
     def compile_with_declarations(o={})
       code  = compile_node(o)
       decls = ''
-      decls = "#{o[:indent]}var #{o[:scope].declared_variables.join(', ')};\n" if o[:scope].declarations?(self)
+      decls = "#{idt}var #{o[:scope].declared_variables.join(', ')};\n" if o[:scope].declarations?(self)
       decls + code
     end
 
@@ -140,6 +153,10 @@ module CoffeeScript
 
     attr_reader :value
 
+    def self.wrap(string)
+      self.new(Value.new(string))
+    end
+
     def initialize(value)
       @value = value
     end
@@ -151,7 +168,7 @@ module CoffeeScript
 
     def compile_node(o)
       val    = CONVERSIONS[@value.to_s] || @value.to_s
-      indent = statement? ? o[:indent] : ''
+      indent = statement? ? idt : ''
       ending = statement? ? ';' : ''
       write("#{indent}#{val}#{ending}")
     end
@@ -170,7 +187,7 @@ module CoffeeScript
     def compile_node(o)
       return write(@expression.compile(o.merge(:return => true))) if @expression.statement?
       compiled = @expression.compile(o)
-      write(@expression.statement? ? "#{compiled}\n#{o[:indent]}return null;" : "#{o[:indent]}return #{compiled};")
+      write(@expression.statement? ? "#{compiled}\n#{idt}return null;" : "#{idt}return #{compiled};")
     end
   end
 
@@ -184,7 +201,7 @@ module CoffeeScript
     end
 
     def compile_node(o={})
-      delimiter = "\n#{o[:indent]}//"
+      delimiter = "\n#{idt}//"
       comment   = "#{delimiter}#{@lines.join(delimiter)}"
       write(comment)
     end
@@ -231,7 +248,9 @@ module CoffeeScript
     def compile_super(args, o)
       methname = o[:last_assign]
       arg_part = args.empty? ? '' : ", #{args}"
-      "#{o[:proto_assign]}.__superClass__.#{methname}.call(this#{arg_part})"
+      meth     = o[:proto_assign] ? "#{o[:proto_assign]}.__superClass__.#{methname}" :
+                                    "#{methname}.__superClass__.constructor"
+      "#{meth}.call(this#{arg_part})"
     end
 
     def compile_splat(o)
@@ -257,9 +276,12 @@ module CoffeeScript
     end
 
     def compile_node(o={})
+      constructor = o[:scope].free_variable
       sub, sup = @sub_object.compile(o), @super_object.compile(o)
-      "#{o[:indent]}#{sub}.__superClass__ = #{sup}.prototype;\n#{o[:indent]}" +
-      "#{sub}.prototype = new #{sup}();\n#{o[:indent]}" +
+      "#{idt}#{constructor} = function(){};\n#{idt}" +
+      "#{constructor}.prototype = #{sup}.prototype;\n#{idt}" +
+      "#{sub}.__superClass__ = #{sup}.prototype;\n#{idt}" +
+      "#{sub}.prototype = new #{constructor}();\n#{idt}" +
       "#{sub}.prototype.constructor = #{sub};"
     end
 
@@ -302,12 +324,13 @@ module CoffeeScript
   class AccessorNode < Node
     attr_reader :name
 
-    def initialize(name)
-      @name = name
+    def initialize(name, prototype=false)
+      @name, @prototype = name, prototype
     end
 
     def compile_node(o)
-      write(".#{@name}")
+      proto = @prototype ? "prototype." : ''
+      write(".#{proto}#{@name}")
     end
   end
 
@@ -346,15 +369,15 @@ module CoffeeScript
     end
 
     def compile_variables(o)
-      idt = o[:indent]
+      @indent = o[:indent]
       @from_var, @to_var = o[:scope].free_variable, o[:scope].free_variable
       from_val,  to_val  = @from.compile(o), @to.compile(o)
-      write("#{idt}#{@from_var} = #{from_val};\n#{idt}#{@to_var} = #{to_val};\n#{idt}")
+      write("#{@from_var} = #{from_val}; #{@to_var} = #{to_val};\n#{idt}")
     end
 
     def compile_node(o)
       idx, step = o.delete(:index), o.delete(:step)
-      raise SyntaxError, "unexpected range literal" unless idx
+      return compile_array(o) unless idx
       vars     = "#{idx}=#{@from_var}"
       step     = step ? step.compile(o) : '1'
       compare  = "(#{@from_var} <= #{@to_var} ? #{idx} #{less_operator} #{@to_var} : #{idx} #{greater_operator} #{@to_var})"
@@ -362,6 +385,15 @@ module CoffeeScript
       write("#{vars}; #{compare}; #{incr}")
     end
 
+    # Expand the range into the equivalent array, if it's not being used as
+    # part of a comprehension, slice, or splice.
+    # TODO: This generates pretty ugly code ... shrink it.
+    def compile_array(o)
+      body = Expressions.wrap(LiteralNode.wrap('i'))
+      arr  = Expressions.wrap(ForNode.new(body, {:source => ValueNode.new(self)}, Value.new('i')))
+      ParentheticalNode.new(CallNode.new(CodeNode.new([], arr))).compile(o)
+    end
+
   end
 
   # An array slice literal. Unlike JavaScript's Array#slice, the second parameter
@@ -385,7 +417,7 @@ module CoffeeScript
   # Setting the value of a local variable, or the value of an object property.
   class AssignNode < Node
     PROTO_ASSIGN = /\A(\S+)\.prototype/
-    LEADING_DOT = /\A\./
+    LEADING_DOT = /\A\.(prototype\.)?/
 
     attr_reader :variable, :value, :context
 
@@ -403,7 +435,7 @@ module CoffeeScript
       return write("#{name}: #{@value.compile(o)}") if @context == :object
       o[:scope].find(name) unless @variable.properties?
       val = "#{name} = #{@value.compile(o)}"
-      write(o[:return] ? "#{o[:indent]}return (#{val})" : val)
+      write(o[:return] ? "#{idt}return (#{val})" : val)
     end
 
     def compile_splice(o)
@@ -473,12 +505,12 @@ module CoffeeScript
 
     def compile_node(o)
       shared_scope = o.delete(:shared_scope)
-      indent       = o[:indent]
       o[:scope]    = shared_scope || Scope.new(o[:scope], @body)
       o[:return]   = true
       o[:top]      = true
-      o[:indent]  += TAB
+      o[:indent]   = idt(1)
       o.delete(:no_wrap)
+      o.delete(:globals)
       name = o.delete(:immediate_assign)
       if @params.last.is_a?(ParamSplatNode)
         splat = @params.pop
@@ -488,7 +520,7 @@ module CoffeeScript
       @params.each {|id| o[:scope].parameter(id.to_s) }
       code = @body.compile_with_declarations(o)
       name_part = name ? " #{name}" : ''
-      write("function#{name_part}(#{@params.join(', ')}) {\n#{code}\n#{indent}}")
+      write("function#{name_part}(#{@params.join(', ')}) {\n#{code}\n#{idt}}")
     end
   end
 
@@ -532,18 +564,17 @@ module CoffeeScript
     # AssignNodes get interleaved correctly, with no trailing commas or
     # commas affixed to comments. TODO: Extract this and add it to ArrayNode.
     def compile_node(o)
-      indent = o[:indent]
-      o[:indent] += TAB
+      o[:indent] = idt(1)
       joins = Hash.new("\n")
       non_comments = @properties.select {|p| !p.is_a?(CommentNode) }
       non_comments.each {|p| joins[p] = p == non_comments.last ? "\n" : ",\n" }
       props  = @properties.map { |prop|
         join = joins[prop]
         join = '' if prop == @properties.last
-        idt  = prop.is_a?(CommentNode) ? '' : o[:indent]
-        "#{idt}#{prop.compile(o)}#{join}"
+        indent = prop.is_a?(CommentNode) ? '' : idt(1)
+        "#{indent}#{prop.compile(o)}#{join}"
       }.join('')
-      write("{\n#{props}\n#{indent}}")
+      write("{\n#{props}\n#{idt}}")
     end
   end
 
@@ -556,14 +587,13 @@ module CoffeeScript
     end
 
     def compile_node(o)
-      indent = o[:indent]
-      o[:indent] += TAB
+      o[:indent] = idt(1)
       objects = @objects.map { |obj|
         code = obj.compile(o)
         obj.is_a?(CommentNode) ? "\n#{code}\n#{o[:indent]}" :
         obj == @objects.last   ? code : "#{code}, "
       }.join('')
-      ending = objects.include?("\n") ? "\n#{indent}]" : ']'
+      ending = objects.include?("\n") ? "\n#{idt}]" : ']'
       write("[#{objects}#{ending}")
     end
   end
@@ -581,12 +611,12 @@ module CoffeeScript
 
     def compile_node(o)
       returns     = o.delete(:return)
-      indent      = o[:indent]
-      o[:indent] += TAB
+      o[:indent]  = idt(1)
       o[:top]     = true
       cond        = @condition.compile(o)
-      post        = returns ? "\n#{indent}return null;" : ''
-      write("#{indent}while (#{cond}) {\n#{@body.compile(o)}\n#{indent}}#{post}")
+      post        = returns ? "\n#{idt}return null;" : ''
+      return write("#{idt}while (#{cond}) null;#{post}") if @body.nil?
+      write("#{idt}while (#{cond}) {\n#{@body.compile(o)}\n#{idt}}#{post}")
     end
   end
 
@@ -604,56 +634,63 @@ module CoffeeScript
       @source = source[:source]
       @filter = source[:filter]
       @step   = source[:step]
+      @object = !!source[:object]
+      @name, @index = @index, @name if @object
     end
 
     def compile_node(o)
       top_level     = o.delete(:top) && !o[:return]
-      range         = @source.is_a?(RangeNode)
+      range         = @source.is_a?(ValueNode) && @source.literal.is_a?(RangeNode) && @source.properties.empty?
+      source        = range ? @source.literal : @source
       scope         = o[:scope]
-      name_found    = scope.find(@name)
+      name_found    = @name  && scope.find(@name)
       index_found   = @index && scope.find(@index)
+      body_dent     = idt(1)
       svar          = scope.free_variable
       ivar          = range ? name : @index ? @index : scope.free_variable
       rvar          = scope.free_variable unless top_level
-      tvar          = scope.free_variable
       if range
-        body_dent   = o[:indent] + TAB
-        var_part, pre_cond, post_cond = '', '', ''
         index_var   = scope.free_variable
-        source_part = @source.compile_variables(o)
-        for_part    = "#{index_var}=0, #{@source.compile(o.merge(:index => ivar, :step => @step))}, #{index_var}++"
+        source_part = source.compile_variables(o)
+        for_part    = "#{index_var}=0, #{source.compile(o.merge(:index => ivar, :step => @step))}, #{index_var}++"
+        var_part    = ''
       else
         index_var   = nil
-        body_dent   = o[:indent] + TAB + TAB
-        source_part = "#{o[:indent]}#{svar} = #{@source.compile(o)};\n#{o[:indent]}"
-        for_part    = "#{ivar} in #{svar}"
-        pre_cond    = "\n#{o[:indent] + TAB}if (#{svar}.hasOwnProperty(#{ivar})) {"
-        var_part    = "\n#{body_dent}#{@name} = #{svar}[#{ivar}];"
-        post_cond   = "\n#{o[:indent] + TAB}}"
+        source_part = "#{svar} = #{source.compile(o)};\n#{idt}"
+        for_part    = "#{ivar}=0; #{ivar}<#{svar}.length; #{ivar}++"
+        for_part    = "#{ivar} in #{svar}" if @object
+        var_part    = @name ? "#{body_dent}#{@name} = #{svar}[#{ivar}];\n" : ''
       end
       body          = @body
-      set_result    = rvar ? "#{rvar} = [];\n#{o[:indent]}" : ''
+      set_result    = rvar ? "#{idt}#{rvar} = []; " : idt
       return_result = rvar || ''
-      temp_var      = ValueNode.new(LiteralNode.new(tvar))
       if top_level
         body = Expressions.wrap(body)
       else
-        body = Expressions.wrap(
-          AssignNode.new(temp_var, @body.unwrap),
-          CallNode.new(ValueNode.new(LiteralNode.new(rvar), [AccessorNode.new('push')]), [temp_var])
-        )
+        body = Expressions.wrap(CallNode.new(
+          ValueNode.new(LiteralNode.new(rvar), [AccessorNode.new('push')]), [body.unwrap]
+        ))
       end
       if o[:return]
         return_result = "return #{return_result}" if o[:return]
         o.delete(:return)
         body = IfNode.new(@filter, body, nil, :statement => true) if @filter
       elsif @filter
-        body = Expressions.wrap(IfNode.new(@filter, @body))
+        body = Expressions.wrap(IfNode.new(@filter, body))
+      end
+      if @object
+        body = Expressions.wrap(IfNode.new(
+          CallNode.new(ValueNode.new(LiteralNode.wrap(svar), [AccessorNode.new(Value.new('hasOwnProperty'))]), [LiteralNode.wrap(ivar)]),
+          Expressions.wrap(body),
+          nil,
+          {:statement => true}
+        ))
       end
 
-      return_result = "\n#{o[:indent]}#{return_result};" unless top_level
+      return_result = "\n#{idt}#{return_result};" unless top_level
       body = body.compile(o.merge(:indent => body_dent, :top => true))
-      write("#{source_part}#{set_result}for (#{for_part}) {#{pre_cond}#{var_part}\n#{body}#{post_cond}\n#{o[:indent]}}#{return_result}")
+      vars = range ? @name : "#{@name}, #{ivar}"
+      return write(set_result + source_part + "for (#{for_part}) {\n#{var_part}#{body}\n#{idt}}\n#{idt}#{return_result}")
     end
   end
 
@@ -668,13 +705,12 @@ module CoffeeScript
     end
 
     def compile_node(o)
-      indent = o[:indent]
-      o[:indent] += TAB
+      o[:indent] = idt(1)
       o[:top] = true
       error_part = @error ? " (#{@error}) " : ' '
-      catch_part = @recovery &&  " catch#{error_part}{\n#{@recovery.compile(o)}\n#{indent}}"
-      finally_part = @finally && " finally {\n#{@finally.compile(o.merge(:return => nil))}\n#{indent}}"
-      write("#{indent}try {\n#{@try.compile(o)}\n#{indent}}#{catch_part}#{finally_part}")
+      catch_part = @recovery &&  " catch#{error_part}{\n#{@recovery.compile(o)}\n#{idt}}"
+      finally_part = @finally && " finally {\n#{@finally.compile(o.merge(:return => nil))}\n#{idt}}"
+      write("#{idt}try {\n#{@try.compile(o)}\n#{idt}}#{catch_part}#{finally_part}")
     end
   end
 
@@ -689,7 +725,7 @@ module CoffeeScript
     end
 
     def compile_node(o)
-      write("#{o[:indent]}throw #{@expression.compile(o)};")
+      write("#{idt}throw #{@expression.compile(o)};")
     end
   end
 
@@ -746,6 +782,11 @@ module CoffeeScript
       self
     end
 
+    def add_comment(comment)
+      @comment = comment
+      self
+    end
+
     def force_statement
       @tags[:statement] = true
       self
@@ -772,7 +813,7 @@ module CoffeeScript
     # The IfNode only compiles into a statement if either of the bodies needs
     # to be a statement.
     def statement?
-      @is_statement ||= !!(@tags[:statement] || @body.statement? || (@else_body && @else_body.statement?))
+      @is_statement ||= !!(@comment || @tags[:statement] || @body.statement? || (@else_body && @else_body.statement?))
     end
 
     def compile_node(o)
@@ -782,18 +823,19 @@ module CoffeeScript
     # Compile the IfNode as a regular if-else statement. Flattened chains
     # force sub-else bodies into statement form.
     def compile_statement(o)
-      indent = o[:indent]
-      child  = o.delete(:chain_child)
-      cond_o = o.dup
+      child       = o.delete(:chain_child)
+      cond_o      = o.dup
       cond_o.delete(:return)
-      o[:indent] += TAB
-      o[:top] = true
-      if_dent = child ? '' : indent
-      if_part = "#{if_dent}if (#{@condition.compile(cond_o)}) {\n#{Expressions.wrap(@body).compile(o)}\n#{indent}}"
+      o[:indent]  = idt(1)
+      o[:top]     = true
+      if_dent     = child ? '' : idt
+      com_dent    = child ? idt : ''
+      prefix      = @comment ? @comment.compile(cond_o) + "\n#{com_dent}" : ''
+      if_part     = "#{prefix}#{if_dent}if (#{@condition.compile(cond_o)}) {\n#{Expressions.wrap(@body).compile(o)}\n#{idt}}"
       return if_part unless @else_body
       else_part = chain? ?
-        " else #{@else_body.compile(o.merge(:indent => indent, :chain_child => true))}" :
-        " else {\n#{Expressions.wrap(@else_body).compile(o)}\n#{indent}}"
+        " else #{@else_body.compile(o.merge(:indent => idt, :chain_child => true))}" :
+        " else {\n#{Expressions.wrap(@else_body).compile(o)}\n#{idt}}"
       if_part + else_part
     end