CoffeeScript 1.11.1

jashkenas · Oct 1, 2016 · 8623792 · 8623792
1 parent 809634b
commit 8623792
Show file tree

Hide file tree

Showing 70 changed files with 125 additions and 97 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "coffee-script",
-  "version": "1.11.0",
+  "version": "1.11.1",
   "main": [
     "lib/coffee-script/coffee-script.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>exports.VERSION = <span class="hljs-string">'1.11.0'</span>
+            <div class="content"><div class='highlight'><pre>exports.VERSION = <span class="hljs-string">'1.11.1'</span>
 
 exports.FILE_EXTENSIONS = [<span class="hljs-string">'.coffee'</span>, <span class="hljs-string">'.litcoffee'</span>, <span class="hljs-string">'.coffee.md'</span>]</pre></div></div>
 

diff --git a/documentation/docs/lexer.html b/documentation/docs/lexer.html
@@ -459,25 +459,30 @@ <h2 id="tokenizers">Tokenizers</h2>
 
             <div class="content"><div class='highlight'><pre>  numberToken: <span class="hljs-function">-&gt;</span>
     <span class="hljs-keyword">return</span> <span class="hljs-number">0</span> <span class="hljs-keyword">unless</span> match = NUMBER.exec @chunk
+
     number = match[<span class="hljs-number">0</span>]
     lexedLength = number.length
-    <span class="hljs-keyword">if</span> <span class="hljs-regexp">/^0[BOX]/</span>.test number
-      @error <span class="hljs-string">"radix prefix in '<span class="hljs-subst">#{number}</span>' must be lowercase"</span>, offset: <span class="hljs-number">1</span>
-    <span class="hljs-keyword">else</span> <span class="hljs-keyword">if</span> <span class="hljs-regexp">/E/</span>.test(number) <span class="hljs-keyword">and</span> <span class="hljs-keyword">not</span> <span class="hljs-regexp">/^0x/</span>.test number
-      @error <span class="hljs-string">"exponential notation in '<span class="hljs-subst">#{number}</span>' must be indicated with a lowercase 'e'"</span>,
-        offset: number.indexOf(<span class="hljs-string">'E'</span>)
-    <span class="hljs-keyword">else</span> <span class="hljs-keyword">if</span> <span class="hljs-regexp">/^0\d*[89]/</span>.test number
-      @error <span class="hljs-string">"decimal literal '<span class="hljs-subst">#{number}</span>' must not be prefixed with '0'"</span>, length: lexedLength
-    <span class="hljs-keyword">else</span> <span class="hljs-keyword">if</span> <span class="hljs-regexp">/^0\d+/</span>.test number
-      @error <span class="hljs-string">"octal literal '<span class="hljs-subst">#{number}</span>' must be prefixed with '0o'"</span>, length: lexedLength
-    <span class="hljs-keyword">if</span> octalLiteral = <span class="hljs-regexp">/^0o([0-7]+)/</span>.exec number
-      numberValue = parseInt(octalLiteral[<span class="hljs-number">1</span>], <span class="hljs-number">8</span>)
-      number = <span class="hljs-string">"0x<span class="hljs-subst">#{numberValue.toString <span class="hljs-number">16</span>}</span>"</span>
-    <span class="hljs-keyword">else</span> <span class="hljs-keyword">if</span> binaryLiteral = <span class="hljs-regexp">/^0b([01]+)/</span>.exec number
-      numberValue = parseInt(binaryLiteral[<span class="hljs-number">1</span>], <span class="hljs-number">2</span>)
+
+    <span class="hljs-keyword">switch</span>
+      <span class="hljs-keyword">when</span> <span class="hljs-regexp">/^0[BOX]/</span>.test number
+        @error <span class="hljs-string">"radix prefix in '<span class="hljs-subst">#{number}</span>' must be lowercase"</span>, offset: <span class="hljs-number">1</span>
+      <span class="hljs-keyword">when</span> <span class="hljs-regexp">/^(?!0x).*E/</span>.test number
+        @error <span class="hljs-string">"exponential notation in '<span class="hljs-subst">#{number}</span>' must be indicated with a lowercase 'e'"</span>,
+          offset: number.indexOf(<span class="hljs-string">'E'</span>)
+      <span class="hljs-keyword">when</span> <span class="hljs-regexp">/^0\d*[89]/</span>.test number
+        @error <span class="hljs-string">"decimal literal '<span class="hljs-subst">#{number}</span>' must not be prefixed with '0'"</span>, length: lexedLength
+      <span class="hljs-keyword">when</span> <span class="hljs-regexp">/^0\d+/</span>.test number
+        @error <span class="hljs-string">"octal literal '<span class="hljs-subst">#{number}</span>' must be prefixed with '0o'"</span>, length: lexedLength
+
+    base = <span class="hljs-keyword">switch</span> number.charAt <span class="hljs-number">1</span>
+      <span class="hljs-keyword">when</span> <span class="hljs-string">'b'</span> <span class="hljs-keyword">then</span> <span class="hljs-number">2</span>
+      <span class="hljs-keyword">when</span> <span class="hljs-string">'o'</span> <span class="hljs-keyword">then</span> <span class="hljs-number">8</span>
+      <span class="hljs-keyword">when</span> <span class="hljs-string">'x'</span> <span class="hljs-keyword">then</span> <span class="hljs-number">16</span>
+      <span class="hljs-keyword">else</span> <span class="hljs-literal">null</span>
+    numberValue = <span class="hljs-keyword">if</span> base? <span class="hljs-keyword">then</span> parseInt(number[<span class="hljs-number">2.</span>.], base) <span class="hljs-keyword">else</span> parseFloat(number)
+    <span class="hljs-keyword">if</span> number.charAt(<span class="hljs-number">1</span>) <span class="hljs-keyword">in</span> [<span class="hljs-string">'b'</span>, <span class="hljs-string">'o'</span>]
       number = <span class="hljs-string">"0x<span class="hljs-subst">#{numberValue.toString <span class="hljs-number">16</span>}</span>"</span>
-    <span class="hljs-keyword">else</span>
-      numberValue = parseFloat(number)
+
     tag = <span class="hljs-keyword">if</span> numberValue <span class="hljs-keyword">is</span> Infinity <span class="hljs-keyword">then</span> <span class="hljs-string">'INFINITY'</span> <span class="hljs-keyword">else</span> <span class="hljs-string">'NUMBER'</span>
     @token tag, number, <span class="hljs-number">0</span>, lexedLength
     lexedLength</pre></div></div>
@@ -548,12 +553,12 @@ <h2 id="tokenizers">Tokenizers</h2>
       <span class="hljs-keyword">while</span> match = HEREDOC_INDENT.exec doc
         attempt = match[<span class="hljs-number">1</span>]
         indent = attempt <span class="hljs-keyword">if</span> indent <span class="hljs-keyword">is</span> <span class="hljs-literal">null</span> <span class="hljs-keyword">or</span> <span class="hljs-number">0</span> &lt; attempt.length &lt; indent.length
-      indentRegex = <span class="hljs-regexp">/// ^<span class="hljs-subst">#{indent}</span> ///</span>gm <span class="hljs-keyword">if</span> indent
+      indentRegex = <span class="hljs-regexp">/// \n<span class="hljs-subst">#{indent}</span> ///</span>g <span class="hljs-keyword">if</span> indent
       @mergeInterpolationTokens tokens, {delimiter}, <span class="hljs-function"><span class="hljs-params">(value, i)</span> =&gt;</span>
         value = @formatString value
+        value = value.replace indentRegex, <span class="hljs-string">'\n'</span> <span class="hljs-keyword">if</span> indentRegex
         value = value.replace LEADING_BLANK_LINE,  <span class="hljs-string">''</span> <span class="hljs-keyword">if</span> i <span class="hljs-keyword">is</span> <span class="hljs-number">0</span>
         value = value.replace TRAILING_BLANK_LINE, <span class="hljs-string">''</span> <span class="hljs-keyword">if</span> i <span class="hljs-keyword">is</span> $
-        value = value.replace indentRegex, <span class="hljs-string">''</span> <span class="hljs-keyword">if</span> indentRegex
         value
     <span class="hljs-keyword">else</span>
       @mergeInterpolationTokens tokens, {delimiter}, <span class="hljs-function"><span class="hljs-params">(value, i)</span> =&gt;</span>

diff --git a/documentation/docs/nodes.html b/documentation/docs/nodes.html
@@ -1757,7 +1757,6 @@ <h3 id="access">Access</h3>
 
             <div class="content"><div class='highlight'><pre>exports.Access = <span class="hljs-class"><span class="hljs-keyword">class</span> <span class="hljs-title">Access</span> <span class="hljs-keyword">extends</span> <span class="hljs-title">Base</span></span>
   constructor: <span class="hljs-function"><span class="hljs-params">(@name, tag)</span> -&gt;</span>
-    @name.asKey = <span class="hljs-literal">yes</span>
     @soak  = tag <span class="hljs-keyword">is</span> <span class="hljs-string">'soak'</span>
 
   children: [<span class="hljs-string">'name'</span>]
@@ -2162,13 +2161,13 @@ <h3 id="obj">Obj</h3>
         <span class="hljs-keyword">if</span> i &lt; dynamicIndex
           <span class="hljs-keyword">if</span> prop <span class="hljs-keyword">not</span> <span class="hljs-keyword">instanceof</span> Assign
             prop = <span class="hljs-keyword">new</span> Assign prop, prop, <span class="hljs-string">'object'</span>
-          (prop.variable.base <span class="hljs-keyword">or</span> prop.variable).asKey = <span class="hljs-literal">yes</span>
         <span class="hljs-keyword">else</span>
           <span class="hljs-keyword">if</span> prop <span class="hljs-keyword">instanceof</span> Assign
             key = prop.variable
             value = prop.value
           <span class="hljs-keyword">else</span>
             [key, value] = prop.base.cache o
+            key = <span class="hljs-keyword">new</span> PropertyName key.value <span class="hljs-keyword">if</span> key <span class="hljs-keyword">instanceof</span> IdentifierLiteral
           prop = <span class="hljs-keyword">new</span> Assign (<span class="hljs-keyword">new</span> Value (<span class="hljs-keyword">new</span> IdentifierLiteral oref), [<span class="hljs-keyword">new</span> Access key]), value
       <span class="hljs-keyword">if</span> indent <span class="hljs-keyword">then</span> answer.push @makeCode indent
       answer.push prop.compileToFragments(o, LEVEL_TOP)...
@@ -4974,10 +4973,10 @@ <h2 id="helper-functions">Helper Functions</h2>
   code.replace <span class="hljs-regexp">/\s+$/</span>, <span class="hljs-string">''</span>
 <span class="hljs-function">
 <span class="hljs-title">isLiteralArguments</span> = <span class="hljs-params">(node)</span> -&gt;</span>
-  node <span class="hljs-keyword">instanceof</span> Literal <span class="hljs-keyword">and</span> node.value <span class="hljs-keyword">is</span> <span class="hljs-string">'arguments'</span> <span class="hljs-keyword">and</span> <span class="hljs-keyword">not</span> node.asKey
+  node <span class="hljs-keyword">instanceof</span> IdentifierLiteral <span class="hljs-keyword">and</span> node.value <span class="hljs-keyword">is</span> <span class="hljs-string">'arguments'</span>
 <span class="hljs-function">
 <span class="hljs-title">isLiteralThis</span> = <span class="hljs-params">(node)</span> -&gt;</span>
-  (node <span class="hljs-keyword">instanceof</span> ThisLiteral <span class="hljs-keyword">and</span> <span class="hljs-keyword">not</span> node.asKey) <span class="hljs-keyword">or</span>
+  node <span class="hljs-keyword">instanceof</span> ThisLiteral <span class="hljs-keyword">or</span>
     (node <span class="hljs-keyword">instanceof</span> Code <span class="hljs-keyword">and</span> node.bound) <span class="hljs-keyword">or</span>
     node <span class="hljs-keyword">instanceof</span> SuperCall
 <span class="hljs-function">

diff --git a/documentation/index.html.js b/documentation/index.html.js
@@ -112,7 +112,7 @@
 
     <p>
       <b>Latest Version:</b>
-      <a href="http://github.com/jashkenas/coffeescript/tarball/1.11.0">1.11.0</a>
+      <a href="http://github.com/jashkenas/coffeescript/tarball/1.11.1">1.11.1</a>
     </p>
 
     <pre>npm install -g coffee-script</pre>

diff --git a/documentation/js/aliases.js b/documentation/js/aliases.js
diff --git a/documentation/js/array_comprehensions.js b/documentation/js/array_comprehensions.js
diff --git a/documentation/js/block_comment.js b/documentation/js/block_comment.js
diff --git a/documentation/js/cake_tasks.js b/documentation/js/cake_tasks.js
diff --git a/documentation/js/chaining.js b/documentation/js/chaining.js
diff --git a/documentation/js/classes.js b/documentation/js/classes.js
diff --git a/documentation/js/comparisons.js b/documentation/js/comparisons.js
diff --git a/documentation/js/conditionals.js b/documentation/js/conditionals.js
diff --git a/documentation/js/constructor_destructuring.js b/documentation/js/constructor_destructuring.js
diff --git a/documentation/js/default_args.js b/documentation/js/default_args.js
diff --git a/documentation/js/do.js b/documentation/js/do.js
diff --git a/documentation/js/embedded.js b/documentation/js/embedded.js
diff --git a/documentation/js/existence.js b/documentation/js/existence.js
diff --git a/documentation/js/expansion.js b/documentation/js/expansion.js
diff --git a/documentation/js/expressions.js b/documentation/js/expressions.js
diff --git a/documentation/js/expressions_assignment.js b/documentation/js/expressions_assignment.js
diff --git a/documentation/js/expressions_comprehension.js b/documentation/js/expressions_comprehension.js
diff --git a/documentation/js/expressions_try.js b/documentation/js/expressions_try.js
diff --git a/documentation/js/fat_arrow.js b/documentation/js/fat_arrow.js
diff --git a/documentation/js/functions.js b/documentation/js/functions.js
diff --git a/documentation/js/generators.js b/documentation/js/generators.js
diff --git a/documentation/js/heredocs.js b/documentation/js/heredocs.js
diff --git a/documentation/js/heregexes.js b/documentation/js/heregexes.js
diff --git a/documentation/js/interpolation.js b/documentation/js/interpolation.js
diff --git a/documentation/js/modules.js b/documentation/js/modules.js
diff --git a/documentation/js/modulo.js b/documentation/js/modulo.js
diff --git a/documentation/js/multiple_return_values.js b/documentation/js/multiple_return_values.js
diff --git a/documentation/js/object_comprehensions.js b/documentation/js/object_comprehensions.js
diff --git a/documentation/js/object_extraction.js b/documentation/js/object_extraction.js
diff --git a/documentation/js/objects_and_arrays.js b/documentation/js/objects_and_arrays.js
diff --git a/documentation/js/objects_reserved.js b/documentation/js/objects_reserved.js
diff --git a/documentation/js/overview.js b/documentation/js/overview.js
diff --git a/documentation/js/parallel_assignment.js b/documentation/js/parallel_assignment.js
diff --git a/documentation/js/patterns_and_splats.js b/documentation/js/patterns_and_splats.js
diff --git a/documentation/js/prototypes.js b/documentation/js/prototypes.js
diff --git a/documentation/js/range_comprehensions.js b/documentation/js/range_comprehensions.js
diff --git a/documentation/js/scope.js b/documentation/js/scope.js
diff --git a/documentation/js/slices.js b/documentation/js/slices.js
diff --git a/documentation/js/soaks.js b/documentation/js/soaks.js
diff --git a/documentation/js/splats.js b/documentation/js/splats.js
diff --git a/documentation/js/splices.js b/documentation/js/splices.js
diff --git a/documentation/js/strings.js b/documentation/js/strings.js
diff --git a/documentation/js/switch.js b/documentation/js/switch.js
diff --git a/documentation/js/switch_with_no_expression.js b/documentation/js/switch_with_no_expression.js
diff --git a/documentation/js/try.js b/documentation/js/try.js
diff --git a/documentation/js/while.js b/documentation/js/while.js
-Original file line number
+Diff line change
@@ Expand Up / @@ -144,7 +144,7 @@ <h1>coffee-script.coffee</h1> @@
                 </div>
-                <div class="content"><div class='highlight'><pre>exports.VERSION = <span class="hljs-string">'1.11.0'</span>
+                <div class="content"><div class='highlight'><pre>exports.VERSION = <span class="hljs-string">'1.11.1'</span>
     exports.FILE_EXTENSIONS = [<span class="hljs-string">'.coffee'</span>, <span class="hljs-string">'.litcoffee'</span>, <span class="hljs-string">'.coffee.md'</span>]</pre></div></div>
@@ Expand Down @@