Skip to content

Commit

Permalink
chore(all): v. 0.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@KFlash
KFlash committed Feb 15, 2020
1 parent dd890ec commit abee107
Show file tree
Hide file tree
Showing 2 changed files with 225 additions and 17 deletions.
41 changes: 24 additions & 17 deletions src/parser/expressions.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1738,7 +1738,7 @@ export function parseArrowFunction(
);

if (parser.newLine === 0) {
const { token } = parser;
const token = parser.token;

if ((token & Token.IsBinaryOp) > 0) {
report(parser, Errors.UnexpectedToken, KeywordDescTable[parser.token & Token.Kind]);
Expand Down Expand Up @@ -2469,6 +2469,15 @@ export function parseAssignmentOrPattern(
};
}

export function isRightBraketOrComma(t: Token): boolean {
// If encounter "[...," or "]", this could be either the end of the array,
// or array properties.
// Examples:
// [x]
// [x, y]
return t === Token.RightBracket || t === Token.Comma;
}

export function parseArrayExpressionOrPattern(
parser: ParserState,
context: Context,
Expand Down Expand Up @@ -2504,7 +2513,7 @@ export function parseArrayExpressionOrPattern(
if (parser.token === Token.Assign) {
if (parser.assignable === 0) report(parser, Errors.CantAssignTo);
left = parseAssignmentOrPattern(parser, context, reinterpret, inGroup, left, '=', start, line, column);
} else if (parser.token === Token.Comma || (parser.token as Token) === Token.RightBracket) {
} else if (isRightBraketOrComma(parser.token)) {
if (parser.assignable === 1) {
addVarOrBlock(parser, context, scope, tokenValue, kind, origin);
} else {
Expand Down Expand Up @@ -2575,7 +2584,7 @@ export function parseArrayExpressionOrPattern(

parser.assignable = mutualFlag & Flags.NotDestructible ? 0 : 1;

if ((parser.token as Token) !== Token.Comma && (parser.token as Token) !== Token.RightBracket) {
if (!isRightBraketOrComma(parser.token)) {
if (mutualFlag & Flags.MustDestruct) report(parser, Errors.InvalidDestructuringTarget);

left = parseMemberExpression(parser, context, left, 1, 0, start, line, column);
Expand Down Expand Up @@ -2630,15 +2639,15 @@ export function parseArrayExpressionOrPattern(
column
);

if (parser.token !== Token.Comma && (parser.token as Token) !== Token.RightBracket) {
if (!isRightBraketOrComma(parser.token)) {
report(parser, Errors.UnexpectedToken, KeywordDescTable[parser.token & Token.Kind]);
}

mutualFlag |= parser.flags;
} else {
left = parseLeftHandSideExpression(parser, context, 0, /* allowLHS */ 1, 1);

if (parser.token !== Token.Comma && (parser.token as Token) !== Token.RightBracket) {
if (!isRightBraketOrComma(parser.token)) {
left = parseAssignmentExpression(parser, context, reinterpret, 0, left, start, line, column);
mutualFlag |=
(kind & 0b00000000000000000000000000001001) === 0 && token === Token.LeftParen ? Flags.NotDestructible : 0;
Expand Down Expand Up @@ -3720,15 +3729,15 @@ export function parseObjectLiteralOrPattern(
context,
reinterpret,
0,
value as any,
value,
KeywordDescTable[token & Token.Kind] as Types.AssignmentOperator,
start,
line,
column
);
} else {
if ((token & Token.IsBinaryOp) > 0) {
value = parseBinaryExpression(parser, context, 0, 0, token, start, line, column, value as any);
value = parseBinaryExpression(parser, context, 0, 0, token, start, line, column, value);
}
if ((token as Token) === Token.QuestionMark) {
value = parseConditionalExpression(parser, context, value, start, line, column);
Expand Down Expand Up @@ -3871,9 +3880,7 @@ export function parseObjectLiteralOrPattern(

value = parsePrimaryExpression(parser, context, type, 0, /* allowLHS */ 1, 1, inGroup, start, line, column);

token = parser.token;

const valueAfterColon = parser.tokenValue;
const { token, tokenValue: valueAfterColon } = parser;

value = parseMemberExpression(parser, context, value, 1, 0, start, line, column);

Expand All @@ -3887,7 +3894,7 @@ export function parseObjectLiteralOrPattern(
} else {
mutualFlag |= parser.assignable === 1 ? Flags.AssignableDestruct : Flags.NotDestructible;
}
} else if ((token as Token) === Token.Assign) {
} else if ((parser.token as Token) === Token.Assign) {
mutualFlag |= parser.assignable === 0 ? Flags.NotDestructible : 0;
value = parseAssignmentExpression(parser, context, reinterpret, 0, value, start, line, column);
} else {
Expand Down Expand Up @@ -4007,7 +4014,7 @@ export function parseObjectLiteralOrPattern(
if ((parser.token & 0b00000000001001110000000000000000) > 0) {
value = parsePrimaryExpression(parser, context, type, 0, 1, 1, inGroup, start, line, column);

const { token } = parser;
const token = parser.token;

value = parseMemberExpression(parser, context, value, 1, 0, start, line, column);

Expand Down Expand Up @@ -4212,26 +4219,26 @@ export function parseObjectLiteralOrPattern(

mutualFlag = parser.flags;

if (isRightBraceOrComma(parser.token)) {
// TODO
} else if ((parser.flags & Flags.MustDestruct) !== Flags.MustDestruct) {
if (!isRightBraceOrComma(parser.token) && (parser.flags & Flags.MustDestruct) !== Flags.MustDestruct) {
value = parseMemberExpression(parser, context, value, 1, 0, start, line, column);

const token = parser.token;

if ((token & Token.IsAssignOp) > 0) {
value = parseAssignmentOrPattern(
parser,
context,
reinterpret,
0,
value as any,
value,
KeywordDescTable[token & Token.Kind] as Types.AssignmentOperator,
start,
line,
column
);
} else {
if ((token & Token.IsBinaryOp) > 0) {
value = parseBinaryExpression(parser, context, 0, 0, token, start, line, column, value as any);
value = parseBinaryExpression(parser, context, 0, 0, token, start, line, column, value);
}

if ((parser.token as Token) === Token.QuestionMark) {
Expand Down
201 changes: 201 additions & 0 deletions test/parser/expressions/object.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ fail('Expressions - Object (fail)', [
['({ a = 42, b: c = d, })', Context.Empty],
['x = {key: true = a}', Context.Empty],
['x = {key: typeof = a}', Context.Empty],
['({[foo]() {}} = y)', Context.Empty],
['({ident: a`b` = x})', Context.Empty],
['x = {key: bar.foo + x = y}', Context.Empty],
['var obj = { foo = 123, bar: x = 123 };', Context.Empty],
Expand Down Expand Up @@ -3538,6 +3539,206 @@ pass('Expressions - object', [
}
}
],
[
`for ({ "a": x[(y)] = a } in (z)) {}`,
Context.OptionsLoc,
{
body: [
{
body: {
body: [],
end: 37,
loc: {
end: {
column: 37,
line: 1
},
start: {
column: 35,
line: 1
}
},
start: 35,
type: 'BlockStatement'
},
end: 37,
left: {
end: 26,
loc: {
end: {
column: 26,
line: 1
},
start: {
column: 5,
line: 1
}
},
properties: [
{
computed: false,
end: 23,
key: {
end: 11,
loc: {
end: {
column: 11,
line: 1
},
start: {
column: 8,
line: 1
}
},
start: 8,
type: 'Literal',
value: 'a'
},
kind: 'init',
loc: {
end: {
column: 23,
line: 1
},
start: {
column: 8,
line: 1
}
},
method: false,
shorthand: false,
start: 8,
type: 'Property',
value: {
end: 23,
left: {
computed: true,
end: 19,
loc: {
end: {
column: 19,
line: 1
},
start: {
column: 13,
line: 1
}
},
object: {
end: 14,
loc: {
end: {
column: 14,
line: 1
},
start: {
column: 13,
line: 1
}
},
name: 'x',
start: 13,
type: 'Identifier'
},
property: {
end: 17,
loc: {
end: {
column: 17,
line: 1
},
start: {
column: 16,
line: 1
}
},
name: 'y',
start: 16,
type: 'Identifier'
},
start: 13,
type: 'MemberExpression'
},
loc: {
end: {
column: 23,
line: 1
},
start: {
column: 13,
line: 1
}
},
right: {
end: 23,
loc: {
end: {
column: 23,
line: 1
},
start: {
column: 22,
line: 1
}
},
name: 'a',
start: 22,
type: 'Identifier'
},
start: 13,
type: 'AssignmentPattern'
}
}
],
start: 5,
type: 'ObjectPattern'
},
loc: {
end: {
column: 37,
line: 1
},
start: {
column: 0,
line: 1
}
},
right: {
end: 32,
loc: {
end: {
column: 32,
line: 1
},
start: {
column: 31,
line: 1
}
},
name: 'z',
start: 31,
type: 'Identifier'
},
start: 0,
type: 'ForInStatement'
}
],
end: 37,
loc: {
end: {
column: 37,
line: 1
},
start: {
column: 0,
line: 1
}
},
sourceType: 'script',
start: 0,
type: 'Program'
}
],
[
`'use strict'; x = (x = { [a]: (x) = y }) / y.z`,
Context.OptionsLoc,
Expand Down

0 comments on commit abee107

Please sign in to comment.