701973 - Eliminate token munging

Status: RESOLVED FIXED

(Core :: JavaScript Engine, defect)

Description

[Jeff Walden [:Waldo]]

Attachment: Extract TOK_CONST from TOK_VAR, and make Parser::variables not implicitly depend on the current token

These patches will be atop the ones in bug 701620.

Comment 1

[Jeff Walden [:Waldo]]

Attachment: Make Parser::functionBody callers specify the body kind, rather than inferring it from the current token

Comment 2

[Jason Orendorff [:jorendorff]]

Comment on attachment 573985 [details] [diff] [review]
Extract TOK_CONST from TOK_VAR, and make Parser::variables not implicitly depend on the current token

This patch is a beautiful thing. Thanks!

>+        DebugOnly<bool> matched = matchToken(tt);
>+        JS_ASSERT(matched);

This could be
  JS_ALWAYS_TRUE(matchToken(tt));

Your call.

Comment 3

[Jason Orendorff [:jorendorff]]

Comment on attachment 573986 [details] [diff] [review]
Make Parser::functionBody callers specify the body kind, rather than inferring it from the current token

Again, nothing but beautiful.

>     /* Mutators. */
>     bool reportCompileErrorNumberVA(ParseNode *pn, uintN flags, uintN errorNumber, va_list ap);
>-    void mungeCurrentToken(TokenKind newKind) { tokens[cursor].type = newKind; }

That comment doesn't make sense anymore, not to say it really made sense before.

Comment 4

[Jeff Walden [:Waldo]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/ef50be56af03
https://hg.mozilla.org/integration/mozilla-inbound/rev/977ecc68c1f8

Comment 5

[Marco Bonardo [:mak] (Away Apr 25 - May 5)]

https://hg.mozilla.org/mozilla-central/rev/ef50be56af03
https://hg.mozilla.org/mozilla-central/rev/977ecc68c1f8