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

LibJS: Correctness fixes for bitwise_or, address FIXME's in test.

Browse source
This commit is contained in:
Brian Gianforcaro 2020-04-05 00:11:47 -07:00 • committed by Andreas Kling
parent 3e8cf79efa
commit 41bfff1abe
2 changed files with 20 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -186,6 +186,18 @@ Value bitwise_and(Value lhs, Value rhs)
Value bitwise_or(Value lhs, Value rhs) Value bitwise_or(Value lhs, Value rhs)
{ {
bool lhs_invalid = lhs.is_undefined() || lhs.is_null() || lhs.is_nan() || lhs.is_infinity();
bool rhs_invalid = rhs.is_undefined() || rhs.is_null() || rhs.is_nan() || rhs.is_infinity();
if (lhs_invalid && rhs_invalid)
return Value(0);
if (lhs_invalid || rhs_invalid)
return lhs_invalid ? rhs.to_number() : lhs.to_number();
if (!rhs.is_number() && !lhs.is_number())
return Value(0);
return Value((i32)lhs.to_number().as_double() | (i32)rhs.to_number().as_double()); return Value((i32)lhs.to_number().as_double() | (i32)rhs.to_number().as_double());
} }

16
Libraries/LibJS/Tests/binary-bitwise-operators-basic.js
View file

@ -48,14 +48,14 @@ try {
assert(("42" | 6) === 46); assert(("42" | 6) === 46);
assert((x | y) === 7); assert((x | y) === 7);
assert((x | [[[[12]]]]) === 15); assert((x | [[[[12]]]]) === 15);
// FIXME: These should all return 0 assert((undefined | y) === 7);
// assert((undefined | y) === 7); assert(("a" | "b") === 0);
// assert(("a" | "b") === 0); assert((null | null) === 0);
// assert((null | null) === 0); assert((undefined | undefined) === 0);
// assert((undefined | undefined) === 0); assert((NaN | NaN) === 0);
// assert((NaN | NaN) === 0); assert((NaN | 6) === 6);
// assert((Infinity | Infinity) === 0); assert((Infinity | Infinity) === 0);
// assert((-Infinity | Infinity) === 0); assert((-Infinity | Infinity) === 0);
console.log("PASS"); console.log("PASS");
} catch (e) { } catch (e) {