RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 12:48:10 +00:00
Code Issues Activity Actions

LibJS: Allow parsing numeric and string literals in object expressions

Browse source 
Also updated the object-basic.js test to include this change
This commit is contained in:
DexesTTP 2020-04-06 22:17:05 +02:00 • committed by Andreas Kling
parent 154dcd1ed6
commit e586dc285a
2 changed files with 32 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Libraries/LibJS/Parser.cpp
View file

@ -389,13 +389,30 @@ NonnullRefPtr<ObjectExpression> Parser::parse_object_expression()
consume(TokenType::CurlyOpen); consume(TokenType::CurlyOpen);
while (!match(TokenType::CurlyClose)) { while (!match(TokenType::CurlyClose)) {
auto identifier = create_ast_node<Identifier>(consume(TokenType::Identifier).value()); FlyString property_name;
if (match(TokenType::Identifier)) {
property_name = consume(TokenType::Identifier).value();
} else if (match(TokenType::StringLiteral)) {
property_name = consume(TokenType::StringLiteral).string_value();
} else if (match(TokenType::NumericLiteral)) {
property_name = consume(TokenType::NumericLiteral).value();
} else {
m_parser_state.m_has_errors = true;
auto& current_token = m_parser_state.m_current_token;
fprintf(stderr, "Error: Unexpected token %s as member in object initialization. Expected a numeric literal, string literal or identifier (line: %zu, column: %zu))\n",
current_token.name(),
current_token.line_number(),
current_token.line_column());
consume();
continue;
}
if (match(TokenType::Colon)) { if (match(TokenType::Colon)) {
consume(TokenType::Colon); consume(TokenType::Colon);
properties.set(identifier->string(), parse_expression(0)); properties.set(property_name, parse_expression(0));
} else { } else {
properties.set(identifier->string(), identifier); properties.set(property_name, create_ast_node<Identifier>(property_name));
} }
if (!match(TokenType::Comma)) if (!match(TokenType::Comma))

14
Libraries/LibJS/Tests/object-basic.js
View file

@ -1,7 +1,11 @@
try { try {
var o = { foo: "bar" }; var o = { 1: 23, foo: "bar", "hello": "friends" };
assert(o[1] === 23);
assert(o["1"] === 23);
assert(o.foo === "bar"); assert(o.foo === "bar");
assert(o["foo"] === "bar"); assert(o["foo"] === "bar");
assert(o.hello === "friends");
assert(o["hello"] === "friends");
o.baz = "test"; o.baz = "test";
assert(o.baz === "test"); assert(o.baz === "test");
assert(o["baz"] === "test"); assert(o["baz"] === "test");
@ -11,7 +15,13 @@ try {
o[-1] = "hello friends"; o[-1] = "hello friends";
assert(o[-1] === "hello friends"); assert(o[-1] === "hello friends");
assert(o["-1"] === "hello friends"); assert(o["-1"] === "hello friends");
var math = { 3.14: "pi" };
assert(math["3.14"] === "pi");
// Note : this test doesn't pass yet due to floating-point literals being coerced to i32 on access
// assert(math[3.14] === "pi");
console.log("PASS"); console.log("PASS");
} catch (e) { } catch (e) {
console.log("FAIL: " + e); console.log("FAIL: " + e);
} }