CoffeeScript 0.1.4

README

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

Rakefile

@@ -13,13 +13,13 @@ end
 namespace :build do
 
   desc "Recompile the Racc parser (pass -v and -g for verbose debugging)"
-  task :parser, :extra_args do |t, args|
-    sh "racc #{args[:extra_args]} -o lib/coffee_script/parser.rb lib/coffee_script/grammar.y"
+  task :parser, :racc_args do |t, args|
+    sh "racc #{args[:racc_args]} -o lib/coffee_script/parser.rb lib/coffee_script/grammar.y"
   end
 
   desc "Compile the Narwhal interface for --interactive and --run"
   task :narwhal do
-    sh "bin/coffee-script lib/coffee_script/narwhal/*.cs -o lib/coffee_script/narwhal/js"
+    sh "bin/coffee-script lib/coffee_script/narwhal/*.coffee -o lib/coffee_script/narwhal/js"
   end
 
 end
@@ -27,7 +27,7 @@ end
 desc "Build the documentation page"
 task :doc do
   source = 'documentation/index.html.erb'
-  child = fork { exec "bin/coffee-script documentation/cs/*.cs -o documentation/js -w" }
+  child = fork { exec "bin/coffee-script documentation/coffee/*.coffee -o documentation/js -w" }
   at_exit { Process.kill("INT", child) }
   Signal.trap("INT") { exit }
   loop do

coffee-script.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name      = 'coffee-script'
-  s.version   = '0.1.3'         # Keep version in sync with coffee-script.rb
+  s.version   = '0.1.4'         # Keep version in sync with coffee-script.rb
   s.date      = '2009-12-25'
 
   s.homepage    = "http://jashkenas.github.com/coffee-script/"

documentation/coffee/conditionals.coffee

@@ -6,4 +6,4 @@ if happy and knows_it
 
 date: if friday then sue else jill.
 
-expensive ||: do_the_math()
+expensive ||= do_the_math()

documentation/coffee/super.coffee

@@ -3,13 +3,13 @@ Animal.prototype.move: meters =>
   alert(this.name + " moved " + meters + "m.").
 
 Snake: name => this.name: name.
-Snake extends new Animal()
+Snake extends Animal
 Snake.prototype.move: =>
   alert("Slithering...")
   super(5).
 
 Horse: name => this.name: name.
-Horse extends new Animal()
+Horse extends Animal
 Horse.prototype.move: =>
   alert("Galloping...")
   super(45).

documentation/cs/intro.cs

@@ -1,3 +0,0 @@
-# CoffeeScript on the left, JS on the right.
-
-square: x => x * x.

documentation/cs/punctuation.cs

@@ -1,11 +0,0 @@
-# Comments start with hash marks.
-
-# Periods mark the end of a block.
-left_hand: if raining then umbrella else parasol.
-
-# To signal the beginning of the next expression,
-# use "then", or a newline.
-left_hand: if raining
-  umbrella
-else
-  parasol.

documentation/index.html.erb

@@ -3,7 +3,7 @@
   def code_for(file, executable=false)
     @stripper ||= /(\A\(function\(\)\{\n|\}\)\(\);\Z|^  )/
     return '' unless File.exists?("documentation/js/#{file}.js")
-    cs = File.read("documentation/cs/#{file}.cs")
+    cs = File.read("documentation/coffee/#{file}.coffee")
     js = File.read("documentation/js/#{file}.js").gsub(@stripper, '')
     cshtml = Uv.parse(cs, 'xhtml', 'coffeescript', false, 'idle', false)
     jshtml = Uv.parse(js, 'xhtml', 'javascript', false, 'idle', false)
@@ -92,11 +92,11 @@ gem install coffee-script</pre>
 
     <p>
       Installing the gem provides the <tt>coffee-script</tt> command, which can
-      be used to compile CoffeeScript <tt>.cs</tt> files into JavaScript, as
-      well as debug them. In conjunction with 
+      be used to compile CoffeeScript <tt>.coffee</tt> files into JavaScript, as
+      well as debug them. In conjunction with
       <a href="http://narwhaljs.org/">Narwhal</a>, the <tt>coffee-script</tt>
-      command also provides direct evaluation and an interactive REPL. 
-      When compiling to JavaScript, <tt>coffee-script</tt> writes the output 
+      command also provides direct evaluation and an interactive REPL.
+      When compiling to JavaScript, <tt>coffee-script</tt> writes the output
       as <tt>.js</tt> files in the same directory by default, but output
       can be customized with the following options:
     </p>
@@ -105,7 +105,7 @@ gem install coffee-script</pre>
       <tr>
         <td width="25%"><code>-i, --interactive</code></td>
         <td>
-          Launch an interactive CoffeeScript session. 
+          Launch an interactive CoffeeScript session.
           Requires <a href="http://narwhaljs.org/">Narwhal</a>.
         </td>
       </tr>
@@ -187,9 +187,10 @@ gem install coffee-script</pre>
     </p>
 
     <pre>
-coffee-script path/to/script.cs
-coffee-script --watch --lint experimental.cs
-coffee-script --print app/scripts/*.cs > concatenation.js</pre>
+coffee-script path/to/script.coffee
+coffee-script --interactive
+coffee-script --watch --lint experimental.coffee
+coffee-script --print app/scripts/*.coffee > concatenation.js</pre>
 
     <h2>Language Reference</h2>
 
@@ -273,9 +274,9 @@ coffee-script --print app/scripts/*.cs > concatenation.js</pre>
     </p>
     <%= code_for('conditionals') %>
     <p>
-      The conditional assignment operators are available: <tt>||:</tt>,
+      The conditional assignment operators are available: <tt>||=</tt>,
       which only assigns a value to a variable if the variable's current value
-      is falsy, and <tt>&amp;&amp;:</tt>, which only replaces the value of
+      is falsy, and <tt>&amp;&amp;=</tt>, which only replaces the value of
       truthy variables.
     </p>
 
@@ -443,17 +444,29 @@ coffee-script --print app/scripts/*.cs > concatenation.js</pre>
 
     <h2 id="change_log">Change Log</h2>
     
+    <p>
+      <b class="header" style="margin-top: 20px;">0.1.4</b>
+      The official CoffeeScript extension is now <tt>.coffee</tt> instead of
+      <tt>.cs</tt>, which properly belongs to 
+      <a href="http://en.wikipedia.org/wiki/C_Sharp_(programming_language)">C#</a>.
+      Due to popular demand, you can now also use <tt>=</tt> to assign. Unlike
+      JavaScript, <tt>=</tt> can also be used within object literals, interchangeably
+      with <tt>:</tt>. Made a grammatical fix for chained function calls 
+      like <tt>func(1)(2)(3)(4)</tt>. Inheritance and super no longer use 
+      <tt>__proto__</tt>, so they should be IE-compatible now. 
+    </p>
+
     <p>
       <b class="header" style="margin-top: 20px;">0.1.3</b>
-      The <tt>coffee-script</tt> command now includes <tt>--interactive</tt>, 
+      The <tt>coffee-script</tt> command now includes <tt>--interactive</tt>,
       which launches an interactive CoffeeScript session, and <tt>--run</tt>,
       which directly compiles and executes a script. Both options depend on a
       working installation of Narwhal.
-      The <tt>aint</tt> keyword has been replaced by <tt>isnt</tt>, which goes 
+      The <tt>aint</tt> keyword has been replaced by <tt>isnt</tt>, which goes
       together a little smoother with <tt>is</tt>.
       Quoted strings are now allowed as identifiers within object literals: eg.
       <tt>{"5+5": 10}</tt>.
-      All assignment operators now use a colon: <tt>+:</tt>, <tt>-:</tt>, 
+      All assignment operators now use a colon: <tt>+:</tt>, <tt>-:</tt>,
       <tt>*:</tt>, etc.
     </p>
 

documentation/js/array_comprehensions.js

@@ -11,9 +11,11 @@
   lunch = __d;
   // Zebra-stripe a table.
   var __e = table;
+  var __h = [];
   for (var __f=0, __g=__e.length; __f<__g; __f++) {
     var row = __e[__f];
     var i = __f;
-    i % 2 === 0 ? highlight(row) : null;
+    __h[__f] = i % 2 === 0 ? highlight(row) : null;
   }
+  __h;
 })();

documentation/js/super.js

@@ -8,19 +8,23 @@
     this.name = name;
     return this.name;
   };
-  Snake.prototype.__proto__ = new Animal();
+  Snake.__superClass__ = Animal.prototype;
+  Snake.prototype = new Animal();
+  Snake.prototype.constructor = Snake;
   Snake.prototype.move = function() {
     alert("Slithering...");
-    return Snake.prototype.__proto__.move.call(this, 5);
+    return Snake.__superClass__.move.call(this, 5);
   };
   var Horse = function(name) {
     this.name = name;
     return this.name;
   };
-  Horse.prototype.__proto__ = new Animal();
+  Horse.__superClass__ = Animal.prototype;
+  Horse.prototype = new Animal();
+  Horse.prototype.constructor = Horse;
   Horse.prototype.move = function() {
     alert("Galloping...");
-    return Horse.prototype.__proto__.move.call(this, 45);
+    return Horse.__superClass__.move.call(this, 45);
   };
   var sam = new Snake("Sammy the Python");
   var tom = new Horse("Tommy the Palomino");

examples/code.coffee

@@ -62,8 +62,8 @@ race: =>
   race().
 
 # Conditional assignment:
-good ||: evil
-wine &&: cheese
+good ||= evil
+wine &&= cheese
 
 # Nested property access and calls.
 ((moon.turn(360))).shapes[3].move({x: 45, y: 30}).position['top'].offset('x')
@@ -145,13 +145,13 @@ Animal.prototype.move: meters =>
   alert(this.name + " moved " + meters + "m.").
 
 Snake: name => this.name: name.
-Snake extends new Animal()
+Snake extends Animal
 Snake.prototype.move: =>
   alert('Slithering...')
   super(5).
 
 Horse: name => this.name: name.
-Horse extends new Animal()
+Horse extends Animal
 Horse.prototype.move: =>
   alert('Galloping...')
   super(45).

examples/poignant.coffee

@@ -81,9 +81,9 @@ Creature : {
   hit: damage =>
     p_up: Math.rand( this.charisma )
     if p_up % 9 is 7
-      this.life +: p_up / 4
+      this.life += p_up / 4
       puts( "[" + this.name + " magick powers up " + p_up + "!]" ).
-    this.life -: damage
+    this.life -= damage
     if this.life <= 0 then puts( "[" + this.name + " has died.]" )..
 
   # This method takes one turn in a fight.

index.html

@@ -162,11 +162,11 @@ gem install coffee-script</pre>
 
     <p>
       Installing the gem provides the <tt>coffee-script</tt> command, which can
-      be used to compile CoffeeScript <tt>.cs</tt> files into JavaScript, as
-      well as debug them. In conjunction with 
+      be used to compile CoffeeScript <tt>.coffee</tt> files into JavaScript, as
+      well as debug them. In conjunction with
       <a href="http://narwhaljs.org/">Narwhal</a>, the <tt>coffee-script</tt>
-      command also provides direct evaluation and an interactive REPL. 
-      When compiling to JavaScript, <tt>coffee-script</tt> writes the output 
+      command also provides direct evaluation and an interactive REPL.
+      When compiling to JavaScript, <tt>coffee-script</tt> writes the output
       as <tt>.js</tt> files in the same directory by default, but output
       can be customized with the following options:
     </p>
@@ -175,7 +175,7 @@ gem install coffee-script</pre>
       <tr>
         <td width="25%"><code>-i, --interactive</code></td>
         <td>
-          Launch an interactive CoffeeScript session. 
+          Launch an interactive CoffeeScript session.
           Requires <a href="http://narwhaljs.org/">Narwhal</a>.
         </td>
       </tr>
@@ -257,9 +257,10 @@ gem install coffee-script</pre>
     </p>
 
     <pre>
-coffee-script path/to/script.cs
-coffee-script --watch --lint experimental.cs
-coffee-script --print app/scripts/*.cs > concatenation.js</pre>
+coffee-script path/to/script.coffee
+coffee-script --interactive
+coffee-script --watch --lint experimental.coffee
+coffee-script --print app/scripts/*.coffee > concatenation.js</pre>
 
     <h2>Language Reference</h2>
 
@@ -406,7 +407,7 @@ var new_num = change_numbers();
 
 date<span class="Keyword">:</span> <span class="Keyword">if</span> friday <span class="Keyword">then</span> sue <span class="Keyword">else</span> jill.
 
-expensive <span class="Keyword">||</span><span class="Keyword">:</span> do_the_math()
+expensive <span class="Keyword">||</span><span class="Keyword">=</span> do_the_math()
 </pre><pre class="idle"><span class="Storage">var</span> mood;
 <span class="Keyword">if</span> (singing) {
   mood <span class="Keyword">=</span> greatly_improved;
@@ -419,9 +420,9 @@ expensive <span class="Keyword">||</span><span class="Keyword">:</span> do_the_m
 expensive <span class="Keyword">=</span> expensive <span class="Keyword">||</span> do_the_math();
 </pre><br class='clear' /></div>
     <p>
-      The conditional assignment operators are available: <tt>||:</tt>,
+      The conditional assignment operators are available: <tt>||=</tt>,
       which only assigns a value to a variable if the variable's current value
-      is falsy, and <tt>&amp;&amp;:</tt>, which only replaces the value of
+      is falsy, and <tt>&amp;&amp;=</tt>, which only replaces the value of
       truthy variables.
     </p>
 
@@ -567,11 +568,13 @@ highlight(row) <span class="Keyword">for</span> row, i <span class="Keyword">in<
 lunch <span class="Keyword">=</span> __d;
 <span class="Comment"><span class="Comment">//</span> Zebra-stripe a table.</span>
 <span class="Storage">var</span> __e <span class="Keyword">=</span> table;
+<span class="Storage">var</span> __h <span class="Keyword">=</span> [];
 <span class="Keyword">for</span> (<span class="Storage">var</span> __f<span class="Keyword">=</span><span class="Number">0</span>, __g<span class="Keyword">=</span>__e.<span class="LibraryConstant">length</span>; __f<span class="Keyword">&lt;</span>__g; __f<span class="Keyword">++</span>) {
   <span class="Storage">var</span> row <span class="Keyword">=</span> __e[__f];
   <span class="Storage">var</span> i <span class="Keyword">=</span> __f;
-  i <span class="Keyword">%</span> <span class="Number">2</span> <span class="Keyword">===</span> <span class="Number">0</span> ? highlight(row) : <span class="BuiltInConstant">null</span>;
+  __h[__f] <span class="Keyword">=</span> i <span class="Keyword">%</span> <span class="Number">2</span> <span class="Keyword">===</span> <span class="Number">0</span> ? highlight(row) : <span class="BuiltInConstant">null</span>;
 }
+__h;
 </pre><br class='clear' /></div>
 
     <p id="slice">
@@ -610,13 +613,13 @@ var three_to_six = nums.slice(3, 6 + 1);
   alert(<span class="Variable">this</span>.name <span class="Keyword">+</span> <span class="String"><span class="String">&quot;</span> moved <span class="String">&quot;</span></span> <span class="Keyword">+</span> meters <span class="Keyword">+</span> <span class="String"><span class="String">&quot;</span>m.<span class="String">&quot;</span></span>).
 
 <span class="FunctionName">Snake</span><span class="Keyword">:</span> <span class="FunctionArgument">name</span> <span class="Storage">=&gt;</span> <span class="Variable">this</span>.name<span class="Keyword">:</span> name.
-Snake <span class="Variable">extends</span> <span class="Keyword">new</span> <span class="TypeName">Animal</span>()
+Snake <span class="Variable">extends</span> Animal
 <span class="FunctionName">Snake.prototype.move</span><span class="Keyword">:</span> <span class="Storage">=&gt;</span>
   alert(<span class="String"><span class="String">&quot;</span>Slithering...<span class="String">&quot;</span></span>)
   <span class="Variable">super</span>(<span class="Number">5</span>).
 
 <span class="FunctionName">Horse</span><span class="Keyword">:</span> <span class="FunctionArgument">name</span> <span class="Storage">=&gt;</span> <span class="Variable">this</span>.name<span class="Keyword">:</span> name.
-Horse <span class="Variable">extends</span> <span class="Keyword">new</span> <span class="TypeName">Animal</span>()
+Horse <span class="Variable">extends</span> Animal
 <span class="FunctionName">Horse.prototype.move</span><span class="Keyword">:</span> <span class="Storage">=&gt;</span>
   alert(<span class="String"><span class="String">&quot;</span>Galloping...<span class="String">&quot;</span></span>)
   <span class="Variable">super</span>(<span class="Number">45</span>).
@@ -639,19 +642,23 @@ tom.move()
   <span class="Variable">this</span>.<span class="LibraryConstant">name</span> <span class="Keyword">=</span> name;
   <span class="Keyword">return</span> <span class="Variable">this</span>.<span class="LibraryConstant">name</span>;
 };
-<span class="LibraryClassType">Snake</span>.<span class="LibraryConstant">prototype</span>.<span class="FunctionName">__proto__</span> = <span class="Keyword">new</span> <span class="TypeName">Animal</span>();
+Snake.__superClass__ <span class="Keyword">=</span> Animal.<span class="LibraryConstant">prototype</span>;
+<span class="LibraryClassType">Snake</span>.<span class="LibraryConstant">prototype</span> = <span class="Keyword">new</span> <span class="TypeName">Animal</span>();
+<span class="LibraryClassType">Snake</span>.<span class="LibraryConstant">prototype</span>.<span class="FunctionName">constructor</span> = Snake;
 <span class="LibraryClassType">Snake</span>.<span class="LibraryConstant">prototype</span>.<span class="FunctionName">move</span> = <span class="Storage">function</span>() {
   <span class="LibraryFunction">alert</span>(<span class="String"><span class="String">&quot;</span>Slithering...<span class="String">&quot;</span></span>);
-  <span class="Keyword">return</span> Snake.<span class="LibraryConstant">prototype</span>.__proto__.move.<span class="LibraryFunction">call</span>(<span class="Variable">this</span>, <span class="Number">5</span>);
+  <span class="Keyword">return</span> Snake.__superClass__.move.<span class="LibraryFunction">call</span>(<span class="Variable">this</span>, <span class="Number">5</span>);
 };
 <span class="Storage">var</span> <span class="FunctionName">Horse</span> = <span class="Storage">function</span>(<span class="FunctionArgument">name</span>) {
   <span class="Variable">this</span>.<span class="LibraryConstant">name</span> <span class="Keyword">=</span> name;
   <span class="Keyword">return</span> <span class="Variable">this</span>.<span class="LibraryConstant">name</span>;
 };
-<span class="LibraryClassType">Horse</span>.<span class="LibraryConstant">prototype</span>.<span class="FunctionName">__proto__</span> = <span class="Keyword">new</span> <span class="TypeName">Animal</span>();
+Horse.__superClass__ <span class="Keyword">=</span> Animal.<span class="LibraryConstant">prototype</span>;
+<span class="LibraryClassType">Horse</span>.<span class="LibraryConstant">prototype</span> = <span class="Keyword">new</span> <span class="TypeName">Animal</span>();
+<span class="LibraryClassType">Horse</span>.<span class="LibraryConstant">prototype</span>.<span class="FunctionName">constructor</span> = Horse;
 <span class="LibraryClassType">Horse</span>.<span class="LibraryConstant">prototype</span>.<span class="FunctionName">move</span> = <span class="Storage">function</span>() {
   <span class="LibraryFunction">alert</span>(<span class="String"><span class="String">&quot;</span>Galloping...<span class="String">&quot;</span></span>);
-  <span class="Keyword">return</span> Horse.<span class="LibraryConstant">prototype</span>.__proto__.move.<span class="LibraryFunction">call</span>(<span class="Variable">this</span>, <span class="Number">45</span>);
+  <span class="Keyword">return</span> Horse.__superClass__.move.<span class="LibraryFunction">call</span>(<span class="Variable">this</span>, <span class="Number">45</span>);
 };
 <span class="Storage">var</span> sam <span class="Keyword">=</span> <span class="Keyword">new</span> <span class="TypeName">Snake</span>(<span class="String"><span class="String">&quot;</span>Sammy the Python<span class="String">&quot;</span></span>);
 <span class="Storage">var</span> tom <span class="Keyword">=</span> <span class="Keyword">new</span> <span class="TypeName">Horse</span>(<span class="String"><span class="String">&quot;</span>Tommy the Palomino<span class="String">&quot;</span></span>);
@@ -666,19 +673,23 @@ var Snake = function(name) {
   this.name = name;
   return this.name;
 };
-Snake.prototype.__proto__ = new Animal();
+Snake.__superClass__ = Animal.prototype;
+Snake.prototype = new Animal();
+Snake.prototype.constructor = Snake;
 Snake.prototype.move = function() {
   alert("Slithering...");
-  return Snake.prototype.__proto__.move.call(this, 5);
+  return Snake.__superClass__.move.call(this, 5);
 };
 var Horse = function(name) {
   this.name = name;
   return this.name;
 };
-Horse.prototype.__proto__ = new Animal();
+Horse.__superClass__ = Animal.prototype;
+Horse.prototype = new Animal();
+Horse.prototype.constructor = Horse;
 Horse.prototype.move = function() {
   alert("Galloping...");
-  return Horse.prototype.__proto__.move.call(this, 45);
+  return Horse.__superClass__.move.call(this, 45);
 };
 var sam = new Snake("Sammy the Python");
 var tom = new Horse("Tommy the Palomino");
@@ -822,17 +833,29 @@ world...";
 
     <h2 id="change_log">Change Log</h2>
     
+    <p>
+      <b class="header" style="margin-top: 20px;">0.1.4</b>
+      The official CoffeeScript extension is now <tt>.coffee</tt> instead of
+      <tt>.cs</tt>, which properly belongs to 
+      <a href="http://en.wikipedia.org/wiki/C_Sharp_(programming_language)">C#</a>.
+      Due to popular demand, you can now also use <tt>=</tt> to assign. Unlike
+      JavaScript, <tt>=</tt> can also be used within object literals, interchangeably
+      with <tt>:</tt>. Made a grammatical fix for chained function calls 
+      like <tt>func(1)(2)(3)(4)</tt>. Inheritance and super no longer use 
+      <tt>__proto__</tt>, so they should be IE-compatible now. 
+    </p>
+
     <p>
       <b class="header" style="margin-top: 20px;">0.1.3</b>
-      The <tt>coffee-script</tt> command now includes <tt>--interactive</tt>, 
+      The <tt>coffee-script</tt> command now includes <tt>--interactive</tt>,
       which launches an interactive CoffeeScript session, and <tt>--run</tt>,
       which directly compiles and executes a script. Both options depend on a
       working installation of Narwhal.
-      The <tt>aint</tt> keyword has been replaced by <tt>isnt</tt>, which goes 
+      The <tt>aint</tt> keyword has been replaced by <tt>isnt</tt>, which goes
       together a little smoother with <tt>is</tt>.
       Quoted strings are now allowed as identifiers within object literals: eg.
       <tt>{"5+5": 10}</tt>.
-      All assignment operators now use a colon: <tt>+:</tt>, <tt>-:</tt>, 
+      All assignment operators now use a colon: <tt>+:</tt>, <tt>-:</tt>,
       <tt>*:</tt>, etc.
     </p>
 

lib/coffee-script.rb

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

lib/coffee_script/CoffeeScript.tmbundle/Preferences/CoffeeScript.tmPreferences

@@ -5,7 +5,7 @@
 	<key>name</key>
 	<string>comments</string>
 	<key>scope</key>
-	<string>source.cs</string>
+	<string>source.coffee</string>
 	<key>settings</key>
 	<dict>
 		<key>shellVariables</key>

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

@@ -6,8 +6,7 @@
 	<string>CoffeeScript Syntax: version 1</string>
 	<key>fileTypes</key>
 	<array>
-		<string>cs</string>
-		<string>coffeescript</string>
+		<string>coffee</string>
 	</array>
 	<key>name</key>
 	<string>CoffeeScript</string>
@@ -19,22 +18,22 @@
 				<key>1</key>
 				<dict>
 					<key>name</key>
-					<string>entity.name.function.cs</string>
+					<string>entity.name.function.coffee</string>
 				</dict>
 				<key>2</key>
 				<dict>
 					<key>name</key>
-					<string>keyword.operator.cs</string>
+					<string>keyword.operator.coffee</string>
 				</dict>
 				<key>3</key>
 				<dict>
 					<key>name</key>
-					<string>variable.parameter.function.cs</string>
+					<string>variable.parameter.function.coffee</string>
 				</dict>
 				<key>4</key>
 				<dict>
 					<key>name</key>
-					<string>storage.type.function.cs</string>
+					<string>storage.type.function.coffee</string>
 				</dict>
 			</dict>
 			<key>comment</key>
@@ -42,7 +41,7 @@
 			<key>match</key>
 			<string>([a-zA-Z_?.$]*)\s*(=|:)\s*([\w,\s]*?)\s*(=&gt;)</string>
 			<key>name</key>
-			<string>meta.function.cs</string>
+			<string>meta.function.coffee</string>
 		</dict>
 		<dict>
 			<key>captures</key>
@@ -50,12 +49,12 @@
 				<key>1</key>
 				<dict>
 					<key>name</key>
-					<string>variable.parameter.function.cs</string>
+					<string>variable.parameter.function.coffee</string>
 				</dict>
 				<key>2</key>
 				<dict>
 					<key>name</key>
-					<string>storage.type.function.cs</string>
+					<string>storage.type.function.coffee</string>
 				</dict>
 			</dict>
 			<key>comment</key>
@@ -63,7 +62,7 @@
 			<key>match</key>
 			<string>([a-zA-Z_?., $]*)\s*(=&gt;)</string>
 			<key>name</key>
-			<string>meta.inline.function.cs</string>
+			<string>meta.inline.function.coffee</string>
 		</dict>
 		<dict>
 			<key>captures</key>
@@ -71,12 +70,12 @@
 				<key>1</key>
 				<dict>
 					<key>name</key>
-					<string>keyword.operator.new.cs</string>
+					<string>keyword.operator.new.coffee</string>
 				</dict>
 				<key>2</key>
 				<dict>
 					<key>name</key>
-					<string>entity.name.type.instance.cs</string>
+					<string>entity.name.type.instance.coffee</string>
 				</dict>
 			</dict>
 			<key>match</key>
@@ -88,7 +87,7 @@
 			<key>match</key>
 			<string>\b((0(x|X)[0-9a-fA-F]+)|([0-9]+(\.[0-9]+)?(e[+\-]?[0-9]+)?))\b</string>
 			<key>name</key>
-			<string>constant.numeric.cs</string>
+			<string>constant.numeric.coffee</string>
 		</dict>
 		<dict>
 			<key>begin</key>
@@ -98,7 +97,7 @@
 				<key>0</key>
 				<dict>
 					<key>name</key>
-					<string>punctuation.definition.string.begin.cs</string>
+					<string>punctuation.definition.string.begin.coffee</string>
 				</dict>
 			</dict>
 			<key>end</key>
@@ -108,18 +107,18 @@
 				<key>0</key>
 				<dict>
 					<key>name</key>
-					<string>punctuation.definition.string.end.cs</string>
+					<string>punctuation.definition.string.end.coffee</string>
 				</dict>
 			</dict>
 			<key>name</key>
-			<string>string.quoted.single.cs</string>
+			<string>string.quoted.single.coffee</string>
 			<key>patterns</key>
 			<array>
 				<dict>
 					<key>match</key>
 					<string>\\(x\h{2}|[0-2][0-7]{,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.)</string>
 					<key>name</key>
-					<string>constant.character.escape.cs</string>
+					<string>constant.character.escape.coffee</string>
 				</dict>
 			</array>
 		</dict>
@@ -131,7 +130,7 @@
 				<key>0</key>
 				<dict>
 					<key>name</key>
-					<string>punctuation.definition.string.begin.cs</string>
+					<string>punctuation.definition.string.begin.coffee</string>
 				</dict>
 			</dict>
 			<key>end</key>
@@ -141,18 +140,18 @@
 				<key>0</key>
 				<dict>
 					<key>name</key>
-					<string>punctuation.definition.string.end.cs</string>
+					<string>punctuation.definition.string.end.coffee</string>
 				</dict>
 			</dict>
 			<key>name</key>
-			<string>string.quoted.double.cs</string>
+			<string>string.quoted.double.coffee</string>
 			<key>patterns</key>
 			<array>
 				<dict>
 					<key>match</key>
 					<string>\\(x\h{2}|[0-2][0-7]{,2}|3[0-6][0-7]|37[0-7]?|[4-7][0-7]?|.)</string>
 					<key>name</key>
-					<string>constant.character.escape.cs</string>
+					<string>constant.character.escape.coffee</string>
 				</dict>
 			</array>
 		</dict>
@@ -164,7 +163,7 @@
 				<key>0</key>
 				<dict>
 					<key>name</key>
-					<string>punctuation.definition.string.begin.cs</string>
+					<string>punctuation.definition.string.begin.coffee</string>
 				</dict>
 			</dict>
 			<key>end</key>
@@ -174,18 +173,18 @@
 				<key>0</key>
 				<dict>
 					<key>name</key>
-					<string>punctuation.definition.string.end.cs</string>
+					<string>punctuation.definition.string.end.coffee</string>
 				</dict>
 			</dict>
 			<key>name</key>
-			<string>string.quoted.script.cs</string>
+			<string>string.quoted.script.coffee</string>
 			<key>patterns</key>
 			<array>
 				<dict>
 					<key>match</key>
 					<string>\\(x\h{2}|[0-2][0-7]{,2}|3[0-6][0-7]|37[0-7]?|[4-7][0-7]?|.)</string>
 					<key>name</key>
-					<string>constant.character.escape.cs</string>
+					<string>constant.character.escape.coffee</string>
 				</dict>
 			</array>
 		</dict>
@@ -195,61 +194,61 @@
 				<key>1</key>
 				<dict>
 					<key>name</key>
-					<string>punctuation.definition.comment.cs</string>
+					<string>punctuation.definition.comment.coffee</string>
 				</dict>
 			</dict>
 			<key>match</key>
 			<string>(#).*$\n?</string>
 			<key>name</key>
-			<string>comment.line.cs</string>
+			<string>comment.line.coffee</string>
 		</dict>
 		<dict>
 			<key>match</key>
 			<string>\b(break|when|catch|continue|else|finally|for|if|return|switch|then|throw|try|unless|while)\b</string>
 			<key>name</key>
-			<string>keyword.control.cs</string>
+			<string>keyword.control.coffee</string>
 		</dict>
 		<dict>
 			<key>match</key>
 			<string>\b(true|on|yes)\b</string>
 			<key>name</key>
-			<string>constant.language.boolean.true.cs</string>
+			<string>constant.language.boolean.true.coffee</string>
 		</dict>
 		<dict>
 			<key>match</key>
 			<string>\b(false|off|no)\b</string>
 			<key>name</key>
-			<string>constant.language.boolean.false.cs</string>
+			<string>constant.language.boolean.false.coffee</string>
 		</dict>
 		<dict>
 			<key>match</key>
 			<string>\bnull\b</string>
 			<key>name</key>
-			<string>constant.language.null.cs</string>
+			<string>constant.language.null.coffee</string>
 		</dict>
 		<dict>
 			<key>match</key>
 			<string>\b(super|this|extends)\b</string>
 			<key>name</key>
-			<string>variable.language.cs</string>
+			<string>variable.language.coffee</string>
 		</dict>
 		<dict>
 			<key>match</key>
 			<string>\b(debugger)\b</string>
 			<key>name</key>
-			<string>keyword.other.cs</string>
+			<string>keyword.other.coffee</string>
 		</dict>
 		<dict>
 			<key>match</key>
-			<string>!|\$|%|&amp;|\*|\-\-|\-|\+\+|\+|~|===|==|=|!=|!==|&lt;=|&gt;=|&lt;&lt;=|&gt;&gt;=|&gt;&gt;&gt;=|&lt;&gt;|&lt;|&gt;|!|&amp;&amp;|\?|\|\||\:|\*:|(?&lt;!\()/=|%:|\+:|\-:|&amp;=|\^=|\b(in|instanceof|new|delete|typeof|and|or|is|isnt|not)\b</string>
+			<string>!|\$|%|&amp;|\*|\-\-|\-|\+\+|\+|~|===|==|=|!=|!==|&lt;=|&gt;=|&lt;&lt;=|&gt;&gt;=|&gt;&gt;&gt;=|&lt;&gt;|&lt;|&gt;|!|&amp;&amp;|\?|\|\||\:|\*=|(?&lt;!\()/=|%=|\+=|\-=|&amp;=|\^=|\b(in|instanceof|new|delete|typeof|and|or|is|isnt|not)\b</string>
 			<key>name</key>
-			<string>keyword.operator.cs</string>
+			<string>keyword.operator.coffee</string>
 		</dict>
 		<dict>
 			<key>match</key>
 			<string>\b(Infinity|NaN|undefined)\b</string>
 			<key>name</key>
-			<string>constant.language.cs</string>
+			<string>constant.language.coffee</string>
 		</dict>
 		<dict>
 			<key>begin</key>
@@ -259,7 +258,7 @@
 				<key>1</key>
 				<dict>
 					<key>name</key>
-					<string>punctuation.definition.string.begin.cs</string>
+					<string>punctuation.definition.string.begin.coffee</string>
 				</dict>
 			</dict>
 			<key>end</key>
@@ -269,18 +268,18 @@
 				<key>1</key>
 				<dict>
 					<key>name</key>
-					<string>punctuation.definition.string.end.cs</string>
+					<string>punctuation.definition.string.end.coffee</string>
 				</dict>
 			</dict>
 			<key>name</key>
-			<string>string.regexp.cs</string>
+			<string>string.regexp.coffee</string>
 			<key>patterns</key>
 			<array>
 				<dict>
 					<key>match</key>
 					<string>\\.</string>
 					<key>name</key>
-					<string>constant.character.escape.cs</string>
+					<string>constant.character.escape.coffee</string>
 				</dict>
 			</array>
 		</dict>
@@ -288,41 +287,41 @@
 			<key>match</key>
 			<string>\;</string>
 			<key>name</key>
-			<string>punctuation.terminator.statement.cs</string>
+			<string>punctuation.terminator.statement.coffee</string>
 		</dict>
 		<dict>
 			<key>match</key>
 			<string>,[ |\t]*</string>
 			<key>name</key>
-			<string>meta.delimiter.object.comma.cs</string>
+			<string>meta.delimiter.object.comma.coffee</string>
 		</dict>
 		<dict>
 			<key>match</key>
 			<string>\.</string>
 			<key>name</key>
-			<string>meta.delimiter.method.period.cs</string>
+			<string>meta.delimiter.method.period.coffee</string>
 		</dict>
 		<dict>
 			<key>match</key>
 			<string>\{|\}</string>
 			<key>name</key>
-			<string>meta.brace.curly.cs</string>
+			<string>meta.brace.curly.coffee</string>
 		</dict>
 		<dict>
 			<key>match</key>
 			<string>\(|\)</string>
 			<key>name</key>
-			<string>meta.brace.round.cs</string>
+			<string>meta.brace.round.coffee</string>
 		</dict>
 		<dict>
 			<key>match</key>
 			<string>\[|\]</string>
 			<key>name</key>
-			<string>meta.brace.square.cs</string>
+			<string>meta.brace.square.coffee</string>
 		</dict>
 	</array>
 	<key>scopeName</key>
-	<string>source.cs</string>
+	<string>source.coffee</string>
 	<key>uuid</key>
 	<string>5B520980-A7D5-4E10-8582-1A4C889A8DE5</string>
 </dict>

lib/coffee_script/command_line.rb

@@ -13,7 +13,7 @@ module CoffeeScript
 coffee-script compiles CoffeeScript source files into JavaScript.
 
 Usage:
-  coffee-script path/to/script.cs
+  coffee-script path/to/script.coffee
     EOS
 
     # Seconds to pause between checks for changed source files.

lib/coffee_script/grammar.y

@@ -26,18 +26,18 @@ prechigh
   left     '<=' '<' '>' '>='
   right    '==' '!=' IS ISNT
   left     '&&' '||' AND OR
-  right    '-:' '+:' '/:' '*:' '%:'
+  right    '-=' '+=' '/=' '*=' '%='
   right    DELETE INSTANCEOF TYPEOF
-  left     "."
+  left     '.'
   right    THROW FOR IN WHILE NEW SUPER
   left     UNLESS IF ELSE EXTENDS
-  left     ":" '||:' '&&:'
+  left     ASSIGN '||=' '&&='
   right    RETURN
 preclow
 
-# We expect 4 shift/reduce errors for optional syntax.
+# We expect 3 shift/reduce errors for optional syntax.
 # There used to be 252 -- greatly improved.
-expect 4
+expect 3
 
 rule
 
@@ -115,13 +115,13 @@ rule
 
   # Assignment to a variable.
   Assign:
-    Value ":" Expression              { result = AssignNode.new(val[0], val[2]) }
+    Value ASSIGN Expression         { result = AssignNode.new(val[0], val[2]) }
   ;
 
   # Assignment within an object literal.
   AssignObj:
-    IDENTIFIER ":" Expression         { result = AssignNode.new(val[0], val[2], :object) }
-  | STRING ":" Expression             { result = AssignNode.new(val[0], val[2], :object) }
+    IDENTIFIER ASSIGN Expression    { result = AssignNode.new(val[0], val[2], :object) }
+  | STRING ASSIGN Expression        { result = AssignNode.new(val[0], val[2], :object) }
   | Comment                           { result = val[0] }
   ;
 
@@ -179,13 +179,13 @@ rule
   | Expression AND Expression         { result = OpNode.new(val[1], val[0], val[2]) }
   | Expression OR Expression          { result = OpNode.new(val[1], val[0], val[2]) }
 
-  | Expression '-:' Expression        { result = OpNode.new(val[1], val[0], val[2]) }
-  | Expression '+:' Expression        { result = OpNode.new(val[1], val[0], val[2]) }
-  | Expression '/:' Expression        { result = OpNode.new(val[1], val[0], val[2]) }
-  | Expression '*:' Expression        { result = OpNode.new(val[1], val[0], val[2]) }
-  | Expression '%:' Expression        { result = OpNode.new(val[1], val[0], val[2]) }
-  | Expression '||:' Expression       { result = OpNode.new(val[1], val[0], val[2]) }
-  | Expression '&&:' Expression       { result = OpNode.new(val[1], val[0], val[2]) }
+  | Expression '-=' Expression        { result = OpNode.new(val[1], val[0], val[2]) }
+  | Expression '+=' Expression        { result = OpNode.new(val[1], val[0], val[2]) }
+  | Expression '/=' Expression        { result = OpNode.new(val[1], val[0], val[2]) }
+  | Expression '*=' Expression        { result = OpNode.new(val[1], val[0], val[2]) }
+  | Expression '%=' Expression        { result = OpNode.new(val[1], val[0], val[2]) }
+  | Expression '||=' Expression       { result = OpNode.new(val[1], val[0], val[2]) }
+  | Expression '&&=' Expression       { result = OpNode.new(val[1], val[0], val[2]) }
 
   | DELETE Expression                 { result = OpNode.new(val[0], val[1]) }
   | TYPEOF Expression                 { result = OpNode.new(val[0], val[1]) }
@@ -259,12 +259,13 @@ rule
 
   # Extending an object's prototype.
   Extends:
-    Value EXTENDS Expression      { result = ExtendsNode.new(val[0], val[2]) }
+    Value EXTENDS Value               { result = ExtendsNode.new(val[0], val[2]) }
   ;
 
   # A generic function invocation.
   Invocation:
     Value "(" ArgList ")"             { result = CallNode.new(val[0], val[2]) }
+  | Invocation "(" ArgList ")"        { result = CallNode.new(val[0], val[2]) }
   ;
 
   # Calling super.
@@ -315,19 +316,23 @@ rule
   ;
 
   # Array comprehensions, including guard and current index.
+  # Looks a little confusing, check nodes.rb for the arguments to ForNode.
   For:
-  Expression FOR IDENTIFIER
-    IN PureExpression "."             { result = ForNode.new(val[0], val[4], val[2], nil) }
-  | Expression FOR
-      IDENTIFIER "," IDENTIFIER
-      IN PureExpression "."           { result = ForNode.new(val[0], val[6], val[2], nil, val[4]) }
-  | Expression FOR IDENTIFIER
-      IN PureExpression
-      IF Expression "."               { result = ForNode.new(val[0], val[4], val[2], val[6]) }
-  | Expression FOR
-      IDENTIFIER "," IDENTIFIER
-      IN PureExpression
-      IF Expression "."               { result = ForNode.new(val[0], val[6], val[2], val[8], val[4]) }
+    Expression FOR
+      ForVariables ForSource          { result = ForNode.new(val[0], val[3][0], val[2][0], val[3][1], val[2][1]) }
+  ;
+
+  # An array comprehension has variables for the current element and index.
+  ForVariables:
+    IDENTIFIER                        { result = val }
+  | IDENTIFIER "," IDENTIFIER         { result = [val[0], val[2]] }
+  ;
+
+  # The source of the array comprehension can optionally be filtered.
+  ForSource:
+    IN PureExpression "."             { result = [val[1]] }
+  | IN PureExpression
+    IF Expression "."                 { result = [val[1], val[3]] }
   ;
 
   # Switch/When blocks.

lib/coffee_script/lexer.rb

@@ -40,6 +40,9 @@ module CoffeeScript
     # Tokens that always constitute the end of an expression.
     EXP_END    = ['}', ')', ']']
 
+    # Assignment tokens.
+    ASSIGN     = [':', '=']
+
     # Scan by attempting to match tokens one character at a time. Slow and steady.
     def tokenize(code)
       @code = code.chomp  # Cleanup code by remove extra line breaks
@@ -139,7 +142,8 @@ module CoffeeScript
       value ||= @chunk[0,1]
       skip_following_newlines if EXP_START.include?(value)
       remove_leading_newlines if EXP_END.include?(value)
-      token(value, value)
+      tag = ASSIGN.include?(value) ? :ASSIGN : value
+      token(tag, value)
       @i += value.length
     end
 

lib/coffee_script/narwhal/coffee-script.coffee

@@ -1,4 +1,4 @@
-# This (javascript) file is generated from lib/coffee_script/narwhal/coffee-script.cs
+# This (javascript) file is generated from lib/coffee_script/narwhal/coffee-script.coffee
 
 # Executes the `coffee-script` Ruby program to convert from CoffeeScript
 # to Javascript. Eventually this will hopefully happen entirely within JS.

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

@@ -1,6 +1,6 @@
 (function(){
 
-  // This (javascript) file is generated from lib/coffee_script/narwhal/coffee-script.cs Executes the `coffee-script` Ruby program to convert from CoffeeScript
+  // This (javascript) file is generated from lib/coffee_script/narwhal/coffee-script.coffee Executes the `coffee-script` 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');

lib/coffee_script/narwhal/js/loader.js

@@ -1,6 +1,6 @@
 (function(){
 
-  // This (javascript) file is generated from lib/coffee_script/narwhal/loader.cs
+  // This (javascript) file is generated from lib/coffee_script/narwhal/loader.coffee
   var coffeescript = null;
   var factories = {
   };
@@ -16,5 +16,5 @@
       return factories[topId] = factories[topId] || this.reload(topId, path);
     }
   };
-  require.loader.loaders.unshift([".cs", loader]);
+  require.loader.loaders.unshift([".coffee", loader]);
 })();

lib/coffee_script/narwhal/loader.coffee

@@ -1,4 +1,4 @@
-# This (javascript) file is generated from lib/coffee_script/narwhal/loader.cs
+# This (javascript) file is generated from lib/coffee_script/narwhal/loader.coffee
 
 coffeescript: null
 factories: {}
@@ -7,13 +7,13 @@ loader: {
 
   # Reload the coffee-script environment from source.
   reload: topId, path =>
-    coffeescript ||: require('coffee-script')
+    coffeescript ||= require('coffee-script')
     factories[topId]: coffeescript.makeNarwhalFactory(path).
 
   # Ensure that the coffee-script environment is loaded.
   load: topId, path =>
-    factories[topId] ||: this.reload(topId, path).
+    factories[topId] ||= this.reload(topId, path).
 
 }
 
-require.loader.loaders.unshift([".cs", loader])
+require.loader.loaders.unshift([".coffee", loader])

lib/coffee_script/nodes.rb

@@ -211,11 +211,12 @@ module CoffeeScript
     def compile_super(args, o)
       methname = o[:last_assign].sub(LEADING_DOT, '')
       arg_part = args.empty? ? '' : ", #{args}"
-      "#{o[:proto_assign]}.prototype.__proto__.#{methname}.call(this#{arg_part})"
+      "#{o[:proto_assign]}.__superClass__.#{methname}.call(this#{arg_part})"
     end
   end
 
   # Node to extend an object's prototype with an ancestor object.
+  # After goog.inherits from the Closure Library.
   class ExtendsNode < Node
     attr_reader :sub_object, :super_object
 
@@ -224,7 +225,10 @@ module CoffeeScript
     end
 
     def compile(o={})
-      "#{@sub_object.compile(o)}.prototype.__proto__ = #{@super_object.compile(o)}"
+      sub, sup = @sub_object.compile(o), @super_object.compile(o)
+      "#{sub}.__superClass__ = #{sup}.prototype;\n#{o[:indent]}" +
+      "#{sub}.prototype = new #{sup}();\n#{o[:indent]}" +
+      "#{sub}.prototype.constructor = #{sub}"
     end
 
   end
@@ -358,14 +362,9 @@ module CoffeeScript
       'or'    => '||',
       'is'    => '===',
       "isnt"  => "!==",
-      'not'   => '!',
-      '+:'    => '+=',
-      '-:'    => '-=',
-      '*:'    => '*=',
-      '/:'    => '/=',
-      '%:'    => '%='
+      'not'   => '!'
     }
-    CONDITIONALS     = ['||:', '&&:']
+    CONDITIONALS     = ['||=', '&&=']
     PREFIX_OPERATORS = ['typeof', 'delete']
 
     attr_reader :operator, :first, :second
@@ -507,32 +506,28 @@ module CoffeeScript
 
     def compile(o={})
       o = super(o)
-      scope       = o[:scope]
-      name_found  = scope.find(@name)
-      index_found = @index && scope.find(@index)
-      svar        = scope.free_variable
-      ivar        = scope.free_variable
-      lvar        = 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" : ''
+      scope         = o[:scope]
+      name_found    = scope.find(@name)
+      index_found   = @index && scope.find(@index)
+      svar          = scope.free_variable
+      ivar          = 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" : ''
+      body          = @body
+      suffix        = ';'
+      set_result    = "var #{rvar} = [];\n#{o[:indent]}"
+      save_result   = "#{rvar}[#{ivar}] = "
+      return_result = rvar
 
-      set_result    = ''
-      save_result   = ''
-      return_result = ''
-      body = @body
-      suffix = ';'
       if o[:return] || o[:assign]
-        rvar          = scope.free_variable
-        set_result    = "var #{rvar} = [];\n#{o[:indent]}"
-        save_result  += "#{rvar}[#{ivar}] = "
-        return_result = rvar
-        return_result = "#{o[:assign]} = #{return_result};" if o[:assign]
-        return_result = "return #{return_result};" if o[:return]
-        return_result = "\n#{o[:indent]}#{return_result}"
+        return_result = "#{o[:assign]} = #{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])
           body = IfNode.new(@filter, body, nil, :statement => true)
@@ -543,6 +538,7 @@ module CoffeeScript
         body = IfNode.new(@filter, @body)
       end
 
+      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}")

package.json

@@ -5,5 +5,5 @@
     "description":  "Unfancy JavaScript",
     "keywords":     ["javascript", "language"],
     "author":       "Jeremy Ashkenas",
-    "version":      "0.1.3"
+    "version":      "0.1.4"
 }

test/fixtures/each.js

@@ -9,17 +9,21 @@
         obj.forEach(iterator, context);
       } else if (_.isArray(obj) || _.isArguments(obj)) {
         var __a = obj;
+        var __d = [];
         for (var __b=0, __c=__a.length; __b<__c; __b++) {
           var item = __a[__b];
           var i = __b;
-          iterator.call(context, item, i, obj);
+          __d[__b] = iterator.call(context, item, i, obj);
         }
+        __d;
       } else {
-        var __d = _.keys(obj);
-        for (var __e=0, __f=__d.length; __e<__f; __e++) {
-          var key = __d[__e];
-          iterator.call(context, obj[key], key, obj);
+        var __e = _.keys(obj);
+        var __h = [];
+        for (var __f=0, __g=__e.length; __f<__g; __f++) {
+          var key = __e[__f];
+          __h[__f] = iterator.call(context, obj[key], key, obj);
         }
+        __h;
       }
     } catch (e) {
       if (e !== breaker) {

test/fixtures/each.tokens

@@ -1 +1 @@
-[[:COMMENT, [" The cornerstone, an each implementation.", " Handles objects implementing forEach, arrays, and raw objects."]], ["\n", "\n"], [:IDENTIFIER, "_"], [:PROPERTY_ACCESS, "."], [:IDENTIFIER, "each"], [":", ":"], [:PARAM, "obj"], [",", ","], [:PARAM, "iterator"], [",", ","], [:PARAM, "context"], ["=>", "=>"], ["\n", "\n"], [:IDENTIFIER, "index"], [":", ":"], [:NUMBER, "0"], ["\n", "\n"], [:TRY, "try"], ["\n", "\n"], [:IF, "if"], [:IDENTIFIER, "obj"], [:PROPERTY_ACCESS, "."], [:IDENTIFIER, "forEach"], ["\n", "\n"], [:IDENTIFIER, "obj"], [:PROPERTY_ACCESS, "."], [:IDENTIFIER, "forEach"], ["(", "("], [:IDENTIFIER, "iterator"], [",", ","], [:IDENTIFIER, "context"], [")", ")"], ["\n", "\n"], [:ELSE, "else"], [:IF, "if"], [:IDENTIFIER, "_"], [:PROPERTY_ACCESS, "."], [:IDENTIFIER, "isArray"], ["(", "("], [:IDENTIFIER, "obj"], [")", ")"], [:OR, "or"], [:IDENTIFIER, "_"], [:PROPERTY_ACCESS, "."], [:IDENTIFIER, "isArguments"], ["(", "("], [:IDENTIFIER, "obj"], [")", ")"], ["\n", "\n"], [:IDENTIFIER, "iterator"], [:PROPERTY_ACCESS, "."], [:IDENTIFIER, "call"], ["(", "("], [:IDENTIFIER, "context"], [",", ","], [:IDENTIFIER, "item"], [",", ","], [:IDENTIFIER, "i"], [",", ","], [:IDENTIFIER, "obj"], [")", ")"], [:FOR, "for"], [:IDENTIFIER, "item"], [",", ","], [:IDENTIFIER, "i"], [:IN, "in"], [:IDENTIFIER, "obj"], [".", "."], ["\n", "\n"], [:ELSE, "else"], ["\n", "\n"], [:IDENTIFIER, "iterator"], [:PROPERTY_ACCESS, "."], [:IDENTIFIER, "call"], ["(", "("], [:IDENTIFIER, "context"], [",", ","], [:IDENTIFIER, "obj"], ["[", "["], [:IDENTIFIER, "key"], ["]", "]"], [",", ","], [:IDENTIFIER, "key"], [",", ","], [:IDENTIFIER, "obj"], [")", ")"], [:FOR, "for"], [:IDENTIFIER, "key"], [:IN, "in"], [:IDENTIFIER, "_"], [:PROPERTY_ACCESS, "."], [:IDENTIFIER, "keys"], ["(", "("], [:IDENTIFIER, "obj"], [")", ")"], [".", "."], [".", "."], ["\n", "\n"], [:CATCH, "catch"], [:IDENTIFIER, "e"], ["\n", "\n"], [:THROW, "throw"], [:IDENTIFIER, "e"], [:IF, "if"], [:IDENTIFIER, "e"], [:ISNT, "isnt"], [:IDENTIFIER, "breaker"], [".", "."], ["\n", "\n"], [:IDENTIFIER, "obj"], [".", "."]]
+[[:COMMENT, [" The cornerstone, an each implementation.", " Handles objects implementing forEach, arrays, and raw objects."]], ["\n", "\n"], [:IDENTIFIER, "_"], [:PROPERTY_ACCESS, "."], [:IDENTIFIER, "each"], [:ASSIGN, ":"], [:PARAM, "obj"], [",", ","], [:PARAM, "iterator"], [",", ","], [:PARAM, "context"], ["=>", "=>"], ["\n", "\n"], [:IDENTIFIER, "index"], [:ASSIGN, ":"], [:NUMBER, "0"], ["\n", "\n"], [:TRY, "try"], ["\n", "\n"], [:IF, "if"], [:IDENTIFIER, "obj"], [:PROPERTY_ACCESS, "."], [:IDENTIFIER, "forEach"], ["\n", "\n"], [:IDENTIFIER, "obj"], [:PROPERTY_ACCESS, "."], [:IDENTIFIER, "forEach"], ["(", "("], [:IDENTIFIER, "iterator"], [",", ","], [:IDENTIFIER, "context"], [")", ")"], ["\n", "\n"], [:ELSE, "else"], [:IF, "if"], [:IDENTIFIER, "_"], [:PROPERTY_ACCESS, "."], [:IDENTIFIER, "isArray"], ["(", "("], [:IDENTIFIER, "obj"], [")", ")"], [:OR, "or"], [:IDENTIFIER, "_"], [:PROPERTY_ACCESS, "."], [:IDENTIFIER, "isArguments"], ["(", "("], [:IDENTIFIER, "obj"], [")", ")"], ["\n", "\n"], [:IDENTIFIER, "iterator"], [:PROPERTY_ACCESS, "."], [:IDENTIFIER, "call"], ["(", "("], [:IDENTIFIER, "context"], [",", ","], [:IDENTIFIER, "item"], [",", ","], [:IDENTIFIER, "i"], [",", ","], [:IDENTIFIER, "obj"], [")", ")"], [:FOR, "for"], [:IDENTIFIER, "item"], [",", ","], [:IDENTIFIER, "i"], [:IN, "in"], [:IDENTIFIER, "obj"], [".", "."], ["\n", "\n"], [:ELSE, "else"], ["\n", "\n"], [:IDENTIFIER, "iterator"], [:PROPERTY_ACCESS, "."], [:IDENTIFIER, "call"], ["(", "("], [:IDENTIFIER, "context"], [",", ","], [:IDENTIFIER, "obj"], ["[", "["], [:IDENTIFIER, "key"], ["]", "]"], [",", ","], [:IDENTIFIER, "key"], [",", ","], [:IDENTIFIER, "obj"], [")", ")"], [:FOR, "for"], [:IDENTIFIER, "key"], [:IN, "in"], [:IDENTIFIER, "_"], [:PROPERTY_ACCESS, "."], [:IDENTIFIER, "keys"], ["(", "("], [:IDENTIFIER, "obj"], [")", ")"], [".", "."], [".", "."], ["\n", "\n"], [:CATCH, "catch"], [:IDENTIFIER, "e"], ["\n", "\n"], [:THROW, "throw"], [:IDENTIFIER, "e"], [:IF, "if"], [:IDENTIFIER, "e"], [:ISNT, "isnt"], [:IDENTIFIER, "breaker"], [".", "."], ["\n", "\n"], [:IDENTIFIER, "obj"], [".", "."]]

test/fixtures/each_no_wrap.js

@@ -8,17 +8,21 @@ _.each = function(obj, iterator, context) {
       obj.forEach(iterator, context);
     } else if (_.isArray(obj) || _.isArguments(obj)) {
       var __a = obj;
+      var __d = [];
       for (var __b=0, __c=__a.length; __b<__c; __b++) {
         var item = __a[__b];
         var i = __b;
-        iterator.call(context, item, i, obj);
+        __d[__b] = iterator.call(context, item, i, obj);
       }
+      __d;
     } else {
-      var __d = _.keys(obj);
-      for (var __e=0, __f=__d.length; __e<__f; __e++) {
-        var key = __d[__e];
-        iterator.call(context, obj[key], key, obj);
+      var __e = _.keys(obj);
+      var __h = [];
+      for (var __f=0, __g=__e.length; __f<__g; __f++) {
+        var key = __e[__f];
+        __h[__f] = iterator.call(context, obj[key], key, obj);
       }
+      __h;
     }
   } catch (e) {
     if (e !== breaker) {

test/fixtures/execution/calling_super.coffee

@@ -3,17 +3,17 @@ Base.prototype.func: string =>
   'zero/' + string.
 
 FirstChild: => .
-FirstChild extends new Base()
+FirstChild extends Base
 FirstChild.prototype.func: string =>
   super('one/') + string.
 
 SecondChild: => .
-SecondChild extends new FirstChild()
+SecondChild extends FirstChild
 SecondChild.prototype.func: string =>
   super('two/') + string.
 
 ThirdChild: => .
-ThirdChild extends new SecondChild()
+ThirdChild extends SecondChild
 ThirdChild.prototype.func: string =>
   super('three/') + string.
 

test/fixtures/execution/chained_calls.coffee

@@ -0,0 +1,5 @@
+identity_wrap: x => => x..
+
+result: identity_wrap(identity_wrap(true))()()
+
+print(result)

test/fixtures/execution/keyword_operators.cs

@@ -1,10 +0,0 @@
-a: 5
-atype: typeof a
-
-b: "hello"
-btype: typeof b
-
-Klass: => .
-k: new Klass()
-
-print(atype is 'number' and btype is 'string' and k instanceof Klass)

test/fixtures/execution/test_everything.coffee

@@ -16,7 +16,11 @@ func: =>
   else
     c.text + '---'.
 
-  c.list: l for l in c.text.split('') if l is '-'.
+  d = {
+    text = c.text
+  }
+
+  c.list: l for l in d.text.split('') if l is '-'.
 
   c.single: c.list[1, 1][0].
 

test/unit/test_execution.rb

@@ -6,17 +6,17 @@ class ExecutionTest < Test::Unit::TestCase
   ALLS_WELL   = /\A\n?(true\n)+\Z/
 
   def test_execution_of_coffeescript
-    sources = ['test/fixtures/execution/*.cs'].join(' ')
+    sources = ['test/fixtures/execution/*.coffee'].join(' ')
     assert `bin/coffee-script -r #{sources}`.match(ALLS_WELL)
   end
 
   def test_lintless_coffeescript
-    lint_results = `bin/coffee-script -l test/fixtures/execution/*.cs`
+    lint_results = `bin/coffee-script -l test/fixtures/execution/*.coffee`
     assert lint_results.match(NO_WARNINGS)
   end
 
   def test_lintless_examples
-    lint_results = `bin/coffee-script -l examples/*.cs`
+    lint_results = `bin/coffee-script -l examples/*.coffee`
     assert lint_results.match(NO_WARNINGS)
   end
 

test/unit/test_lexer.rb

@@ -12,14 +12,14 @@ class LexerTest < Test::Unit::TestCase
 
   def test_lexing_basic_assignment
     code = "a: 'one'; b: [1, 2]"
-    assert @lex.tokenize(code) == [[:IDENTIFIER, "a"], [":", ":"],
-      [:STRING, "'one'"], [";", ";"], [:IDENTIFIER, "b"], [":", ":"],
+    assert @lex.tokenize(code) == [[:IDENTIFIER, "a"], [:ASSIGN, ":"],
+      [:STRING, "'one'"], [";", ";"], [:IDENTIFIER, "b"], [:ASSIGN, ":"],
       ["[", "["], [:NUMBER, "1"], [",", ","], [:NUMBER, "2"], ["]", "]"]]
   end
 
   def test_lexing_object_literal
     code = "{one : 1}"
-    assert @lex.tokenize(code) == [["{", "{"], [:IDENTIFIER, "one"], [":", ":"],
+    assert @lex.tokenize(code) == [["{", "{"], [:IDENTIFIER, "one"], [:ASSIGN, ":"],
       [:NUMBER, "1"], ["}", "}"]]
   end
 
@@ -37,13 +37,13 @@ class LexerTest < Test::Unit::TestCase
 
   def test_lexing_comment
     code = "a: 1\n # comment\n # on two lines\nb: 2"
-    assert @lex.tokenize(code) == [[:IDENTIFIER, "a"], [":", ":"], [:NUMBER, "1"],
+    assert @lex.tokenize(code) == [[:IDENTIFIER, "a"], [:ASSIGN, ":"], [:NUMBER, "1"],
     ["\n", "\n"], [:COMMENT, [" comment", " on two lines"]], ["\n", "\n"],
-    [:IDENTIFIER, "b"], [":", ":"], [:NUMBER, "2"]]
+    [:IDENTIFIER, "b"], [:ASSIGN, ":"], [:NUMBER, "2"]]
   end
 
   def test_lexing
-    tokens = @lex.tokenize(File.read('test/fixtures/each.cs'))
+    tokens = @lex.tokenize(File.read('test/fixtures/each.coffee'))
     assert tokens.inspect == File.read('test/fixtures/each.tokens')
   end
 

test/unit/test_parser.rb

@@ -58,12 +58,12 @@ class ParserTest < Test::Unit::TestCase
   end
 
   def test_parsing_inner_comments
-    nodes = @par.parse(File.read('test/fixtures/inner_comments.cs'))
+    nodes = @par.parse(File.read('test/fixtures/inner_comments.coffee'))
     assert nodes.compile == File.read('test/fixtures/inner_comments.js')
   end
 
   def test_parsing
-    nodes = @par.parse(File.read('test/fixtures/each.cs'))
+    nodes = @par.parse(File.read('test/fixtures/each.coffee'))
     assign = nodes.expressions[1]
     assert assign.is_a? AssignNode
     assert assign.variable.literal == '_'
@@ -73,7 +73,7 @@ class ParserTest < Test::Unit::TestCase
   end
 
   def test_no_wrap
-    nodes = @par.parse(File.read('test/fixtures/each.cs'))
+    nodes = @par.parse(File.read('test/fixtures/each.coffee'))
     assert nodes.compile(:no_wrap => true) == File.read('test/fixtures/each_no_wrap.js')
   end