Merged

Author: Zdenko Vujasinovic

docs/v1/annotated-source/grammar.html

@@ -575,6 +575,7 @@ <h2 id="grammatical-rules">Grammatical Rules</h2>
 
             <div class="content"><div class='highlight'><pre>  Return: [
     o <span class="hljs-string">'RETURN Expression'</span>,                      <span class="hljs-function">-&gt;</span> <span class="hljs-keyword">new</span> Return $<span class="hljs-number">2</span>
+    o <span class="hljs-string">'RETURN INDENT Object OUTDENT'</span>,           <span class="hljs-function">-&gt;</span> <span class="hljs-keyword">new</span> Return <span class="hljs-keyword">new</span> Value $<span class="hljs-number">3</span>
     o <span class="hljs-string">'RETURN'</span>,                                 <span class="hljs-function">-&gt;</span> <span class="hljs-keyword">new</span> Return
   ]
 

docs/v1/annotated-source/lexer.html

@@ -755,7 +755,7 @@ <h2 id="tokenizers">Tokenizers</h2>
       <span class="hljs-keyword">return</span> indent.length
 
     <span class="hljs-keyword">if</span> size &gt; @indent
-      <span class="hljs-keyword">if</span> noNewlines <span class="hljs-keyword">or</span> @tag() <span class="hljs-keyword">is</span> <span class="hljs-string">'RETURN'</span>
+      <span class="hljs-keyword">if</span> noNewlines
         @indebt = size - @indent
         @suppressNewlines()
         <span class="hljs-keyword">return</span> indent.length
@@ -1555,9 +1555,7 @@ <h2 id="helpers">Helpers</h2>
 
             <div class="content"><div class='highlight'><pre>  unfinished: <span class="hljs-function">-&gt;</span>
     LINE_CONTINUER.test(@chunk) <span class="hljs-keyword">or</span>
-    @tag() <span class="hljs-keyword">in</span> [<span class="hljs-string">'\\'</span>, <span class="hljs-string">'.'</span>, <span class="hljs-string">'?.'</span>, <span class="hljs-string">'?::'</span>, <span class="hljs-string">'UNARY'</span>, <span class="hljs-string">'MATH'</span>, <span class="hljs-string">'UNARY_MATH'</span>, <span class="hljs-string">'+'</span>, <span class="hljs-string">'-'</span>,
-               <span class="hljs-string">'**'</span>, <span class="hljs-string">'SHIFT'</span>, <span class="hljs-string">'RELATION'</span>, <span class="hljs-string">'COMPARE'</span>, <span class="hljs-string">'&amp;'</span>, <span class="hljs-string">'^'</span>, <span class="hljs-string">'|'</span>, <span class="hljs-string">'&amp;&amp;'</span>, <span class="hljs-string">'||'</span>,
-               <span class="hljs-string">'BIN?'</span>, <span class="hljs-string">'THROW'</span>, <span class="hljs-string">'EXTENDS'</span>, <span class="hljs-string">'DEFAULT'</span>]
+    @tag() <span class="hljs-keyword">in</span> UNFINISHED
 
   formatString: <span class="hljs-function"><span class="hljs-params">(str, options)</span> -&gt;</span>
     @replaceUnicodeCodePointEscapes str.replace(STRING_OMIT, <span class="hljs-string">'$1'</span>), options
@@ -2315,6 +2313,23 @@ <h2 id="constants">Constants</h2>
 
         </li>
 
+        
+        <li id="section-94">
+            <div class="annotation">
+              
+              <div class="pilwrap ">
+                <a class="pilcrow" href="#section-94">&#182;</a>
+              </div>
+              <p>Tokens that, when appearing at the end of a line, suppress a following TERMINATOR/INDENT token</p>
+
+            </div>
+            
+            <div class="content"><div class='highlight'><pre>UNFINISHED = [<span class="hljs-string">'\\'</span>, <span class="hljs-string">'.'</span>, <span class="hljs-string">'?.'</span>, <span class="hljs-string">'?::'</span>, <span class="hljs-string">'UNARY'</span>, <span class="hljs-string">'MATH'</span>, <span class="hljs-string">'UNARY_MATH'</span>, <span class="hljs-string">'+'</span>, <span class="hljs-string">'-'</span>,
+           <span class="hljs-string">'**'</span>, <span class="hljs-string">'SHIFT'</span>, <span class="hljs-string">'RELATION'</span>, <span class="hljs-string">'COMPARE'</span>, <span class="hljs-string">'&amp;'</span>, <span class="hljs-string">'^'</span>, <span class="hljs-string">'|'</span>, <span class="hljs-string">'&amp;&amp;'</span>, <span class="hljs-string">'||'</span>,
+           <span class="hljs-string">'BIN?'</span>, <span class="hljs-string">'THROW'</span>, <span class="hljs-string">'EXTENDS'</span>, <span class="hljs-string">'DEFAULT'</span>]</pre></div></div>
+            
+        </li>
+        
     </ul>
   </div>
 </body>

docs/v1/annotated-source/repl.html

@@ -256,7 +256,7 @@ <h1>repl.coffee</h1>
             </div>
 
             <div class="content"><div class='highlight'><pre>      ast = <span class="hljs-keyword">new</span> Block [
-        <span class="hljs-keyword">new</span> Assign (<span class="hljs-keyword">new</span> Value <span class="hljs-keyword">new</span> Literal <span class="hljs-string">'_'</span>), ast, <span class="hljs-string">'='</span>
+        <span class="hljs-keyword">new</span> Assign (<span class="hljs-keyword">new</span> Value <span class="hljs-keyword">new</span> Literal <span class="hljs-string">'__'</span>), ast, <span class="hljs-string">'='</span>
       ]
       js = ast.compile {bare: <span class="hljs-literal">yes</span>, locals: Object.keys(context), referencedVars}
       cb <span class="hljs-literal">null</span>, runInContext js, context, filename

docs/v1/annotated-source/rewriter.html

@@ -476,7 +476,7 @@ <h1>rewriter.coffee</h1>
       <span class="hljs-title">startImplicitCall</span> = <span class="hljs-params">(j)</span> -&gt;</span>
         idx = j ? i
         stack.push [<span class="hljs-string">'('</span>, idx, ours: <span class="hljs-literal">yes</span>]
-        tokens.splice idx, <span class="hljs-number">0</span>, generate <span class="hljs-string">'CALL_START'</span>, <span class="hljs-string">'('</span>
+        tokens.splice idx, <span class="hljs-number">0</span>, generate <span class="hljs-string">'CALL_START'</span>, <span class="hljs-string">'('</span>, [<span class="hljs-string">''</span>, <span class="hljs-string">'implicit function call'</span>, token[<span class="hljs-number">2</span>]]
         i += <span class="hljs-number">1</span> <span class="hljs-keyword">if</span> <span class="hljs-keyword">not</span> j?
 <span class="hljs-function">
       <span class="hljs-title">endImplicitCall</span> = -&gt;</span>
@@ -752,8 +752,9 @@ <h1>rewriter.coffee</h1>
             </div>
 
             <div class="content"><div class='highlight'><pre>      <span class="hljs-keyword">if</span> tag <span class="hljs-keyword">in</span> LINEBREAKS
-        <span class="hljs-keyword">for</span> stackItem <span class="hljs-keyword">in</span> stack <span class="hljs-keyword">by</span> <span class="hljs-number">-1</span> <span class="hljs-keyword">when</span> isImplicitObject stackItem
-          stackItem[<span class="hljs-number">2</span>].sameLine = <span class="hljs-literal">no</span>
+        <span class="hljs-keyword">for</span> stackItem <span class="hljs-keyword">in</span> stack <span class="hljs-keyword">by</span> <span class="hljs-number">-1</span>
+          <span class="hljs-keyword">break</span> <span class="hljs-keyword">unless</span> isImplicit stackItem
+          stackItem[<span class="hljs-number">2</span>].sameLine = <span class="hljs-literal">no</span> <span class="hljs-keyword">if</span> isImplicitObject stackItem
 
       newLine = prevTag <span class="hljs-keyword">is</span> <span class="hljs-string">'OUTDENT'</span> <span class="hljs-keyword">or</span> prevToken.newLine
       <span class="hljs-keyword">if</span> tag <span class="hljs-keyword">in</span> IMPLICIT_END <span class="hljs-keyword">or</span> tag <span class="hljs-keyword">in</span> CALL_CLOSERS <span class="hljs-keyword">and</span> newLine