jashkenas · jashkenas · Sep 3, 2015 · Sep 3, 2015
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "coffee-script",
-  "version": "1.9.3",
+  "version": "1.10.0",
   "main": [
     "lib/coffee-script/coffee-script.js"
   ],

diff --git a/documentation/coffee/aliases.js b/documentation/coffee/aliases.js
diff --git a/documentation/coffee/array_comprehensions.js b/documentation/coffee/array_comprehensions.js
diff --git a/documentation/coffee/block_comment.js b/documentation/coffee/block_comment.js
diff --git a/documentation/coffee/cake_tasks.js b/documentation/coffee/cake_tasks.js
diff --git a/documentation/coffee/chaining.js b/documentation/coffee/chaining.js
diff --git a/documentation/coffee/classes.js b/documentation/coffee/classes.js
diff --git a/documentation/coffee/comparisons.js b/documentation/coffee/comparisons.js
diff --git a/documentation/coffee/conditionals.js b/documentation/coffee/conditionals.js
diff --git a/documentation/coffee/constructor_destructuring.js b/documentation/coffee/constructor_destructuring.js
diff --git a/documentation/coffee/default_args.js b/documentation/coffee/default_args.js
diff --git a/documentation/coffee/do.js b/documentation/coffee/do.js
diff --git a/documentation/coffee/embedded.js b/documentation/coffee/embedded.js
diff --git a/documentation/coffee/existence.js b/documentation/coffee/existence.js
diff --git a/documentation/coffee/expansion.js b/documentation/coffee/expansion.js
diff --git a/documentation/coffee/expressions.js b/documentation/coffee/expressions.js
diff --git a/documentation/coffee/expressions_assignment.js b/documentation/coffee/expressions_assignment.js
diff --git a/documentation/coffee/expressions_comprehension.js b/documentation/coffee/expressions_comprehension.js
diff --git a/documentation/coffee/expressions_try.js b/documentation/coffee/expressions_try.js
diff --git a/documentation/coffee/fat_arrow.js b/documentation/coffee/fat_arrow.js
diff --git a/documentation/coffee/functions.js b/documentation/coffee/functions.js
diff --git a/documentation/coffee/generators.js b/documentation/coffee/generators.js
diff --git a/documentation/coffee/heredocs.js b/documentation/coffee/heredocs.js
diff --git a/documentation/coffee/heregexes.js b/documentation/coffee/heregexes.js
diff --git a/documentation/coffee/interpolation.js b/documentation/coffee/interpolation.js
diff --git a/documentation/coffee/modulo.js b/documentation/coffee/modulo.js
diff --git a/documentation/coffee/multiple_return_values.js b/documentation/coffee/multiple_return_values.js
diff --git a/documentation/coffee/object_comprehensions.js b/documentation/coffee/object_comprehensions.js
diff --git a/documentation/coffee/object_extraction.js b/documentation/coffee/object_extraction.js
diff --git a/documentation/coffee/objects_and_arrays.js b/documentation/coffee/objects_and_arrays.js
diff --git a/documentation/coffee/objects_reserved.js b/documentation/coffee/objects_reserved.js
diff --git a/documentation/coffee/overview.js b/documentation/coffee/overview.js
diff --git a/documentation/coffee/parallel_assignment.js b/documentation/coffee/parallel_assignment.js
diff --git a/documentation/coffee/patterns_and_splats.js b/documentation/coffee/patterns_and_splats.js
diff --git a/documentation/coffee/prototypes.js b/documentation/coffee/prototypes.js
diff --git a/documentation/coffee/range_comprehensions.js b/documentation/coffee/range_comprehensions.js
diff --git a/documentation/coffee/scope.js b/documentation/coffee/scope.js
diff --git a/documentation/coffee/slices.js b/documentation/coffee/slices.js
diff --git a/documentation/coffee/soaks.js b/documentation/coffee/soaks.js
diff --git a/documentation/coffee/splats.js b/documentation/coffee/splats.js
diff --git a/documentation/coffee/splices.js b/documentation/coffee/splices.js
diff --git a/documentation/coffee/strings.js b/documentation/coffee/strings.js
diff --git a/documentation/coffee/switch.js b/documentation/coffee/switch.js
diff --git a/documentation/coffee/switch_with_no_expression.js b/documentation/coffee/switch_with_no_expression.js
diff --git a/documentation/coffee/try.js b/documentation/coffee/try.js
diff --git a/documentation/coffee/while.js b/documentation/coffee/while.js
diff --git a/documentation/docs/coffee-script.html b/documentation/docs/coffee-script.html
@@ -144,7 +144,7 @@ <h1>coffee-script.coffee</h1>
 
             </div>
 
-            <div class="content"><div class='highlight'><pre><span class="hljs-built_in">exports</span>.VERSION = <span class="hljs-string">'1.9.3'</span>
+            <div class="content"><div class='highlight'><pre><span class="hljs-built_in">exports</span>.VERSION = <span class="hljs-string">'1.10.0'</span>
 
 <span class="hljs-built_in">exports</span>.FILE_EXTENSIONS = [<span class="hljs-string">'.coffee'</span>, <span class="hljs-string">'.litcoffee'</span>, <span class="hljs-string">'.coffee.md'</span>]</pre></div></div>
 
@@ -482,7 +482,8 @@ <h1>coffee-script.coffee</h1>
       sandbox.<span class="hljs-built_in">module</span>  = _module  = <span class="hljs-keyword">new</span> Module(options.modulename || <span class="hljs-string">'eval'</span>)
       sandbox.<span class="hljs-built_in">require</span> = <span class="hljs-function"><span class="hljs-title">_require</span> = <span class="hljs-params">(path)</span> -&gt;</span>  Module._load path, _module, <span class="hljs-literal">true</span>
       _module.filename = sandbox.__filename
-      _require[r] = <span class="hljs-built_in">require</span>[r] <span class="hljs-keyword">for</span> r <span class="hljs-keyword">in</span> Object.getOwnPropertyNames <span class="hljs-built_in">require</span> <span class="hljs-keyword">when</span> r <span class="hljs-keyword">isnt</span> <span class="hljs-string">'paths'</span></pre></div></div>
+      <span class="hljs-keyword">for</span> r <span class="hljs-keyword">in</span> Object.getOwnPropertyNames <span class="hljs-built_in">require</span> <span class="hljs-keyword">when</span> r <span class="hljs-keyword">not</span> <span class="hljs-keyword">in</span> [<span class="hljs-string">'paths'</span>, <span class="hljs-string">'arguments'</span>, <span class="hljs-string">'caller'</span>]
+        _require[r] = <span class="hljs-built_in">require</span>[r]</pre></div></div>
 
         </li>
 

diff --git a/documentation/docs/grammar.html b/documentation/docs/grammar.html
@@ -532,16 +532,27 @@ <h2 id="grammatical-rules">Grammatical Rules</h2>
 
             <div class="content"><div class='highlight'><pre>  <span class="hljs-attribute">AssignObj</span>: [
     o <span class="hljs-string">'ObjAssignable'</span>,<span class="hljs-function">                          -&gt;</span> <span class="hljs-keyword">new</span> Value $<span class="hljs-number">1</span>
-    o <span class="hljs-string">'ObjAssignable : Expression'</span>,<span class="hljs-function">             -&gt;</span> <span class="hljs-keyword">new</span> Assign LOC(<span class="hljs-number">1</span>)(<span class="hljs-keyword">new</span> Value($<span class="hljs-number">1</span>)), $<span class="hljs-number">3</span>, <span class="hljs-string">'object'</span>
+    o <span class="hljs-string">'ObjAssignable : Expression'</span>,<span class="hljs-function">             -&gt;</span> <span class="hljs-keyword">new</span> Assign LOC(<span class="hljs-number">1</span>)(<span class="hljs-keyword">new</span> Value $<span class="hljs-number">1</span>), $<span class="hljs-number">3</span>, <span class="hljs-string">'object'</span>,
+                                                              <span class="hljs-attribute">operatorToken</span>: LOC(<span class="hljs-number">2</span>)(<span class="hljs-keyword">new</span> Literal $<span class="hljs-number">2</span>)
     o <span class="hljs-string">'ObjAssignable :
-       INDENT Expression OUTDENT'</span>,<span class="hljs-function">              -&gt;</span> <span class="hljs-keyword">new</span> Assign LOC(<span class="hljs-number">1</span>)(<span class="hljs-keyword">new</span> Value($<span class="hljs-number">1</span>)), $<span class="hljs-number">4</span>, <span class="hljs-string">'object'</span>
+       INDENT Expression OUTDENT'</span>,<span class="hljs-function">              -&gt;</span> <span class="hljs-keyword">new</span> Assign LOC(<span class="hljs-number">1</span>)(<span class="hljs-keyword">new</span> Value $<span class="hljs-number">1</span>), $<span class="hljs-number">4</span>, <span class="hljs-string">'object'</span>,
+                                                              <span class="hljs-attribute">operatorToken</span>: LOC(<span class="hljs-number">2</span>)(<span class="hljs-keyword">new</span> Literal $<span class="hljs-number">2</span>)
+    o <span class="hljs-string">'SimpleObjAssignable = Expression'</span>,<span class="hljs-function">       -&gt;</span> <span class="hljs-keyword">new</span> Assign LOC(<span class="hljs-number">1</span>)(<span class="hljs-keyword">new</span> Value $<span class="hljs-number">1</span>), $<span class="hljs-number">3</span>, <span class="hljs-literal">null</span>,
+                                                              <span class="hljs-attribute">operatorToken</span>: LOC(<span class="hljs-number">2</span>)(<span class="hljs-keyword">new</span> Literal $<span class="hljs-number">2</span>)
+    o <span class="hljs-string">'SimpleObjAssignable =
+       INDENT Expression OUTDENT'</span>,<span class="hljs-function">              -&gt;</span> <span class="hljs-keyword">new</span> Assign LOC(<span class="hljs-number">1</span>)(<span class="hljs-keyword">new</span> Value $<span class="hljs-number">1</span>), $<span class="hljs-number">4</span>, <span class="hljs-literal">null</span>,
+                                                              <span class="hljs-attribute">operatorToken</span>: LOC(<span class="hljs-number">2</span>)(<span class="hljs-keyword">new</span> Literal $<span class="hljs-number">2</span>)
     o <span class="hljs-string">'Comment'</span>
   ]
 
-  <span class="hljs-attribute">ObjAssignable</span>: [
+  <span class="hljs-attribute">SimpleObjAssignable</span>: [
     o <span class="hljs-string">'Identifier'</span>
-    o <span class="hljs-string">'AlphaNumeric'</span>
     o <span class="hljs-string">'ThisProperty'</span>
+  ]
+
+  <span class="hljs-attribute">ObjAssignable</span>: [
+    o <span class="hljs-string">'SimpleObjAssignable'</span>
+    o <span class="hljs-string">'AlphaNumeric'</span>
   ]</pre></div></div>
 
         </li>

diff --git a/documentation/docs/helpers.html b/documentation/docs/helpers.html
@@ -277,7 +277,7 @@ <h1>helpers.coffee</h1>
             <div class="content"><div class='highlight'><pre><span class="hljs-built_in">exports</span>.flatten = <span class="hljs-function"><span class="hljs-title">flatten</span> = <span class="hljs-params">(array)</span> -&gt;</span>
   flattened = []
   <span class="hljs-keyword">for</span> element <span class="hljs-keyword">in</span> array
-    <span class="hljs-keyword">if</span> element <span class="hljs-keyword">instanceof</span> Array
+    <span class="hljs-keyword">if</span> <span class="hljs-string">'[object Array]'</span> <span class="hljs-keyword">is</span> <span class="hljs-attribute">Object</span>::toString.call element
       flattened = flattened.concat flatten element
     <span class="hljs-keyword">else</span>
       flattened.push element

diff --git a/documentation/docs/lexer.html b/documentation/docs/lexer.html
@@ -216,6 +216,7 @@ <h2 id="the-lexer-class">The Lexer Class</h2>
     <span class="hljs-property">@indents</span>    = []             <span class="hljs-comment"># The stack of all current indentation levels.</span>
     <span class="hljs-property">@ends</span>       = []             <span class="hljs-comment"># The stack for pairing up tokens.</span>
     <span class="hljs-property">@tokens</span>     = []             <span class="hljs-comment"># Stream of parsed tokens in the form `['TYPE', value, location data]`.</span>
+    <span class="hljs-property">@seenFor</span>    = <span class="hljs-literal">no</span>             <span class="hljs-comment"># Used to recognize FORIN and FOROF tokens.</span>
 
     <span class="hljs-property">@chunkLine</span> =
       opts.line <span class="hljs-keyword">or</span> <span class="hljs-number">0</span>         <span class="hljs-comment"># The start line for the current @chunk.</span>