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

LibJS: Add basic support for modulo (%) in binary expressions

Browse source
This commit is contained in:
Andreas Kling 2020-04-04 21:17:34 +02:00
parent 9c8363bb5f
commit 644ff1bbfd
6 changed files with 25 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Libraries/LibJS/AST.cpp
View file

@ -244,6 +244,8 @@ Value BinaryExpression::execute(Interpreter& interpreter) const
return mul(lhs_result, rhs_result); return mul(lhs_result, rhs_result);
case BinaryOp::Slash: case BinaryOp::Slash:
return div(lhs_result, rhs_result); return div(lhs_result, rhs_result);
case BinaryOp::Modulo:
return mod(lhs_result, rhs_result);
case BinaryOp::TypedEquals: case BinaryOp::TypedEquals:
return typed_eq(lhs_result, rhs_result); return typed_eq(lhs_result, rhs_result);
case BinaryOp::TypedInequals: case BinaryOp::TypedInequals:
@ -379,6 +381,9 @@ void BinaryExpression::dump(int indent) const
case BinaryOp::Slash: case BinaryOp::Slash:
op_string = "/"; op_string = "/";
break; break;
case BinaryOp::Modulo:
op_string = "%";
break;
case BinaryOp::TypedEquals: case BinaryOp::TypedEquals:
op_string = "==="; op_string = "===";
break; break;

1
Libraries/LibJS/AST.h
View file

@ -289,6 +289,7 @@ enum class BinaryOp {
Minus, Minus,
Asterisk, Asterisk,
Slash, Slash,
Modulo,
TypedEquals, TypedEquals,
TypedInequals, TypedInequals,
AbstractEquals, AbstractEquals,

4
Libraries/LibJS/Parser.cpp
View file

@ -463,6 +463,9 @@ NonnullRefPtr<Expression> Parser::parse_secondary_expression(NonnullRefPtr<Expre
case TokenType::SlashEquals: case TokenType::SlashEquals:
consume(); consume();
return create_ast_node<AssignmentExpression>(AssignmentOp::DivisionAssignment, move(lhs), parse_expression(min_precedence, associativity)); return create_ast_node<AssignmentExpression>(AssignmentOp::DivisionAssignment, move(lhs), parse_expression(min_precedence, associativity));
case TokenType::Percent:
consume();
return create_ast_node<BinaryExpression>(BinaryOp::Modulo, move(lhs), parse_expression(min_precedence, associativity));
case TokenType::GreaterThan: case TokenType::GreaterThan:
consume(); consume();
return create_ast_node<BinaryExpression>(BinaryOp::GreaterThan, move(lhs), parse_expression(min_precedence, associativity)); return create_ast_node<BinaryExpression>(BinaryOp::GreaterThan, move(lhs), parse_expression(min_precedence, associativity));
@ -871,6 +874,7 @@ bool Parser::match_secondary_expression() const
|| type == TokenType::AsteriskEquals || type == TokenType::AsteriskEquals
|| type == TokenType::Slash || type == TokenType::Slash
|| type == TokenType::SlashEquals || type == TokenType::SlashEquals
|| type == TokenType::Percent
|| type == TokenType::Equals || type == TokenType::Equals
|| type == TokenType::EqualsEqualsEquals || type == TokenType::EqualsEqualsEquals
|| type == TokenType::ExclamationMarkEqualsEquals || type == TokenType::ExclamationMarkEqualsEquals

6
Libraries/LibJS/Runtime/Value.cpp
View file

@ -239,6 +239,12 @@ Value div(Value lhs, Value rhs)
return Value(lhs.to_number().as_double() / rhs.to_number().as_double()); return Value(lhs.to_number().as_double() / rhs.to_number().as_double());
} }
Value mod(Value lhs, Value rhs)
{
// FIXME: It seems like JavaScript should allow modulo for doubles as well(?)
return Value(lhs.to_i32() % rhs.to_i32());
}
Value typed_eq(Value lhs, Value rhs) Value typed_eq(Value lhs, Value rhs)
{ {
if (rhs.type() != lhs.type()) if (rhs.type() != lhs.type())

1
Libraries/LibJS/Runtime/Value.h
View file

@ -195,6 +195,7 @@ Value add(Value lhs, Value rhs);
Value sub(Value lhs, Value rhs); Value sub(Value lhs, Value rhs);
Value mul(Value lhs, Value rhs); Value mul(Value lhs, Value rhs);
Value div(Value lhs, Value rhs); Value div(Value lhs, Value rhs);
Value mod(Value lhs, Value rhs);
Value eq(Value lhs, Value rhs); Value eq(Value lhs, Value rhs);
Value typed_eq(Value lhs, Value rhs); Value typed_eq(Value lhs, Value rhs);
Value instance_of(Value lhs, Value rhs); Value instance_of(Value lhs, Value rhs);

8
Libraries/LibJS/Tests/modulo-basic.js Normal file
View file

@ -0,0 +1,8 @@
function assert(x) { if (!x) throw 1; }
try {
assert(10 % 3 === 1);
console.log("PASS");
} catch (e) {
console.log("FAIL: " + e);
}