RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-23 10:17:41 +00:00
Code Issues Activity Actions

LibJS: Add bytecode support for regexp literals

Browse source
This commit is contained in:
Matthew Olsson 2021-06-19 17:17:40 -07:00 • committed by Andreas Kling
parent 3ccf4dc7ad
commit df65ff8a1e
5 changed files with 41 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Userland/Libraries/LibJS/AST.h
View file

@ -764,6 +764,7 @@ public:
virtual Value execute(Interpreter&, GlobalObject&) const override;
virtual void dump(int indent) const override;
virtual void generate_bytecode(Bytecode::Generator&) const override;
String const& pattern() const { return m_pattern; }
String const& flags() const { return m_flags; }

7
Userland/Libraries/LibJS/Bytecode/ASTCodegen.cpp
View file

@ -258,6 +258,13 @@ void StringLiteral::generate_bytecode(Bytecode::Generator& generator) const
generator.emit<Bytecode::Op::NewString>(generator.intern_string(m_value));
}
void RegExpLiteral::generate_bytecode(Bytecode::Generator& generator) const
{
auto source_index = generator.intern_string(m_pattern);
auto flags_index = generator.intern_string(m_flags);
generator.emit<Bytecode::Op::NewRegExp>(source_index, flags_index);
}
void Identifier::generate_bytecode(Bytecode::Generator& generator) const
{
if (m_argument_index.has_value())

1
Userland/Libraries/LibJS/Bytecode/Instruction.h
View file

@ -32,6 +32,7 @@
O(IteratorToArray) \
O(NewString) \
O(NewObject) \
O(NewRegExp) \
O(CopyObjectExcludingProperties) \
O(GetVariable) \
O(SetVariable) \

14
Userland/Libraries/LibJS/Bytecode/Op.cpp
View file

@ -15,6 +15,7 @@
#include <LibJS/Runtime/GlobalObject.h>
#include <LibJS/Runtime/IteratorOperations.h>
#include <LibJS/Runtime/LexicalEnvironment.h>
#include <LibJS/Runtime/RegExpObject.h>
#include <LibJS/Runtime/ScopeObject.h>
#include <LibJS/Runtime/ScriptFunction.h>
#include <LibJS/Runtime/Value.h>
@ -169,6 +170,14 @@ void NewObject::execute_impl(Bytecode::Interpreter& interpreter) const
interpreter.accumulator() = Object::create(interpreter.global_object(), interpreter.global_object().object_prototype());
}
void NewRegExp::execute_impl(Bytecode::Interpreter& interpreter) const
{
auto source = interpreter.current_executable().get_string(m_source_index);
auto flags = interpreter.current_executable().get_string(m_flags_index);
interpreter.accumulator() = RegExpObject::create(interpreter.global_object(), source, flags);
}
void CopyObjectExcludingProperties::execute_impl(Bytecode::Interpreter& interpreter) const
{
auto* from_object = interpreter.reg(m_from_object).to_object(interpreter.global_object());
@ -498,6 +507,11 @@ String NewObject::to_string_impl(Bytecode::Executable const&) const
return "NewObject";
}
String NewRegExp::to_string_impl(Bytecode::Executable const& executable) const
{
return String::formatted("NewRegExp source:{} (\"{}\") flags:{} (\"{}\")", m_source_index, executable.get_string(m_source_index), m_flags_index, executable.get_string(m_flags_index));
}
String CopyObjectExcludingProperties::to_string_impl(const Bytecode::Executable&) const
{
StringBuilder builder;

18
Userland/Libraries/LibJS/Bytecode/Op.h
View file

@ -162,6 +162,24 @@ public:
void replace_references_impl(BasicBlock const&, BasicBlock const&) { }
};
class NewRegExp final : public Instruction {
public:
NewRegExp(StringTableIndex source_index, StringTableIndex flags_index)
: Instruction(Type::NewRegExp)
, m_source_index(source_index)
, m_flags_index(flags_index)
{
}
void execute_impl(Bytecode::Interpreter&) const;
String to_string_impl(Bytecode::Executable const&) const;
void replace_references_impl(BasicBlock const&, BasicBlock const&) { }
private:
StringTableIndex m_source_index;
StringTableIndex m_flags_index;
};
// NOTE: This instruction is variable-width depending on the number of excluded names
class CopyObjectExcludingProperties final : public Instruction {
public: