From b6435ca280177b9af2ac3bc66e470f8a6aa2cf49 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Sat, 11 Nov 2023 21:29:29 +0100 Subject: [PATCH] LibJS: Unify bytecode instruction names with their helper names --- Userland/Libraries/LibJS/Bytecode/Interpreter.cpp | 8 ++++---- Userland/Libraries/LibJS/Bytecode/Op.h | 8 ++++---- Userland/Libraries/LibJS/JIT/Compiler.cpp | 8 ++++---- Userland/Libraries/LibJS/JIT/Compiler.h | 8 ++++---- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Userland/Libraries/LibJS/Bytecode/Interpreter.cpp b/Userland/Libraries/LibJS/Bytecode/Interpreter.cpp index 492859ce20..fe762faca9 100644 --- a/Userland/Libraries/LibJS/Bytecode/Interpreter.cpp +++ b/Userland/Libraries/LibJS/Bytecode/Interpreter.cpp @@ -515,22 +515,22 @@ ThrowCompletionOr Store::execute_impl(Bytecode::Interpreter&) const __builtin_unreachable(); } -static ThrowCompletionOr abstract_inequals(VM& vm, Value src1, Value src2) +static ThrowCompletionOr loosely_inequals(VM& vm, Value src1, Value src2) { return Value(!TRY(is_loosely_equal(vm, src1, src2))); } -static ThrowCompletionOr abstract_equals(VM& vm, Value src1, Value src2) +static ThrowCompletionOr loosely_equals(VM& vm, Value src1, Value src2) { return Value(TRY(is_loosely_equal(vm, src1, src2))); } -static ThrowCompletionOr typed_inequals(VM&, Value src1, Value src2) +static ThrowCompletionOr strict_inequals(VM&, Value src1, Value src2) { return Value(!is_strictly_equal(src1, src2)); } -static ThrowCompletionOr typed_equals(VM&, Value src1, Value src2) +static ThrowCompletionOr strict_equals(VM&, Value src1, Value src2) { return Value(is_strictly_equal(src1, src2)); } diff --git a/Userland/Libraries/LibJS/Bytecode/Op.h b/Userland/Libraries/LibJS/Bytecode/Op.h index 0dc29512d3..1bbc39fb7d 100644 --- a/Userland/Libraries/LibJS/Bytecode/Op.h +++ b/Userland/Libraries/LibJS/Bytecode/Op.h @@ -92,10 +92,10 @@ private: O(GreaterThanEquals, greater_than_equals) \ O(LessThan, less_than) \ O(LessThanEquals, less_than_equals) \ - O(LooselyInequals, abstract_inequals) \ - O(LooselyEquals, abstract_equals) \ - O(StrictlyInequals, typed_inequals) \ - O(StrictlyEquals, typed_equals) \ + O(LooselyInequals, loosely_inequals) \ + O(LooselyEquals, loosely_equals) \ + O(StrictlyInequals, strict_inequals) \ + O(StrictlyEquals, strict_equals) \ O(BitwiseAnd, bitwise_and) \ O(BitwiseOr, bitwise_or) \ O(BitwiseXor, bitwise_xor) \ diff --git a/Userland/Libraries/LibJS/JIT/Compiler.cpp b/Userland/Libraries/LibJS/JIT/Compiler.cpp index 7d13d8adb6..12605a8371 100644 --- a/Userland/Libraries/LibJS/JIT/Compiler.cpp +++ b/Userland/Libraries/LibJS/JIT/Compiler.cpp @@ -577,22 +577,22 @@ void Compiler::compile_throw(Bytecode::Op::Throw const&) check_exception(); } -static ThrowCompletionOr abstract_inequals(VM& vm, Value src1, Value src2) +static ThrowCompletionOr loosely_inequals(VM& vm, Value src1, Value src2) { return Value(!TRY(is_loosely_equal(vm, src1, src2))); } -static ThrowCompletionOr abstract_equals(VM& vm, Value src1, Value src2) +static ThrowCompletionOr loosely_equals(VM& vm, Value src1, Value src2) { return Value(TRY(is_loosely_equal(vm, src1, src2))); } -static ThrowCompletionOr typed_inequals(VM&, Value src1, Value src2) +static ThrowCompletionOr strict_inequals(VM&, Value src1, Value src2) { return Value(!is_strictly_equal(src1, src2)); } -static ThrowCompletionOr typed_equals(VM&, Value src1, Value src2) +static ThrowCompletionOr strict_equals(VM&, Value src1, Value src2) { return Value(is_strictly_equal(src1, src2)); } diff --git a/Userland/Libraries/LibJS/JIT/Compiler.h b/Userland/Libraries/LibJS/JIT/Compiler.h index fd89f2ecc7..7672d2e78c 100644 --- a/Userland/Libraries/LibJS/JIT/Compiler.h +++ b/Userland/Libraries/LibJS/JIT/Compiler.h @@ -50,10 +50,10 @@ private: O(Mod, mod) \ O(In, in) \ O(InstanceOf, instance_of) \ - O(LooselyInequals, abstract_inequals) \ - O(LooselyEquals, abstract_equals) \ - O(StrictlyInequals, typed_inequals) \ - O(StrictlyEquals, typed_equals) + O(LooselyInequals, loosely_inequals) \ + O(LooselyEquals, loosely_equals) \ + O(StrictlyInequals, strict_inequals) \ + O(StrictlyEquals, strict_equals) # define JS_ENUMERATE_COMPARISON_OPS(O) \ O(LessThan, less_than, SignedLessThan) \