Skip to content

2.1.0 #4823

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Dec 11, 2017
Merged

2.1.0 #4823

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c544394
Changelog for 2.1.0; remove text from objects section that is no long…
GeoffreyBooth Dec 9, 2017
ecad09d
Update packages
GeoffreyBooth Dec 9, 2017
7dd20f9
2.1.0 build
GeoffreyBooth Dec 9, 2017
e80b6a9
Merge commit 'b1286752b9f6ccfba9c9c9f05b0e3d52aad835c2' into 2.1.0
GeoffreyBooth Dec 10, 2017
ffd966f
Update output
GeoffreyBooth Dec 10, 2017
97d6ef4
Correct reference to `//` division, per https://github.com/coffeescri…
GeoffreyBooth Dec 11, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
136 changes: 89 additions & 47 deletions docs/v2/annotated-source/grammar.html
View file
Open in desktop

Large diffs are not rendered by default.

168 changes: 132 additions & 36 deletions docs/v2/annotated-source/lexer.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1121,7 +1121,7 @@ <h2 id="tokenizers">Tokenizers</h2>

<div class="content"><div class='highlight'><pre> prevChar = <span class="hljs-keyword">if</span> @tokens.length &gt; <span class="hljs-number">0</span> <span class="hljs-keyword">then</span> @tokens[@tokens.length - <span class="hljs-number">1</span>][<span class="hljs-number">0</span>] <span class="hljs-keyword">else</span> <span class="hljs-string">''</span>
<span class="hljs-keyword">if</span> firstChar <span class="hljs-keyword">is</span> <span class="hljs-string">'&lt;'</span>
match = CSX_IDENTIFIER.exec @chunk[<span class="hljs-number">1.</span>..]
match = CSX_IDENTIFIER.exec(@chunk[<span class="hljs-number">1.</span>..]) <span class="hljs-keyword">or</span> CSX_FRAGMENT_IDENTIFIER.exec(@chunk[<span class="hljs-number">1.</span>..])
<span class="hljs-keyword">return</span> <span class="hljs-number">0</span> <span class="hljs-keyword">unless</span> match <span class="hljs-keyword">and</span> (
@csxDepth &gt; <span class="hljs-number">0</span> <span class="hljs-keyword">or</span></pre></div></div>

Expand Down Expand Up @@ -1187,8 +1187,8 @@ <h2 id="tokenizers">Tokenizers</h2>
@matchWithInterpolations INSIDE_CSX, <span class="hljs-string">'&gt;'</span>, <span class="hljs-string">'&lt;/'</span>, CSX_INTERPOLATION
@mergeInterpolationTokens tokens, {delimiter: <span class="hljs-string">'"'</span>}, <span class="hljs-function"><span class="hljs-params">(value, i)</span> =&gt;</span>
@formatString value, delimiter: <span class="hljs-string">'&gt;'</span>
match = CSX_IDENTIFIER.exec @chunk[end...]
<span class="hljs-keyword">if</span> <span class="hljs-keyword">not</span> match <span class="hljs-keyword">or</span> match[<span class="hljs-number">0</span>] <span class="hljs-keyword">isnt</span> csxTag.name
match = CSX_IDENTIFIER.exec(@chunk[end...]) <span class="hljs-keyword">or</span> CSX_FRAGMENT_IDENTIFIER.exec(@chunk[end...])
<span class="hljs-keyword">if</span> <span class="hljs-keyword">not</span> match <span class="hljs-keyword">or</span> match[<span class="hljs-number">1</span>] <span class="hljs-keyword">isnt</span> csxTag.name
@error <span class="hljs-string">"expected corresponding CSX closing tag for <span class="hljs-subst">#{csxTag.name}</span>"</span>,
csxTag.origin[<span class="hljs-number">2</span>]
afterTag = end + csxTag.name.length
Expand Down Expand Up @@ -2458,6 +2458,23 @@ <h2 id="constants">Constants</h2>
CSX_IDENTIFIER = <span class="hljs-regexp">/// ^
(?![\d&lt;]) <span class="hljs-comment"># Must not start with `&lt;`.</span>
( (?: (?!\s)[\.\-$\w\x7f-\uffff] )+ ) <span class="hljs-comment"># Like `IDENTIFIER`, but includes `-`s and `.`s.</span>
///</span></pre></div></div>

</li>


<li id="section-98">
<div class="annotation">

<div class="pilwrap ">
<a class="pilcrow" href="#section-98">&#182;</a>
</div>
<p>Fragment: &lt;&gt;&lt;/&gt;</p>

</div>

<div class="content"><div class='highlight'><pre>CSX_FRAGMENT_IDENTIFIER = <span class="hljs-regexp">/// ^
()&gt; <span class="hljs-comment"># Ends immediately with `&gt;`.</span>
///</span>

CSX_ATTRIBUTE = <span class="hljs-regexp">/// ^
Expand Down Expand Up @@ -2497,11 +2514,11 @@ <h2 id="constants">Constants</h2>
</li>


<li id="section-98">
<li id="section-99">
<div class="annotation">

<div class="pilwrap ">
<a class="pilcrow" href="#section-98">&#182;</a>
<a class="pilcrow" href="#section-99">&#182;</a>
</div>
<p>String-matching-regexes.</p>

Expand Down Expand Up @@ -2535,11 +2552,11 @@ <h2 id="constants">Constants</h2>
</li>


<li id="section-99">
<li id="section-100">
<div class="annotation">

<div class="pilwrap ">
<a class="pilcrow" href="#section-99">&#182;</a>
<a class="pilcrow" href="#section-100">&#182;</a>
</div>
<p>Regex-matching-regexes.</p>

Expand All @@ -2558,7 +2575,86 @@ <h2 id="constants">Constants</h2>
REGEX_FLAGS = <span class="hljs-regexp">/^\w*/</span>
VALID_FLAGS = <span class="hljs-regexp">/^(?!.*(.).*\1)[imguy]*$/</span>

HEREGEX = <span class="hljs-regexp">/// ^(?: [^\\/<span class="hljs-comment">#] | \\[\s\S] | /(?!//) | \#(?!\{) )* ///</span>
HEREGEX = <span class="hljs-regexp">/// ^
(?:
</span></pre></div></div>

</li>


<li id="section-101">
<div class="annotation">

<div class="pilwrap ">
<a class="pilcrow" href="#section-101">&#182;</a>
</div>
<p>Match any character, except those that need special handling below.</p>

</div>

<div class="content"><div class='highlight'><pre> [^\\/<span class="hljs-comment">#\s]</span></pre></div></div>

</li>


<li id="section-102">
<div class="annotation">

<div class="pilwrap ">
<a class="pilcrow" href="#section-102">&#182;</a>
</div>
<p>Match <code>\</code> followed by any character.</p>

</div>

<div class="content"><div class='highlight'><pre> | \\[\s\S]</pre></div></div>

</li>


<li id="section-103">
<div class="annotation">

<div class="pilwrap ">
<a class="pilcrow" href="#section-103">&#182;</a>
</div>
<p>Match any <code>/</code> except <code>///</code>.</p>

</div>

<div class="content"><div class='highlight'><pre> | <span class="hljs-regexp">/(?!/</span>/)</pre></div></div>

</li>


<li id="section-104">
<div class="annotation">

<div class="pilwrap ">
<a class="pilcrow" href="#section-104">&#182;</a>
</div>
<p>Match <code>#</code> which is not part of interpolation, e.g. <code>#{}</code>.</p>

</div>

<div class="content"><div class='highlight'><pre> | \<span class="hljs-comment">#(?!\{)</span></pre></div></div>

</li>


<li id="section-105">
<div class="annotation">

<div class="pilwrap ">
<a class="pilcrow" href="#section-105">&#182;</a>
</div>
<p>Comments consume everything until the end of the line, including <code>///</code>.</p>

</div>

<div class="content"><div class='highlight'><pre> | \s+(?:<span class="hljs-comment">#(?!\{).*)?</span>
)*
<span class="hljs-regexp">///

HEREGEX_OMIT = ///</span>
((?:\\\\)+) <span class="hljs-comment"># Consume (and preserve) an even number of backslashes.</span>
Expand All @@ -2573,11 +2669,11 @@ <h2 id="constants">Constants</h2>
</li>


<li id="section-100">
<li id="section-106">
<div class="annotation">

<div class="pilwrap ">
<a class="pilcrow" href="#section-100">&#182;</a>
<a class="pilcrow" href="#section-106">&#182;</a>
</div>
<p>Other regexes.</p>

Expand Down Expand Up @@ -2620,11 +2716,11 @@ <h2 id="constants">Constants</h2>
</li>


<li id="section-101">
<li id="section-107">
<div class="annotation">

<div class="pilwrap ">
<a class="pilcrow" href="#section-101">&#182;</a>
<a class="pilcrow" href="#section-107">&#182;</a>
</div>
<p>Compound assignment tokens.</p>

Expand All @@ -2638,11 +2734,11 @@ <h2 id="constants">Constants</h2>
</li>


<li id="section-102">
<li id="section-108">
<div class="annotation">

<div class="pilwrap ">
<a class="pilcrow" href="#section-102">&#182;</a>
<a class="pilcrow" href="#section-108">&#182;</a>
</div>
<p>Unary tokens.</p>

Expand All @@ -2655,11 +2751,11 @@ <h2 id="constants">Constants</h2>
</li>


<li id="section-103">
<li id="section-109">
<div class="annotation">

<div class="pilwrap ">
<a class="pilcrow" href="#section-103">&#182;</a>
<a class="pilcrow" href="#section-109">&#182;</a>
</div>
<p>Bit-shifting tokens.</p>

Expand All @@ -2670,11 +2766,11 @@ <h2 id="constants">Constants</h2>
</li>


<li id="section-104">
<li id="section-110">
<div class="annotation">

<div class="pilwrap ">
<a class="pilcrow" href="#section-104">&#182;</a>
<a class="pilcrow" href="#section-110">&#182;</a>
</div>
<p>Comparison tokens.</p>

Expand All @@ -2685,11 +2781,11 @@ <h2 id="constants">Constants</h2>
</li>


<li id="section-105">
<li id="section-111">
<div class="annotation">

<div class="pilwrap ">
<a class="pilcrow" href="#section-105">&#182;</a>
<a class="pilcrow" href="#section-111">&#182;</a>
</div>
<p>Mathematical tokens.</p>

Expand All @@ -2700,11 +2796,11 @@ <h2 id="constants">Constants</h2>
</li>


<li id="section-106">
<li id="section-112">
<div class="annotation">

<div class="pilwrap ">
<a class="pilcrow" href="#section-106">&#182;</a>
<a class="pilcrow" href="#section-112">&#182;</a>
</div>
<p>Relational tokens that are negatable with <code>not</code> prefix.</p>

Expand All @@ -2715,11 +2811,11 @@ <h2 id="constants">Constants</h2>
</li>


<li id="section-107">
<li id="section-113">
<div class="annotation">

<div class="pilwrap ">
<a class="pilcrow" href="#section-107">&#182;</a>
<a class="pilcrow" href="#section-113">&#182;</a>
</div>
<p>Boolean tokens.</p>

Expand All @@ -2730,11 +2826,11 @@ <h2 id="constants">Constants</h2>
</li>


<li id="section-108">
<li id="section-114">
<div class="annotation">

<div class="pilwrap ">
<a class="pilcrow" href="#section-108">&#182;</a>
<a class="pilcrow" href="#section-114">&#182;</a>
</div>
<p>Tokens which could legitimately be invoked or indexed. An opening
parentheses or bracket following these tokens will be recorded as the start
Expand All @@ -2751,11 +2847,11 @@ <h2 id="constants">Constants</h2>
</li>


<li id="section-109">
<li id="section-115">
<div class="annotation">

<div class="pilwrap ">
<a class="pilcrow" href="#section-109">&#182;</a>
<a class="pilcrow" href="#section-115">&#182;</a>
</div>
<p>Tokens which can be the left-hand side of a less-than comparison, i.e. <code>a&lt;b</code>.</p>

Expand All @@ -2766,11 +2862,11 @@ <h2 id="constants">Constants</h2>
</li>


<li id="section-110">
<li id="section-116">
<div class="annotation">

<div class="pilwrap ">
<a class="pilcrow" href="#section-110">&#182;</a>
<a class="pilcrow" href="#section-116">&#182;</a>
</div>
<p>Tokens which a regular expression will never immediately follow (except spaced
CALLABLEs in some cases), but which a division operator can.</p>
Expand All @@ -2783,11 +2879,11 @@ <h2 id="constants">Constants</h2>
</li>


<li id="section-111">
<li id="section-117">
<div class="annotation">

<div class="pilwrap ">
<a class="pilcrow" href="#section-111">&#182;</a>
<a class="pilcrow" href="#section-117">&#182;</a>
</div>
<p>Tokens that, when immediately preceding a <code>WHEN</code>, indicate that the <code>WHEN</code>
occurs at the start of a line. We disambiguate these from trailing whens to
Expand All @@ -2800,11 +2896,11 @@ <h2 id="constants">Constants</h2>
</li>


<li id="section-112">
<li id="section-118">
<div class="annotation">

<div class="pilwrap ">
<a class="pilcrow" href="#section-112">&#182;</a>
<a class="pilcrow" href="#section-118">&#182;</a>
</div>
<p>Additional indent in front of these is ignored.</p>

Expand All @@ -2815,11 +2911,11 @@ <h2 id="constants">Constants</h2>
</li>


<li id="section-113">
<li id="section-119">
<div class="annotation">

<div class="pilwrap ">
<a class="pilcrow" href="#section-113">&#182;</a>
<a class="pilcrow" href="#section-119">&#182;</a>
</div>
<p>Tokens that, when appearing at the end of a line, suppress a following TERMINATOR/INDENT token</p>

Expand Down
Loading