Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .clang-format-ignore
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
src/runtime/frozen/importlib.h
src/runtime/frozen/importlib_external.h
4 changes: 4 additions & 0 deletions .github/workflows/premerge.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,10 @@ jobs:
steps:
- uses: actions/checkout@v4

- uses: actions/setup-python@v3

- uses: pre-commit/action@v3.0.1

- name: Install LLVM
run: |
wget https://apt.llvm.org/llvm.sh
Expand Down
5 changes: 5 additions & 0 deletions .pre-commit-config.yaml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
repos:
- repo: https://github.com/pre-commit/mirrors-clang-format
rev: 'v20.1.8'
hooks:
- id: clang-format
14 changes: 4 additions & 10 deletions src/ast/AST.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,11 +14,8 @@ namespace ast {
AST_NODE_TYPES
#undef __AST_NODE_TYPE

#define __AST_NODE_TYPE(NodeType) \
Value *NodeType::codegen(CodeGenerator *generator) const \
{ \
return generator->visit(this); \
}
#define __AST_NODE_TYPE(NodeType) \
Value *NodeType::codegen(CodeGenerator *generator) const { return generator->visit(this); }
AST_NODE_TYPES
#undef __AST_NODE_TYPE

Expand All@@ -34,11 +31,8 @@ void NodeVisitor::dispatch(ASTNode *node)
#undef __AST_NODE_TYPE
}

#define __AST_NODE_TYPE(NodeType) \
void NodeVisitor::dispatch(NodeType *node) \
{ \
visit(node); \
}
#define __AST_NODE_TYPE(NodeType) \
void NodeVisitor::dispatch(NodeType *node) { visit(node); }
AST_NODE_TYPES
#undef __AST_NODE_TYPE

Expand Down
4 changes: 2 additions & 2 deletions src/ast/optimizers/Optimizers_tests.cpp
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
#include "ConstantFolding.hpp"
#include "ast/AST.hpp"
#include "executable/Program.hpp"
#include "parser/Parser.hpp"
#include "runtime/Value.hpp"
#include "utilities.hpp"
#include "executable/Program.hpp"

#include "gtest/gtest.h"

Expand DownExpand Up@@ -502,7 +502,7 @@ TEST(Optimizer, ConstantFoldIntegerAddition)
expected_ast->emplace(
std::make_shared<Assign>(std::vector<std::shared_ptr<ASTNode>>{ std::make_shared<Name>(
"a", ContextType::STORE, SourceLocation{}) },
std::make_shared<Constant>(BigIntType{2}, SourceLocation{}),
std::make_shared<Constant>(BigIntType{ 2 }, SourceLocation{}),
"",
SourceLocation{}));

Expand Down
4 changes: 2 additions & 2 deletions src/executable/Program.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,8 +2,8 @@
#include "executable/bytecode/codegen/BytecodeGenerator.hpp"
#include "executable/llvm/LLVMGenerator.hpp"
#include "executable/mlir/Dialect/Python/MLIRGenerator.hpp"
#include "utilities.hpp"
#include "mlir/compile.hpp"
#include "utilities.hpp"


Program::Program(std::string &&filename, std::vector<std::string> &&argv)
Expand DownExpand Up@@ -34,4 +34,4 @@ std::shared_ptr<Program> compile(std::shared_ptr<ast::Module> node,
}
ASSERT_NOT_REACHED();
}
}
}// namespace compiler
20 changes: 12 additions & 8 deletions src/executable/bytecode/Bytecode.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,11 +17,11 @@ Bytecode::Bytecode(size_t register_count,
InstructionVector instructions,
std::shared_ptr<Program> program)
: Function(register_count,
locals_count,
stack_size,
function_name,
FunctionExecutionBackend::BYTECODE,
std::move(program)),
locals_count,
stack_size,
function_name,
FunctionExecutionBackend::BYTECODE,
std::move(program)),
m_instructions(std::move(instructions))
{}

Expand DownExpand Up@@ -78,8 +78,12 @@ std::unique_ptr<Bytecode> Bytecode::deserialize(std::span<const uint8_t> &buffer
instructions.push_back(std::move(instruction));
}

return std::make_unique<Bytecode>(
register_count, locals_count, stack_size, function_name, std::move(instructions), std::move(program));
return std::make_unique<Bytecode>(register_count,
locals_count,
stack_size,
function_name,
std::move(instructions),
std::move(program));
}

PyResult<Value> Bytecode::call(VirtualMachine &vm, Interpreter &interpreter) const
Expand DownExpand Up@@ -124,7 +128,7 @@ py::PyResult<py::Value> Bytecode::eval_loop(VirtualMachine &vm, Interpreter &int

const auto end_instruction_it = end();
for (; vm.instruction_pointer() != end_instruction_it;
vm.set_instruction_pointer(std::next(vm.instruction_pointer()))) {
vm.set_instruction_pointer(std::next(vm.instruction_pointer()))) {
ASSERT((*vm.instruction_pointer()).get());
const auto &current_ip = vm.instruction_pointer();
const auto &instruction = *current_ip;
Expand Down
3 changes: 2 additions & 1 deletion src/executable/bytecode/Bytecode.hpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,8 @@ class Bytecode : public Function

std::vector<uint8_t> serialize() const override;

static std::unique_ptr<Bytecode> deserialize(std::span<const uint8_t> &buffer, std::shared_ptr<Program> program);
static std::unique_ptr<Bytecode> deserialize(std::span<const uint8_t> &buffer,
std::shared_ptr<Program> program);

py::PyResult<py::Value> call(VirtualMachine &, Interpreter &) const override;
py::PyResult<py::Value> call_without_setup(VirtualMachine &, Interpreter &) const override;
Expand Down
10 changes: 5 additions & 5 deletions src/executable/bytecode/codegen/BytecodeGenerator.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,9 +34,9 @@
#include "executable/bytecode/instructions/Instructions.hpp"
#include "executable/bytecode/instructions/Jump.hpp"
#include "executable/bytecode/instructions/JumpForward.hpp"
#include "executable/bytecode/instructions/JumpIfExceptionMatch.hpp"
#include "executable/bytecode/instructions/JumpIfFalse.hpp"
#include "executable/bytecode/instructions/JumpIfFalseOrPop.hpp"
#include "executable/bytecode/instructions/JumpIfExceptionMatch.hpp"
#include "executable/bytecode/instructions/JumpIfNotExceptionMatch.hpp"
#include "executable/bytecode/instructions/JumpIfTrue.hpp"
#include "executable/bytecode/instructions/JumpIfTrueOrPop.hpp"
Expand DownExpand Up@@ -277,7 +277,7 @@ void BytecodeGenerator::store_name(const std::string &name, BytecodeValue *src)
ASSERT(visibility->second->type == VariablesResolver::Scope::Type::CLASS);
return *it;
} else if (auto it = visibility->second->symbol_map.get_visible_symbol(name);
it.has_value()) {
it.has_value()) {
return *it;
} else {
TODO();
Expand DownExpand Up@@ -396,7 +396,7 @@ void BytecodeGenerator::delete_var(const std::string &name)
ASSERT(visibility->second->type == VariablesResolver::Scope::Type::CLASS);
return *it;
} else if (auto it = visibility->second->symbol_map.get_visible_symbol(name);
it.has_value()) {
it.has_value()) {
return *it;
} else {
TODO();
Expand DownExpand Up@@ -699,7 +699,7 @@ Value *BytecodeGenerator::generate_function(const FunctionType *node)
idx++;
}
for (size_t idx = node->args()->argument_names().size();
const auto &arg_name : node->args()->kw_only_argument_names()) {
const auto &arg_name : node->args()->kw_only_argument_names()) {
varnames.push_back(arg_name);
ASSERT(symbol_map.get_visible_symbol(arg_name).has_value());
if (std::find(cellvars.begin(), cellvars.end(), arg_name) != cellvars.end()) {
Expand DownExpand Up@@ -950,7 +950,7 @@ Value *BytecodeGenerator::visit(const Lambda *node)
idx++;
}
for (size_t idx = node->args()->argument_names().size();
const auto &arg_name : node->args()->kw_only_argument_names()) {
const auto &arg_name : node->args()->kw_only_argument_names()) {
varnames.push_back(arg_name);
ASSERT(symbol_map.get_visible_symbol(arg_name).has_value());
if (std::find(cellvars.begin(), cellvars.end(), arg_name) != cellvars.end()) {
Expand Down
4 changes: 3 additions & 1 deletion src/executable/bytecode/codegen/VariablesResolver.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,9 @@ using namespace ast;

namespace {
bool captured_by_closure(VariablesResolver::Visibility v)
{ return v == VariablesResolver::Visibility::CELL || v == VariablesResolver::Visibility::FREE; }
{
return v == VariablesResolver::Visibility::CELL || v == VariablesResolver::Visibility::FREE;
}
}// namespace


Expand Down
7 changes: 2 additions & 5 deletions src/executable/bytecode/instructions/BuildList.hpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,14 +9,11 @@ class BuildList final : public Instruction
size_t m_size;

public:
BuildList(Register dst, size_t size)
: m_dst(dst), m_size(size)
{}
BuildList(Register dst, size_t size) : m_dst(dst), m_size(size) {}

std::string to_string() const final
{
return fmt::format(
"BUILD_LIST r{:<3} (size={})", m_dst, m_size);
return fmt::format("BUILD_LIST r{:<3} (size={})", m_dst, m_size);
}

py::PyResult<py::Value> execute(VirtualMachine &, Interpreter &) const final;
Expand Down
2 changes: 1 addition & 1 deletion src/executable/bytecode/instructions/DeleteFast.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@ using namespace py;
PyResult<Value> DeleteFast::execute(VirtualMachine &vm, Interpreter &) const
{
vm.stack_local(m_stack_index) = nullptr;
return Ok(py_none());
return Ok(py_none());
}

std::vector<uint8_t> DeleteFast::serialize() const
Expand Down
4 changes: 1 addition & 3 deletions src/executable/bytecode/instructions/ForIter.hpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,9 +26,7 @@ class ForIter final : public Instruction
m_exit_label(std::move(exit_label))
{}

ForIter(Register dst, Register src, int32_t offset)
: ForIter(dst, src, offset, int32_t{ 0 })
{}
ForIter(Register dst, Register src, int32_t offset) : ForIter(dst, src, offset, int32_t{ 0 }) {}

ForIter(Register dst, Register src, int32_t offset, int32_t body_offset)
: m_dst(dst), m_src(src), m_offset(offset), m_body_offset(body_offset)
Expand Down
2 changes: 1 addition & 1 deletion src/executable/bytecode/instructions/InplaceOp.cpp
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
#include "InplaceOp.hpp"
#include "runtime/PyObject.hpp"
#include "runtime/Value.hpp"
#include "vm/VM.hpp"
#include "runtime/PyObject.hpp"

using namespace py;

Expand Down
2 changes: 1 addition & 1 deletion src/executable/bytecode/instructions/MakeFunction.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ PyResult<Value> MakeFunction::execute(VirtualMachine &vm, Interpreter &interpret
std::vector<Value> default_values;
default_values.reserve(m_defaults_size);
auto *start = vm.sp() - m_defaults_size - m_kw_defaults_size;
while (start != (vm.sp()- m_kw_defaults_size)) {
while (start != (vm.sp()- m_kw_defaults_size)) {
default_values.push_back(*start);
start = std::next(start);
}
Expand Down
5 changes: 4 additions & 1 deletion src/executable/bytecode/instructions/MakeFunction.hpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,10 @@ class MakeFunction : public Instruction
m_kw_defaults_size(kw_defaults_size), m_captures_tuple(std::move(captures_tuple))
{}

std::string to_string() const final { return fmt::format("MAKE_FUNCTION r{} ({})", m_dst, m_name); }
std::string to_string() const final
{
return fmt::format("MAKE_FUNCTION r{} ({})", m_dst, m_name);
}

py::PyResult<py::Value> execute(VirtualMachine &vm, Interpreter &interpreter) const final;

Expand Down
2 changes: 1 addition & 1 deletion src/executable/bytecode/instructions/Push.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@ using namespace py;
PyResult<Value> Push::execute(VirtualMachine &vm, Interpreter &) const
{
auto value = vm.reg(m_source);
vm.push(value);
vm.push(value);
return Ok(py_none());
}

Expand Down
5 changes: 1 addition & 4 deletions src/executable/bytecode/instructions/Push.hpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,10 +8,7 @@ class Push final : public Instruction

public:
Push(Register source) : m_source(source) {}
std::string to_string() const final
{
return fmt::format("PUSH r{:<3}", m_source);
}
std::string to_string() const final { return fmt::format("PUSH r{:<3}", m_source); }
py::PyResult<py::Value> execute(VirtualMachine &vm, Interpreter &interpreter) const final;

void relocate(size_t) final {}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -1819,7 +1819,7 @@ namespace py {
op, BlockRange{ cleanup_block });
}
} else if (auto op = mlir::dyn_cast<mlir::py::ControlFlowYield>(childOp);
op && !op.getKind().has_value()) {
op && !op.getKind().has_value()) {
auto *current = op->getBlock();
auto *next = rewriter.splitBlock(current, op->getIterator());
rewriter.setInsertionPointToEnd(current);
Expand Down
2 changes: 1 addition & 1 deletion src/executable/mlir/Dialect/Python/IR/Ops.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -195,7 +195,7 @@ namespace py {
getHandlers().end(),
[&point](
mlir::Region &handler) { return point.getRegionOrNull() == &handler; });
it != getHandlers().end()) {
it != getHandlers().end()) {
if (std::next(it) != getHandlers().end()) {
it++;
regions.emplace_back(&*it, it->getArguments());
Expand Down
22 changes: 11 additions & 11 deletions src/executable/mlir/Dialect/Python/MLIRGenerator.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -346,7 +346,7 @@ void MLIRGenerator::store_name(std::string_view name,
ASSERT(visibility_map->type == VariablesResolver::Scope::Type::CLASS);
return it->get().visibility;
} else if (auto it = visibility_map->symbol_map.get_visible_symbol(std::string{ name });
it.has_value()) {
it.has_value()) {
return it->get().visibility;
} else {
TODO();
Expand DownExpand Up@@ -434,7 +434,7 @@ MLIRGenerator::MLIRValue *MLIRGenerator::load_name(std::string_view name,
ASSERT(visibility_map->type == VariablesResolver::Scope::Type::CLASS);
return it->get().visibility;
} else if (auto it = visibility_map->symbol_map.get_visible_symbol(std::string{ name });
it.has_value()) {
it.has_value()) {
return it->get().visibility;
} else {
TODO();
Expand DownExpand Up@@ -516,7 +516,7 @@ void MLIRGenerator::delete_name(std::string_view name, const SourceLocation &loc
ASSERT(visibility_map->type == VariablesResolver::Scope::Type::CLASS);
return it->get().visibility;
} else if (auto it = visibility_map->symbol_map.get_visible_symbol(std::string{ name });
it.has_value()) {
it.has_value()) {
return it->get().visibility;
} else {
TODO();
Expand DownExpand Up@@ -1103,7 +1103,7 @@ ast::Value *MLIRGenerator::visit(const ast::Call *node)
}
arg_values.push_back(static_cast<MLIRValue *>(
build_tuple(args, arg_requires_expansion, node->source_location()))
->value);
->value);
}
if (!node->keywords().empty()) { requires_kwargs_expansion = true; }
{
Expand DownExpand Up@@ -1131,7 +1131,7 @@ ast::Value *MLIRGenerator::visit(const ast::Call *node)
}
keyword_values.push_back(static_cast<MLIRValue *>(
build_dict(keys, values, kwarg_requires_expansion, node->source_location()))
->value);
->value);
}
} else {
arg_values.reserve(node->args().size());
Expand DownExpand Up@@ -1584,9 +1584,9 @@ ast::Value *MLIRGenerator::visit(const ast::For *node)
for (const auto &el : node->body()) { el->codegen(this); }
if (m_context.builder().getInsertionBlock()->empty()
|| !m_context.builder()
.getInsertionBlock()
->back()
.hasTrait<mlir::OpTrait::IsTerminator>()) {
.getInsertionBlock()
->back()
.hasTrait<mlir::OpTrait::IsTerminator>()) {
m_context.builder().create<mlir::py::ControlFlowYield>(m_context.builder().getUnknownLoc());
}

Expand DownExpand Up@@ -2738,9 +2738,9 @@ ast::Value *MLIRGenerator::visit(const ast::Try *node)
for (auto el : handler->body()) { el->codegen(this); }
if (m_context.builder().getBlock()->empty()
|| !m_context.builder()
.getBlock()
->back()
.hasTrait<mlir::OpTrait::IsTerminator>()) {
.getBlock()
->back()
.hasTrait<mlir::OpTrait::IsTerminator>()) {
m_context.builder().create<mlir::py::ControlFlowYield>(
loc(m_context.builder(), m_context.filename(), node->source_location()));
}
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .clang-format-ignore
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
src/runtime/frozen/importlib.h
src/runtime/frozen/importlib_external.h
4 changes: 4 additions & 0 deletions .github/workflows/premerge.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,10 @@ jobs:
steps:
- uses: actions/checkout@v4

- uses: actions/setup-python@v3

- uses: pre-commit/action@v3.0.1

- name: Install LLVM
run: |
wget https://apt.llvm.org/llvm.sh
Expand Down
5 changes: 5 additions & 0 deletions .pre-commit-config.yaml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
repos:
- repo: https://github.com/pre-commit/mirrors-clang-format
rev: 'v20.1.8'
hooks:
- id: clang-format
14 changes: 4 additions & 10 deletions src/ast/AST.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,11 +14,8 @@ namespace ast {
AST_NODE_TYPES
#undef __AST_NODE_TYPE

#define __AST_NODE_TYPE(NodeType) \
Value *NodeType::codegen(CodeGenerator *generator) const \
{ \
return generator->visit(this); \
}
#define __AST_NODE_TYPE(NodeType) \
Value *NodeType::codegen(CodeGenerator *generator) const { return generator->visit(this); }
AST_NODE_TYPES
#undef __AST_NODE_TYPE

Expand All@@ -34,11 +31,8 @@ void NodeVisitor::dispatch(ASTNode *node)
#undef __AST_NODE_TYPE
}

#define __AST_NODE_TYPE(NodeType) \
void NodeVisitor::dispatch(NodeType *node) \
{ \
visit(node); \
}
#define __AST_NODE_TYPE(NodeType) \
void NodeVisitor::dispatch(NodeType *node) { visit(node); }
AST_NODE_TYPES
#undef __AST_NODE_TYPE

Expand Down
4 changes: 2 additions & 2 deletions src/ast/optimizers/Optimizers_tests.cpp
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
#include "ConstantFolding.hpp"
#include "ast/AST.hpp"
#include "executable/Program.hpp"
#include "parser/Parser.hpp"
#include "runtime/Value.hpp"
#include "utilities.hpp"
#include "executable/Program.hpp"

#include "gtest/gtest.h"

Expand DownExpand Up@@ -502,7 +502,7 @@ TEST(Optimizer, ConstantFoldIntegerAddition)
expected_ast->emplace(
std::make_shared<Assign>(std::vector<std::shared_ptr<ASTNode>>{ std::make_shared<Name>(
"a", ContextType::STORE, SourceLocation{}) },
std::make_shared<Constant>(BigIntType{2}, SourceLocation{}),
std::make_shared<Constant>(BigIntType{ 2 }, SourceLocation{}),
"",
SourceLocation{}));

Expand Down
4 changes: 2 additions & 2 deletions src/executable/Program.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,8 +2,8 @@
#include "executable/bytecode/codegen/BytecodeGenerator.hpp"
#include "executable/llvm/LLVMGenerator.hpp"
#include "executable/mlir/Dialect/Python/MLIRGenerator.hpp"
#include "utilities.hpp"
#include "mlir/compile.hpp"
#include "utilities.hpp"


Program::Program(std::string &&filename, std::vector<std::string> &&argv)
Expand DownExpand Up@@ -34,4 +34,4 @@ std::shared_ptr<Program> compile(std::shared_ptr<ast::Module> node,
}
ASSERT_NOT_REACHED();
}
}
}// namespace compiler
20 changes: 12 additions & 8 deletions src/executable/bytecode/Bytecode.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,11 +17,11 @@ Bytecode::Bytecode(size_t register_count,
InstructionVector instructions,
std::shared_ptr<Program> program)
: Function(register_count,
locals_count,
stack_size,
function_name,
FunctionExecutionBackend::BYTECODE,
std::move(program)),
locals_count,
stack_size,
function_name,
FunctionExecutionBackend::BYTECODE,
std::move(program)),
m_instructions(std::move(instructions))
{}

Expand DownExpand Up@@ -78,8 +78,12 @@ std::unique_ptr<Bytecode> Bytecode::deserialize(std::span<const uint8_t> &buffer
instructions.push_back(std::move(instruction));
}

return std::make_unique<Bytecode>(
register_count, locals_count, stack_size, function_name, std::move(instructions), std::move(program));
return std::make_unique<Bytecode>(register_count,
locals_count,
stack_size,
function_name,
std::move(instructions),
std::move(program));
}

PyResult<Value> Bytecode::call(VirtualMachine &vm, Interpreter &interpreter) const
Expand DownExpand Up@@ -124,7 +128,7 @@ py::PyResult<py::Value> Bytecode::eval_loop(VirtualMachine &vm, Interpreter &int

const auto end_instruction_it = end();
for (; vm.instruction_pointer() != end_instruction_it;
vm.set_instruction_pointer(std::next(vm.instruction_pointer()))) {
vm.set_instruction_pointer(std::next(vm.instruction_pointer()))) {
ASSERT((*vm.instruction_pointer()).get());
const auto &current_ip = vm.instruction_pointer();
const auto &instruction = *current_ip;
Expand Down
3 changes: 2 additions & 1 deletion src/executable/bytecode/Bytecode.hpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,8 @@ class Bytecode : public Function

std::vector<uint8_t> serialize() const override;

static std::unique_ptr<Bytecode> deserialize(std::span<const uint8_t> &buffer, std::shared_ptr<Program> program);
static std::unique_ptr<Bytecode> deserialize(std::span<const uint8_t> &buffer,
std::shared_ptr<Program> program);

py::PyResult<py::Value> call(VirtualMachine &, Interpreter &) const override;
py::PyResult<py::Value> call_without_setup(VirtualMachine &, Interpreter &) const override;
Expand Down
10 changes: 5 additions & 5 deletions src/executable/bytecode/codegen/BytecodeGenerator.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,9 +34,9 @@
#include "executable/bytecode/instructions/Instructions.hpp"
#include "executable/bytecode/instructions/Jump.hpp"
#include "executable/bytecode/instructions/JumpForward.hpp"
#include "executable/bytecode/instructions/JumpIfExceptionMatch.hpp"
#include "executable/bytecode/instructions/JumpIfFalse.hpp"
#include "executable/bytecode/instructions/JumpIfFalseOrPop.hpp"
#include "executable/bytecode/instructions/JumpIfExceptionMatch.hpp"
#include "executable/bytecode/instructions/JumpIfNotExceptionMatch.hpp"
#include "executable/bytecode/instructions/JumpIfTrue.hpp"
#include "executable/bytecode/instructions/JumpIfTrueOrPop.hpp"
Expand DownExpand Up@@ -277,7 +277,7 @@ void BytecodeGenerator::store_name(const std::string &name, BytecodeValue *src)
ASSERT(visibility->second->type == VariablesResolver::Scope::Type::CLASS);
return *it;
} else if (auto it = visibility->second->symbol_map.get_visible_symbol(name);
it.has_value()) {
it.has_value()) {
return *it;
} else {
TODO();
Expand DownExpand Up@@ -396,7 +396,7 @@ void BytecodeGenerator::delete_var(const std::string &name)
ASSERT(visibility->second->type == VariablesResolver::Scope::Type::CLASS);
return *it;
} else if (auto it = visibility->second->symbol_map.get_visible_symbol(name);
it.has_value()) {
it.has_value()) {
return *it;
} else {
TODO();
Expand DownExpand Up@@ -699,7 +699,7 @@ Value *BytecodeGenerator::generate_function(const FunctionType *node)
idx++;
}
for (size_t idx = node->args()->argument_names().size();
const auto &arg_name : node->args()->kw_only_argument_names()) {
const auto &arg_name : node->args()->kw_only_argument_names()) {
varnames.push_back(arg_name);
ASSERT(symbol_map.get_visible_symbol(arg_name).has_value());
if (std::find(cellvars.begin(), cellvars.end(), arg_name) != cellvars.end()) {
Expand DownExpand Up@@ -950,7 +950,7 @@ Value *BytecodeGenerator::visit(const Lambda *node)
idx++;
}
for (size_t idx = node->args()->argument_names().size();
const auto &arg_name : node->args()->kw_only_argument_names()) {
const auto &arg_name : node->args()->kw_only_argument_names()) {
varnames.push_back(arg_name);
ASSERT(symbol_map.get_visible_symbol(arg_name).has_value());
if (std::find(cellvars.begin(), cellvars.end(), arg_name) != cellvars.end()) {
Expand Down
4 changes: 3 additions & 1 deletion src/executable/bytecode/codegen/VariablesResolver.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,9 @@ using namespace ast;

namespace {
bool captured_by_closure(VariablesResolver::Visibility v)
{ return v == VariablesResolver::Visibility::CELL || v == VariablesResolver::Visibility::FREE; }
{
return v == VariablesResolver::Visibility::CELL || v == VariablesResolver::Visibility::FREE;
}
}// namespace


Expand Down
7 changes: 2 additions & 5 deletions src/executable/bytecode/instructions/BuildList.hpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,14 +9,11 @@ class BuildList final : public Instruction
size_t m_size;

public:
BuildList(Register dst, size_t size)
: m_dst(dst), m_size(size)
{}
BuildList(Register dst, size_t size) : m_dst(dst), m_size(size) {}

std::string to_string() const final
{
return fmt::format(
"BUILD_LIST r{:<3} (size={})", m_dst, m_size);
return fmt::format("BUILD_LIST r{:<3} (size={})", m_dst, m_size);
}

py::PyResult<py::Value> execute(VirtualMachine &, Interpreter &) const final;
Expand Down
2 changes: 1 addition & 1 deletion src/executable/bytecode/instructions/DeleteFast.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@ using namespace py;
PyResult<Value> DeleteFast::execute(VirtualMachine &vm, Interpreter &) const
{
vm.stack_local(m_stack_index) = nullptr;
return Ok(py_none());
return Ok(py_none());
}

std::vector<uint8_t> DeleteFast::serialize() const
Expand Down
4 changes: 1 addition & 3 deletions src/executable/bytecode/instructions/ForIter.hpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,9 +26,7 @@ class ForIter final : public Instruction
m_exit_label(std::move(exit_label))
{}

ForIter(Register dst, Register src, int32_t offset)
: ForIter(dst, src, offset, int32_t{ 0 })
{}
ForIter(Register dst, Register src, int32_t offset) : ForIter(dst, src, offset, int32_t{ 0 }) {}

ForIter(Register dst, Register src, int32_t offset, int32_t body_offset)
: m_dst(dst), m_src(src), m_offset(offset), m_body_offset(body_offset)
Expand Down
2 changes: 1 addition & 1 deletion src/executable/bytecode/instructions/InplaceOp.cpp
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
#include "InplaceOp.hpp"
#include "runtime/PyObject.hpp"
#include "runtime/Value.hpp"
#include "vm/VM.hpp"
#include "runtime/PyObject.hpp"

using namespace py;

Expand Down
2 changes: 1 addition & 1 deletion src/executable/bytecode/instructions/MakeFunction.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ PyResult<Value> MakeFunction::execute(VirtualMachine &vm, Interpreter &interpret
std::vector<Value> default_values;
default_values.reserve(m_defaults_size);
auto *start = vm.sp() - m_defaults_size - m_kw_defaults_size;
while (start != (vm.sp()- m_kw_defaults_size)) {
while (start != (vm.sp()- m_kw_defaults_size)) {
default_values.push_back(*start);
start = std::next(start);
}
Expand Down
5 changes: 4 additions & 1 deletion src/executable/bytecode/instructions/MakeFunction.hpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,10 @@ class MakeFunction : public Instruction
m_kw_defaults_size(kw_defaults_size), m_captures_tuple(std::move(captures_tuple))
{}

std::string to_string() const final { return fmt::format("MAKE_FUNCTION r{} ({})", m_dst, m_name); }
std::string to_string() const final
{
return fmt::format("MAKE_FUNCTION r{} ({})", m_dst, m_name);
}

py::PyResult<py::Value> execute(VirtualMachine &vm, Interpreter &interpreter) const final;

Expand Down
2 changes: 1 addition & 1 deletion src/executable/bytecode/instructions/Push.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@ using namespace py;
PyResult<Value> Push::execute(VirtualMachine &vm, Interpreter &) const
{
auto value = vm.reg(m_source);
vm.push(value);
vm.push(value);
return Ok(py_none());
}

Expand Down
5 changes: 1 addition & 4 deletions src/executable/bytecode/instructions/Push.hpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,10 +8,7 @@ class Push final : public Instruction

public:
Push(Register source) : m_source(source) {}
std::string to_string() const final
{
return fmt::format("PUSH r{:<3}", m_source);
}
std::string to_string() const final { return fmt::format("PUSH r{:<3}", m_source); }
py::PyResult<py::Value> execute(VirtualMachine &vm, Interpreter &interpreter) const final;

void relocate(size_t) final {}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -1819,7 +1819,7 @@ namespace py {
op, BlockRange{ cleanup_block });
}
} else if (auto op = mlir::dyn_cast<mlir::py::ControlFlowYield>(childOp);
op && !op.getKind().has_value()) {
op && !op.getKind().has_value()) {
auto *current = op->getBlock();
auto *next = rewriter.splitBlock(current, op->getIterator());
rewriter.setInsertionPointToEnd(current);
Expand Down
2 changes: 1 addition & 1 deletion src/executable/mlir/Dialect/Python/IR/Ops.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -195,7 +195,7 @@ namespace py {
getHandlers().end(),
[&point](
mlir::Region &handler) { return point.getRegionOrNull() == &handler; });
it != getHandlers().end()) {
it != getHandlers().end()) {
if (std::next(it) != getHandlers().end()) {
it++;
regions.emplace_back(&*it, it->getArguments());
Expand Down
22 changes: 11 additions & 11 deletions src/executable/mlir/Dialect/Python/MLIRGenerator.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -346,7 +346,7 @@ void MLIRGenerator::store_name(std::string_view name,
ASSERT(visibility_map->type == VariablesResolver::Scope::Type::CLASS);
return it->get().visibility;
} else if (auto it = visibility_map->symbol_map.get_visible_symbol(std::string{ name });
it.has_value()) {
it.has_value()) {
return it->get().visibility;
} else {
TODO();
Expand DownExpand Up@@ -434,7 +434,7 @@ MLIRGenerator::MLIRValue *MLIRGenerator::load_name(std::string_view name,
ASSERT(visibility_map->type == VariablesResolver::Scope::Type::CLASS);
return it->get().visibility;
} else if (auto it = visibility_map->symbol_map.get_visible_symbol(std::string{ name });
it.has_value()) {
it.has_value()) {
return it->get().visibility;
} else {
TODO();
Expand DownExpand Up@@ -516,7 +516,7 @@ void MLIRGenerator::delete_name(std::string_view name, const SourceLocation &loc
ASSERT(visibility_map->type == VariablesResolver::Scope::Type::CLASS);
return it->get().visibility;
} else if (auto it = visibility_map->symbol_map.get_visible_symbol(std::string{ name });
it.has_value()) {
it.has_value()) {
return it->get().visibility;
} else {
TODO();
Expand DownExpand Up@@ -1103,7 +1103,7 @@ ast::Value *MLIRGenerator::visit(const ast::Call *node)
}
arg_values.push_back(static_cast<MLIRValue *>(
build_tuple(args, arg_requires_expansion, node->source_location()))
->value);
->value);
}
if (!node->keywords().empty()) { requires_kwargs_expansion = true; }
{
Expand DownExpand Up@@ -1131,7 +1131,7 @@ ast::Value *MLIRGenerator::visit(const ast::Call *node)
}
keyword_values.push_back(static_cast<MLIRValue *>(
build_dict(keys, values, kwarg_requires_expansion, node->source_location()))
->value);
->value);
}
} else {
arg_values.reserve(node->args().size());
Expand DownExpand Up@@ -1584,9 +1584,9 @@ ast::Value *MLIRGenerator::visit(const ast::For *node)
for (const auto &el : node->body()) { el->codegen(this); }
if (m_context.builder().getInsertionBlock()->empty()
|| !m_context.builder()
.getInsertionBlock()
->back()
.hasTrait<mlir::OpTrait::IsTerminator>()) {
.getInsertionBlock()
->back()
.hasTrait<mlir::OpTrait::IsTerminator>()) {
m_context.builder().create<mlir::py::ControlFlowYield>(m_context.builder().getUnknownLoc());
}

Expand DownExpand Up@@ -2738,9 +2738,9 @@ ast::Value *MLIRGenerator::visit(const ast::Try *node)
for (auto el : handler->body()) { el->codegen(this); }
if (m_context.builder().getBlock()->empty()
|| !m_context.builder()
.getBlock()
->back()
.hasTrait<mlir::OpTrait::IsTerminator>()) {
.getBlock()
->back()
.hasTrait<mlir::OpTrait::IsTerminator>()) {
m_context.builder().create<mlir::py::ControlFlowYield>(
loc(m_context.builder(), m_context.filename(), node->source_location()));
}
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .clang-format-ignore
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
src/runtime/frozen/importlib.h
src/runtime/frozen/importlib_external.h
4 changes: 4 additions & 0 deletions .github/workflows/premerge.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,10 @@ jobs:
steps:
- uses: actions/checkout@v4

- uses: actions/setup-python@v3

- uses: pre-commit/action@v3.0.1

- name: Install LLVM
run: |
wget https://apt.llvm.org/llvm.sh
Expand Down
5 changes: 5 additions & 0 deletions .pre-commit-config.yaml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
repos:
- repo: https://github.com/pre-commit/mirrors-clang-format
rev: 'v20.1.8'
hooks:
- id: clang-format
14 changes: 4 additions & 10 deletions src/ast/AST.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,11 +14,8 @@ namespace ast {
AST_NODE_TYPES
#undef __AST_NODE_TYPE

#define __AST_NODE_TYPE(NodeType) \
Value *NodeType::codegen(CodeGenerator *generator) const \
{ \
return generator->visit(this); \
}
#define __AST_NODE_TYPE(NodeType) \
Value *NodeType::codegen(CodeGenerator *generator) const { return generator->visit(this); }
AST_NODE_TYPES
#undef __AST_NODE_TYPE

Expand All@@ -34,11 +31,8 @@ void NodeVisitor::dispatch(ASTNode *node)
#undef __AST_NODE_TYPE
}

#define __AST_NODE_TYPE(NodeType) \
void NodeVisitor::dispatch(NodeType *node) \
{ \
visit(node); \
}
#define __AST_NODE_TYPE(NodeType) \
void NodeVisitor::dispatch(NodeType *node) { visit(node); }
AST_NODE_TYPES
#undef __AST_NODE_TYPE

Expand Down
4 changes: 2 additions & 2 deletions src/ast/optimizers/Optimizers_tests.cpp
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
#include "ConstantFolding.hpp"
#include "ast/AST.hpp"
#include "executable/Program.hpp"
#include "parser/Parser.hpp"
#include "runtime/Value.hpp"
#include "utilities.hpp"
#include "executable/Program.hpp"

#include "gtest/gtest.h"

Expand DownExpand Up@@ -502,7 +502,7 @@ TEST(Optimizer, ConstantFoldIntegerAddition)
expected_ast->emplace(
std::make_shared<Assign>(std::vector<std::shared_ptr<ASTNode>>{ std::make_shared<Name>(
"a", ContextType::STORE, SourceLocation{}) },
std::make_shared<Constant>(BigIntType{2}, SourceLocation{}),
std::make_shared<Constant>(BigIntType{ 2 }, SourceLocation{}),
"",
SourceLocation{}));

Expand Down
4 changes: 2 additions & 2 deletions src/executable/Program.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,8 +2,8 @@
#include "executable/bytecode/codegen/BytecodeGenerator.hpp"
#include "executable/llvm/LLVMGenerator.hpp"
#include "executable/mlir/Dialect/Python/MLIRGenerator.hpp"
#include "utilities.hpp"
#include "mlir/compile.hpp"
#include "utilities.hpp"


Program::Program(std::string &&filename, std::vector<std::string> &&argv)
Expand DownExpand Up@@ -34,4 +34,4 @@ std::shared_ptr<Program> compile(std::shared_ptr<ast::Module> node,
}
ASSERT_NOT_REACHED();
}
}
}// namespace compiler
20 changes: 12 additions & 8 deletions src/executable/bytecode/Bytecode.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,11 +17,11 @@ Bytecode::Bytecode(size_t register_count,
InstructionVector instructions,
std::shared_ptr<Program> program)
: Function(register_count,
locals_count,
stack_size,
function_name,
FunctionExecutionBackend::BYTECODE,
std::move(program)),
locals_count,
stack_size,
function_name,
FunctionExecutionBackend::BYTECODE,
std::move(program)),
m_instructions(std::move(instructions))
{}

Expand DownExpand Up@@ -78,8 +78,12 @@ std::unique_ptr<Bytecode> Bytecode::deserialize(std::span<const uint8_t> &buffer
instructions.push_back(std::move(instruction));
}

return std::make_unique<Bytecode>(
register_count, locals_count, stack_size, function_name, std::move(instructions), std::move(program));
return std::make_unique<Bytecode>(register_count,
locals_count,
stack_size,
function_name,
std::move(instructions),
std::move(program));
}

PyResult<Value> Bytecode::call(VirtualMachine &vm, Interpreter &interpreter) const
Expand DownExpand Up@@ -124,7 +128,7 @@ py::PyResult<py::Value> Bytecode::eval_loop(VirtualMachine &vm, Interpreter &int

const auto end_instruction_it = end();
for (; vm.instruction_pointer() != end_instruction_it;
vm.set_instruction_pointer(std::next(vm.instruction_pointer()))) {
vm.set_instruction_pointer(std::next(vm.instruction_pointer()))) {
ASSERT((*vm.instruction_pointer()).get());
const auto &current_ip = vm.instruction_pointer();
const auto &instruction = *current_ip;
Expand Down
3 changes: 2 additions & 1 deletion src/executable/bytecode/Bytecode.hpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,8 @@ class Bytecode : public Function

std::vector<uint8_t> serialize() const override;

static std::unique_ptr<Bytecode> deserialize(std::span<const uint8_t> &buffer, std::shared_ptr<Program> program);
static std::unique_ptr<Bytecode> deserialize(std::span<const uint8_t> &buffer,
std::shared_ptr<Program> program);

py::PyResult<py::Value> call(VirtualMachine &, Interpreter &) const override;
py::PyResult<py::Value> call_without_setup(VirtualMachine &, Interpreter &) const override;
Expand Down
10 changes: 5 additions & 5 deletions src/executable/bytecode/codegen/BytecodeGenerator.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,9 +34,9 @@
#include "executable/bytecode/instructions/Instructions.hpp"
#include "executable/bytecode/instructions/Jump.hpp"
#include "executable/bytecode/instructions/JumpForward.hpp"
#include "executable/bytecode/instructions/JumpIfExceptionMatch.hpp"
#include "executable/bytecode/instructions/JumpIfFalse.hpp"
#include "executable/bytecode/instructions/JumpIfFalseOrPop.hpp"
#include "executable/bytecode/instructions/JumpIfExceptionMatch.hpp"
#include "executable/bytecode/instructions/JumpIfNotExceptionMatch.hpp"
#include "executable/bytecode/instructions/JumpIfTrue.hpp"
#include "executable/bytecode/instructions/JumpIfTrueOrPop.hpp"
Expand DownExpand Up@@ -277,7 +277,7 @@ void BytecodeGenerator::store_name(const std::string &name, BytecodeValue *src)
ASSERT(visibility->second->type == VariablesResolver::Scope::Type::CLASS);
return *it;
} else if (auto it = visibility->second->symbol_map.get_visible_symbol(name);
it.has_value()) {
it.has_value()) {
return *it;
} else {
TODO();
Expand DownExpand Up@@ -396,7 +396,7 @@ void BytecodeGenerator::delete_var(const std::string &name)
ASSERT(visibility->second->type == VariablesResolver::Scope::Type::CLASS);
return *it;
} else if (auto it = visibility->second->symbol_map.get_visible_symbol(name);
it.has_value()) {
it.has_value()) {
return *it;
} else {
TODO();
Expand DownExpand Up@@ -699,7 +699,7 @@ Value *BytecodeGenerator::generate_function(const FunctionType *node)
idx++;
}
for (size_t idx = node->args()->argument_names().size();
const auto &arg_name : node->args()->kw_only_argument_names()) {
const auto &arg_name : node->args()->kw_only_argument_names()) {
varnames.push_back(arg_name);
ASSERT(symbol_map.get_visible_symbol(arg_name).has_value());
if (std::find(cellvars.begin(), cellvars.end(), arg_name) != cellvars.end()) {
Expand DownExpand Up@@ -950,7 +950,7 @@ Value *BytecodeGenerator::visit(const Lambda *node)
idx++;
}
for (size_t idx = node->args()->argument_names().size();
const auto &arg_name : node->args()->kw_only_argument_names()) {
const auto &arg_name : node->args()->kw_only_argument_names()) {
varnames.push_back(arg_name);
ASSERT(symbol_map.get_visible_symbol(arg_name).has_value());
if (std::find(cellvars.begin(), cellvars.end(), arg_name) != cellvars.end()) {
Expand Down
4 changes: 3 additions & 1 deletion src/executable/bytecode/codegen/VariablesResolver.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,9 @@ using namespace ast;

namespace {
bool captured_by_closure(VariablesResolver::Visibility v)
{ return v == VariablesResolver::Visibility::CELL || v == VariablesResolver::Visibility::FREE; }
{
return v == VariablesResolver::Visibility::CELL || v == VariablesResolver::Visibility::FREE;
}
}// namespace


Expand Down
7 changes: 2 additions & 5 deletions src/executable/bytecode/instructions/BuildList.hpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,14 +9,11 @@ class BuildList final : public Instruction
size_t m_size;

public:
BuildList(Register dst, size_t size)
: m_dst(dst), m_size(size)
{}
BuildList(Register dst, size_t size) : m_dst(dst), m_size(size) {}

std::string to_string() const final
{
return fmt::format(
"BUILD_LIST r{:<3} (size={})", m_dst, m_size);
return fmt::format("BUILD_LIST r{:<3} (size={})", m_dst, m_size);
}

py::PyResult<py::Value> execute(VirtualMachine &, Interpreter &) const final;
Expand Down
2 changes: 1 addition & 1 deletion src/executable/bytecode/instructions/DeleteFast.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@ using namespace py;
PyResult<Value> DeleteFast::execute(VirtualMachine &vm, Interpreter &) const
{
vm.stack_local(m_stack_index) = nullptr;
return Ok(py_none());
return Ok(py_none());
}

std::vector<uint8_t> DeleteFast::serialize() const
Expand Down
4 changes: 1 addition & 3 deletions src/executable/bytecode/instructions/ForIter.hpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,9 +26,7 @@ class ForIter final : public Instruction
m_exit_label(std::move(exit_label))
{}

ForIter(Register dst, Register src, int32_t offset)
: ForIter(dst, src, offset, int32_t{ 0 })
{}
ForIter(Register dst, Register src, int32_t offset) : ForIter(dst, src, offset, int32_t{ 0 }) {}

ForIter(Register dst, Register src, int32_t offset, int32_t body_offset)
: m_dst(dst), m_src(src), m_offset(offset), m_body_offset(body_offset)
Expand Down
2 changes: 1 addition & 1 deletion src/executable/bytecode/instructions/InplaceOp.cpp
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
#include "InplaceOp.hpp"
#include "runtime/PyObject.hpp"
#include "runtime/Value.hpp"
#include "vm/VM.hpp"
#include "runtime/PyObject.hpp"

using namespace py;

Expand Down
2 changes: 1 addition & 1 deletion src/executable/bytecode/instructions/MakeFunction.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ PyResult<Value> MakeFunction::execute(VirtualMachine &vm, Interpreter &interpret
std::vector<Value> default_values;
default_values.reserve(m_defaults_size);
auto *start = vm.sp() - m_defaults_size - m_kw_defaults_size;
while (start != (vm.sp()- m_kw_defaults_size)) {
while (start != (vm.sp()- m_kw_defaults_size)) {
default_values.push_back(*start);
start = std::next(start);
}
Expand Down
5 changes: 4 additions & 1 deletion src/executable/bytecode/instructions/MakeFunction.hpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,10 @@ class MakeFunction : public Instruction
m_kw_defaults_size(kw_defaults_size), m_captures_tuple(std::move(captures_tuple))
{}

std::string to_string() const final { return fmt::format("MAKE_FUNCTION r{} ({})", m_dst, m_name); }
std::string to_string() const final
{
return fmt::format("MAKE_FUNCTION r{} ({})", m_dst, m_name);
}

py::PyResult<py::Value> execute(VirtualMachine &vm, Interpreter &interpreter) const final;

Expand Down
2 changes: 1 addition & 1 deletion src/executable/bytecode/instructions/Push.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@ using namespace py;
PyResult<Value> Push::execute(VirtualMachine &vm, Interpreter &) const
{
auto value = vm.reg(m_source);
vm.push(value);
vm.push(value);
return Ok(py_none());
}

Expand Down
5 changes: 1 addition & 4 deletions src/executable/bytecode/instructions/Push.hpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,10 +8,7 @@ class Push final : public Instruction

public:
Push(Register source) : m_source(source) {}
std::string to_string() const final
{
return fmt::format("PUSH r{:<3}", m_source);
}
std::string to_string() const final { return fmt::format("PUSH r{:<3}", m_source); }
py::PyResult<py::Value> execute(VirtualMachine &vm, Interpreter &interpreter) const final;

void relocate(size_t) final {}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -1819,7 +1819,7 @@ namespace py {
op, BlockRange{ cleanup_block });
}
} else if (auto op = mlir::dyn_cast<mlir::py::ControlFlowYield>(childOp);
op && !op.getKind().has_value()) {
op && !op.getKind().has_value()) {
auto *current = op->getBlock();
auto *next = rewriter.splitBlock(current, op->getIterator());
rewriter.setInsertionPointToEnd(current);
Expand Down
2 changes: 1 addition & 1 deletion src/executable/mlir/Dialect/Python/IR/Ops.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -195,7 +195,7 @@ namespace py {
getHandlers().end(),
[&point](
mlir::Region &handler) { return point.getRegionOrNull() == &handler; });
it != getHandlers().end()) {
it != getHandlers().end()) {
if (std::next(it) != getHandlers().end()) {
it++;
regions.emplace_back(&*it, it->getArguments());
Expand Down
22 changes: 11 additions & 11 deletions src/executable/mlir/Dialect/Python/MLIRGenerator.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -346,7 +346,7 @@ void MLIRGenerator::store_name(std::string_view name,
ASSERT(visibility_map->type == VariablesResolver::Scope::Type::CLASS);
return it->get().visibility;
} else if (auto it = visibility_map->symbol_map.get_visible_symbol(std::string{ name });
it.has_value()) {
it.has_value()) {
return it->get().visibility;
} else {
TODO();
Expand DownExpand Up@@ -434,7 +434,7 @@ MLIRGenerator::MLIRValue *MLIRGenerator::load_name(std::string_view name,
ASSERT(visibility_map->type == VariablesResolver::Scope::Type::CLASS);
return it->get().visibility;
} else if (auto it = visibility_map->symbol_map.get_visible_symbol(std::string{ name });
it.has_value()) {
it.has_value()) {
return it->get().visibility;
} else {
TODO();
Expand DownExpand Up@@ -516,7 +516,7 @@ void MLIRGenerator::delete_name(std::string_view name, const SourceLocation &loc
ASSERT(visibility_map->type == VariablesResolver::Scope::Type::CLASS);
return it->get().visibility;
} else if (auto it = visibility_map->symbol_map.get_visible_symbol(std::string{ name });
it.has_value()) {
it.has_value()) {
return it->get().visibility;
} else {
TODO();
Expand DownExpand Up@@ -1103,7 +1103,7 @@ ast::Value *MLIRGenerator::visit(const ast::Call *node)
}
arg_values.push_back(static_cast<MLIRValue *>(
build_tuple(args, arg_requires_expansion, node->source_location()))
->value);
->value);
}
if (!node->keywords().empty()) { requires_kwargs_expansion = true; }
{
Expand DownExpand Up@@ -1131,7 +1131,7 @@ ast::Value *MLIRGenerator::visit(const ast::Call *node)
}
keyword_values.push_back(static_cast<MLIRValue *>(
build_dict(keys, values, kwarg_requires_expansion, node->source_location()))
->value);
->value);
}
} else {
arg_values.reserve(node->args().size());
Expand DownExpand Up@@ -1584,9 +1584,9 @@ ast::Value *MLIRGenerator::visit(const ast::For *node)
for (const auto &el : node->body()) { el->codegen(this); }
if (m_context.builder().getInsertionBlock()->empty()
|| !m_context.builder()
.getInsertionBlock()
->back()
.hasTrait<mlir::OpTrait::IsTerminator>()) {
.getInsertionBlock()
->back()
.hasTrait<mlir::OpTrait::IsTerminator>()) {
m_context.builder().create<mlir::py::ControlFlowYield>(m_context.builder().getUnknownLoc());
}

Expand DownExpand Up@@ -2738,9 +2738,9 @@ ast::Value *MLIRGenerator::visit(const ast::Try *node)
for (auto el : handler->body()) { el->codegen(this); }
if (m_context.builder().getBlock()->empty()
|| !m_context.builder()
.getBlock()
->back()
.hasTrait<mlir::OpTrait::IsTerminator>()) {
.getBlock()
->back()
.hasTrait<mlir::OpTrait::IsTerminator>()) {
m_context.builder().create<mlir::py::ControlFlowYield>(
loc(m_context.builder(), m_context.filename(), node->source_location()));
}
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .clang-format-ignore
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
src/runtime/frozen/importlib.h
src/runtime/frozen/importlib_external.h
4 changes: 4 additions & 0 deletions .github/workflows/premerge.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,10 @@ jobs:
steps:
- uses: actions/checkout@v4

- uses: actions/setup-python@v3

- uses: pre-commit/action@v3.0.1

- name: Install LLVM
run: |
wget https://apt.llvm.org/llvm.sh
Expand Down
5 changes: 5 additions & 0 deletions .pre-commit-config.yaml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
repos:
- repo: https://github.com/pre-commit/mirrors-clang-format
rev: 'v20.1.8'
hooks:
- id: clang-format
14 changes: 4 additions & 10 deletions src/ast/AST.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,11 +14,8 @@ namespace ast {
AST_NODE_TYPES
#undef __AST_NODE_TYPE

#define __AST_NODE_TYPE(NodeType) \
Value *NodeType::codegen(CodeGenerator *generator) const \
{ \
return generator->visit(this); \
}
#define __AST_NODE_TYPE(NodeType) \
Value *NodeType::codegen(CodeGenerator *generator) const { return generator->visit(this); }
AST_NODE_TYPES
#undef __AST_NODE_TYPE

Expand All@@ -34,11 +31,8 @@ void NodeVisitor::dispatch(ASTNode *node)
#undef __AST_NODE_TYPE
}

#define __AST_NODE_TYPE(NodeType) \
void NodeVisitor::dispatch(NodeType *node) \
{ \
visit(node); \
}
#define __AST_NODE_TYPE(NodeType) \
void NodeVisitor::dispatch(NodeType *node) { visit(node); }
AST_NODE_TYPES
#undef __AST_NODE_TYPE

Expand Down
4 changes: 2 additions & 2 deletions src/ast/optimizers/Optimizers_tests.cpp
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
#include "ConstantFolding.hpp"
#include "ast/AST.hpp"
#include "executable/Program.hpp"
#include "parser/Parser.hpp"
#include "runtime/Value.hpp"
#include "utilities.hpp"
#include "executable/Program.hpp"

#include "gtest/gtest.h"

Expand DownExpand Up@@ -502,7 +502,7 @@ TEST(Optimizer, ConstantFoldIntegerAddition)
expected_ast->emplace(
std::make_shared<Assign>(std::vector<std::shared_ptr<ASTNode>>{ std::make_shared<Name>(
"a", ContextType::STORE, SourceLocation{}) },
std::make_shared<Constant>(BigIntType{2}, SourceLocation{}),
std::make_shared<Constant>(BigIntType{ 2 }, SourceLocation{}),
"",
SourceLocation{}));

Expand Down
4 changes: 2 additions & 2 deletions src/executable/Program.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,8 +2,8 @@
#include "executable/bytecode/codegen/BytecodeGenerator.hpp"
#include "executable/llvm/LLVMGenerator.hpp"
#include "executable/mlir/Dialect/Python/MLIRGenerator.hpp"
#include "utilities.hpp"
#include "mlir/compile.hpp"
#include "utilities.hpp"


Program::Program(std::string &&filename, std::vector<std::string> &&argv)
Expand DownExpand Up@@ -34,4 +34,4 @@ std::shared_ptr<Program> compile(std::shared_ptr<ast::Module> node,
}
ASSERT_NOT_REACHED();
}
}
}// namespace compiler
20 changes: 12 additions & 8 deletions src/executable/bytecode/Bytecode.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,11 +17,11 @@ Bytecode::Bytecode(size_t register_count,
InstructionVector instructions,
std::shared_ptr<Program> program)
: Function(register_count,
locals_count,
stack_size,
function_name,
FunctionExecutionBackend::BYTECODE,
std::move(program)),
locals_count,
stack_size,
function_name,
FunctionExecutionBackend::BYTECODE,
std::move(program)),
m_instructions(std::move(instructions))
{}

Expand DownExpand Up@@ -78,8 +78,12 @@ std::unique_ptr<Bytecode> Bytecode::deserialize(std::span<const uint8_t> &buffer
instructions.push_back(std::move(instruction));
}

return std::make_unique<Bytecode>(
register_count, locals_count, stack_size, function_name, std::move(instructions), std::move(program));
return std::make_unique<Bytecode>(register_count,
locals_count,
stack_size,
function_name,
std::move(instructions),
std::move(program));
}

PyResult<Value> Bytecode::call(VirtualMachine &vm, Interpreter &interpreter) const
Expand DownExpand Up@@ -124,7 +128,7 @@ py::PyResult<py::Value> Bytecode::eval_loop(VirtualMachine &vm, Interpreter &int

const auto end_instruction_it = end();
for (; vm.instruction_pointer() != end_instruction_it;
vm.set_instruction_pointer(std::next(vm.instruction_pointer()))) {
vm.set_instruction_pointer(std::next(vm.instruction_pointer()))) {
ASSERT((*vm.instruction_pointer()).get());
const auto &current_ip = vm.instruction_pointer();
const auto &instruction = *current_ip;
Expand Down
3 changes: 2 additions & 1 deletion src/executable/bytecode/Bytecode.hpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,8 @@ class Bytecode : public Function

std::vector<uint8_t> serialize() const override;

static std::unique_ptr<Bytecode> deserialize(std::span<const uint8_t> &buffer, std::shared_ptr<Program> program);
static std::unique_ptr<Bytecode> deserialize(std::span<const uint8_t> &buffer,
std::shared_ptr<Program> program);

py::PyResult<py::Value> call(VirtualMachine &, Interpreter &) const override;
py::PyResult<py::Value> call_without_setup(VirtualMachine &, Interpreter &) const override;
Expand Down
10 changes: 5 additions & 5 deletions src/executable/bytecode/codegen/BytecodeGenerator.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,9 +34,9 @@
#include "executable/bytecode/instructions/Instructions.hpp"
#include "executable/bytecode/instructions/Jump.hpp"
#include "executable/bytecode/instructions/JumpForward.hpp"
#include "executable/bytecode/instructions/JumpIfExceptionMatch.hpp"
#include "executable/bytecode/instructions/JumpIfFalse.hpp"
#include "executable/bytecode/instructions/JumpIfFalseOrPop.hpp"
#include "executable/bytecode/instructions/JumpIfExceptionMatch.hpp"
#include "executable/bytecode/instructions/JumpIfNotExceptionMatch.hpp"
#include "executable/bytecode/instructions/JumpIfTrue.hpp"
#include "executable/bytecode/instructions/JumpIfTrueOrPop.hpp"
Expand DownExpand Up@@ -277,7 +277,7 @@ void BytecodeGenerator::store_name(const std::string &name, BytecodeValue *src)
ASSERT(visibility->second->type == VariablesResolver::Scope::Type::CLASS);
return *it;
} else if (auto it = visibility->second->symbol_map.get_visible_symbol(name);
it.has_value()) {
it.has_value()) {
return *it;
} else {
TODO();
Expand DownExpand Up@@ -396,7 +396,7 @@ void BytecodeGenerator::delete_var(const std::string &name)
ASSERT(visibility->second->type == VariablesResolver::Scope::Type::CLASS);
return *it;
} else if (auto it = visibility->second->symbol_map.get_visible_symbol(name);
it.has_value()) {
it.has_value()) {
return *it;
} else {
TODO();
Expand DownExpand Up@@ -699,7 +699,7 @@ Value *BytecodeGenerator::generate_function(const FunctionType *node)
idx++;
}
for (size_t idx = node->args()->argument_names().size();
const auto &arg_name : node->args()->kw_only_argument_names()) {
const auto &arg_name : node->args()->kw_only_argument_names()) {
varnames.push_back(arg_name);
ASSERT(symbol_map.get_visible_symbol(arg_name).has_value());
if (std::find(cellvars.begin(), cellvars.end(), arg_name) != cellvars.end()) {
Expand DownExpand Up@@ -950,7 +950,7 @@ Value *BytecodeGenerator::visit(const Lambda *node)
idx++;
}
for (size_t idx = node->args()->argument_names().size();
const auto &arg_name : node->args()->kw_only_argument_names()) {
const auto &arg_name : node->args()->kw_only_argument_names()) {
varnames.push_back(arg_name);
ASSERT(symbol_map.get_visible_symbol(arg_name).has_value());
if (std::find(cellvars.begin(), cellvars.end(), arg_name) != cellvars.end()) {
Expand Down
4 changes: 3 additions & 1 deletion src/executable/bytecode/codegen/VariablesResolver.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,9 @@ using namespace ast;

namespace {
bool captured_by_closure(VariablesResolver::Visibility v)
{ return v == VariablesResolver::Visibility::CELL || v == VariablesResolver::Visibility::FREE; }
{
return v == VariablesResolver::Visibility::CELL || v == VariablesResolver::Visibility::FREE;
}
}// namespace


Expand Down
7 changes: 2 additions & 5 deletions src/executable/bytecode/instructions/BuildList.hpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,14 +9,11 @@ class BuildList final : public Instruction
size_t m_size;

public:
BuildList(Register dst, size_t size)
: m_dst(dst), m_size(size)
{}
BuildList(Register dst, size_t size) : m_dst(dst), m_size(size) {}

std::string to_string() const final
{
return fmt::format(
"BUILD_LIST r{:<3} (size={})", m_dst, m_size);
return fmt::format("BUILD_LIST r{:<3} (size={})", m_dst, m_size);
}

py::PyResult<py::Value> execute(VirtualMachine &, Interpreter &) const final;
Expand Down
2 changes: 1 addition & 1 deletion src/executable/bytecode/instructions/DeleteFast.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@ using namespace py;
PyResult<Value> DeleteFast::execute(VirtualMachine &vm, Interpreter &) const
{
vm.stack_local(m_stack_index) = nullptr;
return Ok(py_none());
return Ok(py_none());
}

std::vector<uint8_t> DeleteFast::serialize() const
Expand Down
4 changes: 1 addition & 3 deletions src/executable/bytecode/instructions/ForIter.hpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,9 +26,7 @@ class ForIter final : public Instruction
m_exit_label(std::move(exit_label))
{}

ForIter(Register dst, Register src, int32_t offset)
: ForIter(dst, src, offset, int32_t{ 0 })
{}
ForIter(Register dst, Register src, int32_t offset) : ForIter(dst, src, offset, int32_t{ 0 }) {}

ForIter(Register dst, Register src, int32_t offset, int32_t body_offset)
: m_dst(dst), m_src(src), m_offset(offset), m_body_offset(body_offset)
Expand Down
2 changes: 1 addition & 1 deletion src/executable/bytecode/instructions/InplaceOp.cpp
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
#include "InplaceOp.hpp"
#include "runtime/PyObject.hpp"
#include "runtime/Value.hpp"
#include "vm/VM.hpp"
#include "runtime/PyObject.hpp"

using namespace py;

Expand Down
2 changes: 1 addition & 1 deletion src/executable/bytecode/instructions/MakeFunction.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ PyResult<Value> MakeFunction::execute(VirtualMachine &vm, Interpreter &interpret
std::vector<Value> default_values;
default_values.reserve(m_defaults_size);
auto *start = vm.sp() - m_defaults_size - m_kw_defaults_size;
while (start != (vm.sp()- m_kw_defaults_size)) {
while (start != (vm.sp()- m_kw_defaults_size)) {
default_values.push_back(*start);
start = std::next(start);
}
Expand Down
5 changes: 4 additions & 1 deletion src/executable/bytecode/instructions/MakeFunction.hpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,10 @@ class MakeFunction : public Instruction
m_kw_defaults_size(kw_defaults_size), m_captures_tuple(std::move(captures_tuple))
{}

std::string to_string() const final { return fmt::format("MAKE_FUNCTION r{} ({})", m_dst, m_name); }
std::string to_string() const final
{
return fmt::format("MAKE_FUNCTION r{} ({})", m_dst, m_name);
}

py::PyResult<py::Value> execute(VirtualMachine &vm, Interpreter &interpreter) const final;

Expand Down
2 changes: 1 addition & 1 deletion src/executable/bytecode/instructions/Push.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@ using namespace py;
PyResult<Value> Push::execute(VirtualMachine &vm, Interpreter &) const
{
auto value = vm.reg(m_source);
vm.push(value);
vm.push(value);
return Ok(py_none());
}

Expand Down
5 changes: 1 addition & 4 deletions src/executable/bytecode/instructions/Push.hpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,10 +8,7 @@ class Push final : public Instruction

public:
Push(Register source) : m_source(source) {}
std::string to_string() const final
{
return fmt::format("PUSH r{:<3}", m_source);
}
std::string to_string() const final { return fmt::format("PUSH r{:<3}", m_source); }
py::PyResult<py::Value> execute(VirtualMachine &vm, Interpreter &interpreter) const final;

void relocate(size_t) final {}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -1819,7 +1819,7 @@ namespace py {
op, BlockRange{ cleanup_block });
}
} else if (auto op = mlir::dyn_cast<mlir::py::ControlFlowYield>(childOp);
op && !op.getKind().has_value()) {
op && !op.getKind().has_value()) {
auto *current = op->getBlock();
auto *next = rewriter.splitBlock(current, op->getIterator());
rewriter.setInsertionPointToEnd(current);
Expand Down
2 changes: 1 addition & 1 deletion src/executable/mlir/Dialect/Python/IR/Ops.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -195,7 +195,7 @@ namespace py {
getHandlers().end(),
[&point](
mlir::Region &handler) { return point.getRegionOrNull() == &handler; });
it != getHandlers().end()) {
it != getHandlers().end()) {
if (std::next(it) != getHandlers().end()) {
it++;
regions.emplace_back(&*it, it->getArguments());
Expand Down
22 changes: 11 additions & 11 deletions src/executable/mlir/Dialect/Python/MLIRGenerator.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -346,7 +346,7 @@ void MLIRGenerator::store_name(std::string_view name,
ASSERT(visibility_map->type == VariablesResolver::Scope::Type::CLASS);
return it->get().visibility;
} else if (auto it = visibility_map->symbol_map.get_visible_symbol(std::string{ name });
it.has_value()) {
it.has_value()) {
return it->get().visibility;
} else {
TODO();
Expand DownExpand Up@@ -434,7 +434,7 @@ MLIRGenerator::MLIRValue *MLIRGenerator::load_name(std::string_view name,
ASSERT(visibility_map->type == VariablesResolver::Scope::Type::CLASS);
return it->get().visibility;
} else if (auto it = visibility_map->symbol_map.get_visible_symbol(std::string{ name });
it.has_value()) {
it.has_value()) {
return it->get().visibility;
} else {
TODO();
Expand DownExpand Up@@ -516,7 +516,7 @@ void MLIRGenerator::delete_name(std::string_view name, const SourceLocation &loc
ASSERT(visibility_map->type == VariablesResolver::Scope::Type::CLASS);
return it->get().visibility;
} else if (auto it = visibility_map->symbol_map.get_visible_symbol(std::string{ name });
it.has_value()) {
it.has_value()) {
return it->get().visibility;
} else {
TODO();
Expand DownExpand Up@@ -1103,7 +1103,7 @@ ast::Value *MLIRGenerator::visit(const ast::Call *node)
}
arg_values.push_back(static_cast<MLIRValue *>(
build_tuple(args, arg_requires_expansion, node->source_location()))
->value);
->value);
}
if (!node->keywords().empty()) { requires_kwargs_expansion = true; }
{
Expand DownExpand Up@@ -1131,7 +1131,7 @@ ast::Value *MLIRGenerator::visit(const ast::Call *node)
}
keyword_values.push_back(static_cast<MLIRValue *>(
build_dict(keys, values, kwarg_requires_expansion, node->source_location()))
->value);
->value);
}
} else {
arg_values.reserve(node->args().size());
Expand DownExpand Up@@ -1584,9 +1584,9 @@ ast::Value *MLIRGenerator::visit(const ast::For *node)
for (const auto &el : node->body()) { el->codegen(this); }
if (m_context.builder().getInsertionBlock()->empty()
|| !m_context.builder()
.getInsertionBlock()
->back()
.hasTrait<mlir::OpTrait::IsTerminator>()) {
.getInsertionBlock()
->back()
.hasTrait<mlir::OpTrait::IsTerminator>()) {
m_context.builder().create<mlir::py::ControlFlowYield>(m_context.builder().getUnknownLoc());
}

Expand DownExpand Up@@ -2738,9 +2738,9 @@ ast::Value *MLIRGenerator::visit(const ast::Try *node)
for (auto el : handler->body()) { el->codegen(this); }
if (m_context.builder().getBlock()->empty()
|| !m_context.builder()
.getBlock()
->back()
.hasTrait<mlir::OpTrait::IsTerminator>()) {
.getBlock()
->back()
.hasTrait<mlir::OpTrait::IsTerminator>()) {
m_context.builder().create<mlir::py::ControlFlowYield>(
loc(m_context.builder(), m_context.filename(), node->source_location()));
}
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .clang-format-ignore
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
src/runtime/frozen/importlib.h
src/runtime/frozen/importlib_external.h
4 changes: 4 additions & 0 deletions .github/workflows/premerge.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,10 @@ jobs:
steps:
- uses: actions/checkout@v4

- uses: actions/setup-python@v3

- uses: pre-commit/action@v3.0.1

- name: Install LLVM
run: |
wget https://apt.llvm.org/llvm.sh
Expand Down
5 changes: 5 additions & 0 deletions .pre-commit-config.yaml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
repos:
- repo: https://github.com/pre-commit/mirrors-clang-format
rev: 'v20.1.8'
hooks:
- id: clang-format
14 changes: 4 additions & 10 deletions src/ast/AST.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,11 +14,8 @@ namespace ast {
AST_NODE_TYPES
#undef __AST_NODE_TYPE

#define __AST_NODE_TYPE(NodeType) \
Value *NodeType::codegen(CodeGenerator *generator) const \
{ \
return generator->visit(this); \
}
#define __AST_NODE_TYPE(NodeType) \
Value *NodeType::codegen(CodeGenerator *generator) const { return generator->visit(this); }
AST_NODE_TYPES
#undef __AST_NODE_TYPE

Expand All@@ -34,11 +31,8 @@ void NodeVisitor::dispatch(ASTNode *node)
#undef __AST_NODE_TYPE
}

#define __AST_NODE_TYPE(NodeType) \
void NodeVisitor::dispatch(NodeType *node) \
{ \
visit(node); \
}
#define __AST_NODE_TYPE(NodeType) \
void NodeVisitor::dispatch(NodeType *node) { visit(node); }
AST_NODE_TYPES
#undef __AST_NODE_TYPE

Expand Down
4 changes: 2 additions & 2 deletions src/ast/optimizers/Optimizers_tests.cpp
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
#include "ConstantFolding.hpp"
#include "ast/AST.hpp"
#include "executable/Program.hpp"
#include "parser/Parser.hpp"
#include "runtime/Value.hpp"
#include "utilities.hpp"
#include "executable/Program.hpp"

#include "gtest/gtest.h"

Expand DownExpand Up@@ -502,7 +502,7 @@ TEST(Optimizer, ConstantFoldIntegerAddition)
expected_ast->emplace(
std::make_shared<Assign>(std::vector<std::shared_ptr<ASTNode>>{ std::make_shared<Name>(
"a", ContextType::STORE, SourceLocation{}) },
std::make_shared<Constant>(BigIntType{2}, SourceLocation{}),
std::make_shared<Constant>(BigIntType{ 2 }, SourceLocation{}),
"",
SourceLocation{}));

Expand Down
4 changes: 2 additions & 2 deletions src/executable/Program.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,8 +2,8 @@
#include "executable/bytecode/codegen/BytecodeGenerator.hpp"
#include "executable/llvm/LLVMGenerator.hpp"
#include "executable/mlir/Dialect/Python/MLIRGenerator.hpp"
#include "utilities.hpp"
#include "mlir/compile.hpp"
#include "utilities.hpp"


Program::Program(std::string &&filename, std::vector<std::string> &&argv)
Expand DownExpand Up@@ -34,4 +34,4 @@ std::shared_ptr<Program> compile(std::shared_ptr<ast::Module> node,
}
ASSERT_NOT_REACHED();
}
}
}// namespace compiler
20 changes: 12 additions & 8 deletions src/executable/bytecode/Bytecode.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,11 +17,11 @@ Bytecode::Bytecode(size_t register_count,
InstructionVector instructions,
std::shared_ptr<Program> program)
: Function(register_count,
locals_count,
stack_size,
function_name,
FunctionExecutionBackend::BYTECODE,
std::move(program)),
locals_count,
stack_size,
function_name,
FunctionExecutionBackend::BYTECODE,
std::move(program)),
m_instructions(std::move(instructions))
{}

Expand DownExpand Up@@ -78,8 +78,12 @@ std::unique_ptr<Bytecode> Bytecode::deserialize(std::span<const uint8_t> &buffer
instructions.push_back(std::move(instruction));
}

return std::make_unique<Bytecode>(
register_count, locals_count, stack_size, function_name, std::move(instructions), std::move(program));
return std::make_unique<Bytecode>(register_count,
locals_count,
stack_size,
function_name,
std::move(instructions),
std::move(program));
}

PyResult<Value> Bytecode::call(VirtualMachine &vm, Interpreter &interpreter) const
Expand DownExpand Up@@ -124,7 +128,7 @@ py::PyResult<py::Value> Bytecode::eval_loop(VirtualMachine &vm, Interpreter &int

const auto end_instruction_it = end();
for (; vm.instruction_pointer() != end_instruction_it;
vm.set_instruction_pointer(std::next(vm.instruction_pointer()))) {
vm.set_instruction_pointer(std::next(vm.instruction_pointer()))) {
ASSERT((*vm.instruction_pointer()).get());
const auto &current_ip = vm.instruction_pointer();
const auto &instruction = *current_ip;
Expand Down
3 changes: 2 additions & 1 deletion src/executable/bytecode/Bytecode.hpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,8 @@ class Bytecode : public Function

std::vector<uint8_t> serialize() const override;

static std::unique_ptr<Bytecode> deserialize(std::span<const uint8_t> &buffer, std::shared_ptr<Program> program);
static std::unique_ptr<Bytecode> deserialize(std::span<const uint8_t> &buffer,
std::shared_ptr<Program> program);

py::PyResult<py::Value> call(VirtualMachine &, Interpreter &) const override;
py::PyResult<py::Value> call_without_setup(VirtualMachine &, Interpreter &) const override;
Expand Down
10 changes: 5 additions & 5 deletions src/executable/bytecode/codegen/BytecodeGenerator.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,9 +34,9 @@
#include "executable/bytecode/instructions/Instructions.hpp"
#include "executable/bytecode/instructions/Jump.hpp"
#include "executable/bytecode/instructions/JumpForward.hpp"
#include "executable/bytecode/instructions/JumpIfExceptionMatch.hpp"
#include "executable/bytecode/instructions/JumpIfFalse.hpp"
#include "executable/bytecode/instructions/JumpIfFalseOrPop.hpp"
#include "executable/bytecode/instructions/JumpIfExceptionMatch.hpp"
#include "executable/bytecode/instructions/JumpIfNotExceptionMatch.hpp"
#include "executable/bytecode/instructions/JumpIfTrue.hpp"
#include "executable/bytecode/instructions/JumpIfTrueOrPop.hpp"
Expand DownExpand Up@@ -277,7 +277,7 @@ void BytecodeGenerator::store_name(const std::string &name, BytecodeValue *src)
ASSERT(visibility->second->type == VariablesResolver::Scope::Type::CLASS);
return *it;
} else if (auto it = visibility->second->symbol_map.get_visible_symbol(name);
it.has_value()) {
it.has_value()) {
return *it;
} else {
TODO();
Expand DownExpand Up@@ -396,7 +396,7 @@ void BytecodeGenerator::delete_var(const std::string &name)
ASSERT(visibility->second->type == VariablesResolver::Scope::Type::CLASS);
return *it;
} else if (auto it = visibility->second->symbol_map.get_visible_symbol(name);
it.has_value()) {
it.has_value()) {
return *it;
} else {
TODO();
Expand DownExpand Up@@ -699,7 +699,7 @@ Value *BytecodeGenerator::generate_function(const FunctionType *node)
idx++;
}
for (size_t idx = node->args()->argument_names().size();
const auto &arg_name : node->args()->kw_only_argument_names()) {
const auto &arg_name : node->args()->kw_only_argument_names()) {
varnames.push_back(arg_name);
ASSERT(symbol_map.get_visible_symbol(arg_name).has_value());
if (std::find(cellvars.begin(), cellvars.end(), arg_name) != cellvars.end()) {
Expand DownExpand Up@@ -950,7 +950,7 @@ Value *BytecodeGenerator::visit(const Lambda *node)
idx++;
}
for (size_t idx = node->args()->argument_names().size();
const auto &arg_name : node->args()->kw_only_argument_names()) {
const auto &arg_name : node->args()->kw_only_argument_names()) {
varnames.push_back(arg_name);
ASSERT(symbol_map.get_visible_symbol(arg_name).has_value());
if (std::find(cellvars.begin(), cellvars.end(), arg_name) != cellvars.end()) {
Expand Down
4 changes: 3 additions & 1 deletion src/executable/bytecode/codegen/VariablesResolver.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,9 @@ using namespace ast;

namespace {
bool captured_by_closure(VariablesResolver::Visibility v)
{ return v == VariablesResolver::Visibility::CELL || v == VariablesResolver::Visibility::FREE; }
{
return v == VariablesResolver::Visibility::CELL || v == VariablesResolver::Visibility::FREE;
}
}// namespace


Expand Down
7 changes: 2 additions & 5 deletions src/executable/bytecode/instructions/BuildList.hpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,14 +9,11 @@ class BuildList final : public Instruction
size_t m_size;

public:
BuildList(Register dst, size_t size)
: m_dst(dst), m_size(size)
{}
BuildList(Register dst, size_t size) : m_dst(dst), m_size(size) {}

std::string to_string() const final
{
return fmt::format(
"BUILD_LIST r{:<3} (size={})", m_dst, m_size);
return fmt::format("BUILD_LIST r{:<3} (size={})", m_dst, m_size);
}

py::PyResult<py::Value> execute(VirtualMachine &, Interpreter &) const final;
Expand Down
2 changes: 1 addition & 1 deletion src/executable/bytecode/instructions/DeleteFast.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@ using namespace py;
PyResult<Value> DeleteFast::execute(VirtualMachine &vm, Interpreter &) const
{
vm.stack_local(m_stack_index) = nullptr;
return Ok(py_none());
return Ok(py_none());
}

std::vector<uint8_t> DeleteFast::serialize() const
Expand Down
4 changes: 1 addition & 3 deletions src/executable/bytecode/instructions/ForIter.hpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,9 +26,7 @@ class ForIter final : public Instruction
m_exit_label(std::move(exit_label))
{}

ForIter(Register dst, Register src, int32_t offset)
: ForIter(dst, src, offset, int32_t{ 0 })
{}
ForIter(Register dst, Register src, int32_t offset) : ForIter(dst, src, offset, int32_t{ 0 }) {}

ForIter(Register dst, Register src, int32_t offset, int32_t body_offset)
: m_dst(dst), m_src(src), m_offset(offset), m_body_offset(body_offset)
Expand Down
2 changes: 1 addition & 1 deletion src/executable/bytecode/instructions/InplaceOp.cpp
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
#include "InplaceOp.hpp"
#include "runtime/PyObject.hpp"
#include "runtime/Value.hpp"
#include "vm/VM.hpp"
#include "runtime/PyObject.hpp"

using namespace py;

Expand Down
2 changes: 1 addition & 1 deletion src/executable/bytecode/instructions/MakeFunction.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ PyResult<Value> MakeFunction::execute(VirtualMachine &vm, Interpreter &interpret
std::vector<Value> default_values;
default_values.reserve(m_defaults_size);
auto *start = vm.sp() - m_defaults_size - m_kw_defaults_size;
while (start != (vm.sp()- m_kw_defaults_size)) {
while (start != (vm.sp()- m_kw_defaults_size)) {
default_values.push_back(*start);
start = std::next(start);
}
Expand Down
5 changes: 4 additions & 1 deletion src/executable/bytecode/instructions/MakeFunction.hpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,10 @@ class MakeFunction : public Instruction
m_kw_defaults_size(kw_defaults_size), m_captures_tuple(std::move(captures_tuple))
{}

std::string to_string() const final { return fmt::format("MAKE_FUNCTION r{} ({})", m_dst, m_name); }
std::string to_string() const final
{
return fmt::format("MAKE_FUNCTION r{} ({})", m_dst, m_name);
}

py::PyResult<py::Value> execute(VirtualMachine &vm, Interpreter &interpreter) const final;

Expand Down
2 changes: 1 addition & 1 deletion src/executable/bytecode/instructions/Push.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@ using namespace py;
PyResult<Value> Push::execute(VirtualMachine &vm, Interpreter &) const
{
auto value = vm.reg(m_source);
vm.push(value);
vm.push(value);
return Ok(py_none());
}

Expand Down
5 changes: 1 addition & 4 deletions src/executable/bytecode/instructions/Push.hpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,10 +8,7 @@ class Push final : public Instruction

public:
Push(Register source) : m_source(source) {}
std::string to_string() const final
{
return fmt::format("PUSH r{:<3}", m_source);
}
std::string to_string() const final { return fmt::format("PUSH r{:<3}", m_source); }
py::PyResult<py::Value> execute(VirtualMachine &vm, Interpreter &interpreter) const final;

void relocate(size_t) final {}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -1819,7 +1819,7 @@ namespace py {
op, BlockRange{ cleanup_block });
}
} else if (auto op = mlir::dyn_cast<mlir::py::ControlFlowYield>(childOp);
op && !op.getKind().has_value()) {
op && !op.getKind().has_value()) {
auto *current = op->getBlock();
auto *next = rewriter.splitBlock(current, op->getIterator());
rewriter.setInsertionPointToEnd(current);
Expand Down
2 changes: 1 addition & 1 deletion src/executable/mlir/Dialect/Python/IR/Ops.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -195,7 +195,7 @@ namespace py {
getHandlers().end(),
[&point](
mlir::Region &handler) { return point.getRegionOrNull() == &handler; });
it != getHandlers().end()) {
it != getHandlers().end()) {
if (std::next(it) != getHandlers().end()) {
it++;
regions.emplace_back(&*it, it->getArguments());
Expand Down
22 changes: 11 additions & 11 deletions src/executable/mlir/Dialect/Python/MLIRGenerator.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -346,7 +346,7 @@ void MLIRGenerator::store_name(std::string_view name,
ASSERT(visibility_map->type == VariablesResolver::Scope::Type::CLASS);
return it->get().visibility;
} else if (auto it = visibility_map->symbol_map.get_visible_symbol(std::string{ name });
it.has_value()) {
it.has_value()) {
return it->get().visibility;
} else {
TODO();
Expand DownExpand Up@@ -434,7 +434,7 @@ MLIRGenerator::MLIRValue *MLIRGenerator::load_name(std::string_view name,
ASSERT(visibility_map->type == VariablesResolver::Scope::Type::CLASS);
return it->get().visibility;
} else if (auto it = visibility_map->symbol_map.get_visible_symbol(std::string{ name });
it.has_value()) {
it.has_value()) {
return it->get().visibility;
} else {
TODO();
Expand DownExpand Up@@ -516,7 +516,7 @@ void MLIRGenerator::delete_name(std::string_view name, const SourceLocation &loc
ASSERT(visibility_map->type == VariablesResolver::Scope::Type::CLASS);
return it->get().visibility;
} else if (auto it = visibility_map->symbol_map.get_visible_symbol(std::string{ name });
it.has_value()) {
it.has_value()) {
return it->get().visibility;
} else {
TODO();
Expand DownExpand Up@@ -1103,7 +1103,7 @@ ast::Value *MLIRGenerator::visit(const ast::Call *node)
}
arg_values.push_back(static_cast<MLIRValue *>(
build_tuple(args, arg_requires_expansion, node->source_location()))
->value);
->value);
}
if (!node->keywords().empty()) { requires_kwargs_expansion = true; }
{
Expand DownExpand Up@@ -1131,7 +1131,7 @@ ast::Value *MLIRGenerator::visit(const ast::Call *node)
}
keyword_values.push_back(static_cast<MLIRValue *>(
build_dict(keys, values, kwarg_requires_expansion, node->source_location()))
->value);
->value);
}
} else {
arg_values.reserve(node->args().size());
Expand DownExpand Up@@ -1584,9 +1584,9 @@ ast::Value *MLIRGenerator::visit(const ast::For *node)
for (const auto &el : node->body()) { el->codegen(this); }
if (m_context.builder().getInsertionBlock()->empty()
|| !m_context.builder()
.getInsertionBlock()
->back()
.hasTrait<mlir::OpTrait::IsTerminator>()) {
.getInsertionBlock()
->back()
.hasTrait<mlir::OpTrait::IsTerminator>()) {
m_context.builder().create<mlir::py::ControlFlowYield>(m_context.builder().getUnknownLoc());
}

Expand DownExpand Up@@ -2738,9 +2738,9 @@ ast::Value *MLIRGenerator::visit(const ast::Try *node)
for (auto el : handler->body()) { el->codegen(this); }
if (m_context.builder().getBlock()->empty()
|| !m_context.builder()
.getBlock()
->back()
.hasTrait<mlir::OpTrait::IsTerminator>()) {
.getBlock()
->back()
.hasTrait<mlir::OpTrait::IsTerminator>()) {
m_context.builder().create<mlir::py::ControlFlowYield>(
loc(m_context.builder(), m_context.filename(), node->source_location()));
}
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .clang-format-ignore
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
src/runtime/frozen/importlib.h
src/runtime/frozen/importlib_external.h
4 changes: 4 additions & 0 deletions .github/workflows/premerge.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,10 @@ jobs:
steps:
- uses: actions/checkout@v4

- uses: actions/setup-python@v3

- uses: pre-commit/action@v3.0.1

- name: Install LLVM
run: |
wget https://apt.llvm.org/llvm.sh
Expand Down
5 changes: 5 additions & 0 deletions .pre-commit-config.yaml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
repos:
- repo: https://github.com/pre-commit/mirrors-clang-format
rev: 'v20.1.8'
hooks:
- id: clang-format
14 changes: 4 additions & 10 deletions src/ast/AST.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,11 +14,8 @@ namespace ast {
AST_NODE_TYPES
#undef __AST_NODE_TYPE

#define __AST_NODE_TYPE(NodeType) \
Value *NodeType::codegen(CodeGenerator *generator) const \
{ \
return generator->visit(this); \
}
#define __AST_NODE_TYPE(NodeType) \
Value *NodeType::codegen(CodeGenerator *generator) const { return generator->visit(this); }
AST_NODE_TYPES
#undef __AST_NODE_TYPE

Expand All@@ -34,11 +31,8 @@ void NodeVisitor::dispatch(ASTNode *node)
#undef __AST_NODE_TYPE
}

#define __AST_NODE_TYPE(NodeType) \
void NodeVisitor::dispatch(NodeType *node) \
{ \
visit(node); \
}
#define __AST_NODE_TYPE(NodeType) \
void NodeVisitor::dispatch(NodeType *node) { visit(node); }
AST_NODE_TYPES
#undef __AST_NODE_TYPE

Expand Down
4 changes: 2 additions & 2 deletions src/ast/optimizers/Optimizers_tests.cpp
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
#include "ConstantFolding.hpp"
#include "ast/AST.hpp"
#include "executable/Program.hpp"
#include "parser/Parser.hpp"
#include "runtime/Value.hpp"
#include "utilities.hpp"
#include "executable/Program.hpp"

#include "gtest/gtest.h"

Expand DownExpand Up@@ -502,7 +502,7 @@ TEST(Optimizer, ConstantFoldIntegerAddition)
expected_ast->emplace(
std::make_shared<Assign>(std::vector<std::shared_ptr<ASTNode>>{ std::make_shared<Name>(
"a", ContextType::STORE, SourceLocation{}) },
std::make_shared<Constant>(BigIntType{2}, SourceLocation{}),
std::make_shared<Constant>(BigIntType{ 2 }, SourceLocation{}),
"",
SourceLocation{}));

Expand Down
4 changes: 2 additions & 2 deletions src/executable/Program.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,8 +2,8 @@
#include "executable/bytecode/codegen/BytecodeGenerator.hpp"
#include "executable/llvm/LLVMGenerator.hpp"
#include "executable/mlir/Dialect/Python/MLIRGenerator.hpp"
#include "utilities.hpp"
#include "mlir/compile.hpp"
#include "utilities.hpp"


Program::Program(std::string &&filename, std::vector<std::string> &&argv)
Expand DownExpand Up@@ -34,4 +34,4 @@ std::shared_ptr<Program> compile(std::shared_ptr<ast::Module> node,
}
ASSERT_NOT_REACHED();
}
}
}// namespace compiler
20 changes: 12 additions & 8 deletions src/executable/bytecode/Bytecode.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,11 +17,11 @@ Bytecode::Bytecode(size_t register_count,
InstructionVector instructions,
std::shared_ptr<Program> program)
: Function(register_count,
locals_count,
stack_size,
function_name,
FunctionExecutionBackend::BYTECODE,
std::move(program)),
locals_count,
stack_size,
function_name,
FunctionExecutionBackend::BYTECODE,
std::move(program)),
m_instructions(std::move(instructions))
{}

Expand DownExpand Up@@ -78,8 +78,12 @@ std::unique_ptr<Bytecode> Bytecode::deserialize(std::span<const uint8_t> &buffer
instructions.push_back(std::move(instruction));
}

return std::make_unique<Bytecode>(
register_count, locals_count, stack_size, function_name, std::move(instructions), std::move(program));
return std::make_unique<Bytecode>(register_count,
locals_count,
stack_size,
function_name,
std::move(instructions),
std::move(program));
}

PyResult<Value> Bytecode::call(VirtualMachine &vm, Interpreter &interpreter) const
Expand DownExpand Up@@ -124,7 +128,7 @@ py::PyResult<py::Value> Bytecode::eval_loop(VirtualMachine &vm, Interpreter &int

const auto end_instruction_it = end();
for (; vm.instruction_pointer() != end_instruction_it;
vm.set_instruction_pointer(std::next(vm.instruction_pointer()))) {
vm.set_instruction_pointer(std::next(vm.instruction_pointer()))) {
ASSERT((*vm.instruction_pointer()).get());
const auto &current_ip = vm.instruction_pointer();
const auto &instruction = *current_ip;
Expand Down
3 changes: 2 additions & 1 deletion src/executable/bytecode/Bytecode.hpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,8 @@ class Bytecode : public Function

std::vector<uint8_t> serialize() const override;

static std::unique_ptr<Bytecode> deserialize(std::span<const uint8_t> &buffer, std::shared_ptr<Program> program);
static std::unique_ptr<Bytecode> deserialize(std::span<const uint8_t> &buffer,
std::shared_ptr<Program> program);

py::PyResult<py::Value> call(VirtualMachine &, Interpreter &) const override;
py::PyResult<py::Value> call_without_setup(VirtualMachine &, Interpreter &) const override;
Expand Down
10 changes: 5 additions & 5 deletions src/executable/bytecode/codegen/BytecodeGenerator.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,9 +34,9 @@
#include "executable/bytecode/instructions/Instructions.hpp"
#include "executable/bytecode/instructions/Jump.hpp"
#include "executable/bytecode/instructions/JumpForward.hpp"
#include "executable/bytecode/instructions/JumpIfExceptionMatch.hpp"
#include "executable/bytecode/instructions/JumpIfFalse.hpp"
#include "executable/bytecode/instructions/JumpIfFalseOrPop.hpp"
#include "executable/bytecode/instructions/JumpIfExceptionMatch.hpp"
#include "executable/bytecode/instructions/JumpIfNotExceptionMatch.hpp"
#include "executable/bytecode/instructions/JumpIfTrue.hpp"
#include "executable/bytecode/instructions/JumpIfTrueOrPop.hpp"
Expand DownExpand Up@@ -277,7 +277,7 @@ void BytecodeGenerator::store_name(const std::string &name, BytecodeValue *src)
ASSERT(visibility->second->type == VariablesResolver::Scope::Type::CLASS);
return *it;
} else if (auto it = visibility->second->symbol_map.get_visible_symbol(name);
it.has_value()) {
it.has_value()) {
return *it;
} else {
TODO();
Expand DownExpand Up@@ -396,7 +396,7 @@ void BytecodeGenerator::delete_var(const std::string &name)
ASSERT(visibility->second->type == VariablesResolver::Scope::Type::CLASS);
return *it;
} else if (auto it = visibility->second->symbol_map.get_visible_symbol(name);
it.has_value()) {
it.has_value()) {
return *it;
} else {
TODO();
Expand DownExpand Up@@ -699,7 +699,7 @@ Value *BytecodeGenerator::generate_function(const FunctionType *node)
idx++;
}
for (size_t idx = node->args()->argument_names().size();
const auto &arg_name : node->args()->kw_only_argument_names()) {
const auto &arg_name : node->args()->kw_only_argument_names()) {
varnames.push_back(arg_name);
ASSERT(symbol_map.get_visible_symbol(arg_name).has_value());
if (std::find(cellvars.begin(), cellvars.end(), arg_name) != cellvars.end()) {
Expand DownExpand Up@@ -950,7 +950,7 @@ Value *BytecodeGenerator::visit(const Lambda *node)
idx++;
}
for (size_t idx = node->args()->argument_names().size();
const auto &arg_name : node->args()->kw_only_argument_names()) {
const auto &arg_name : node->args()->kw_only_argument_names()) {
varnames.push_back(arg_name);
ASSERT(symbol_map.get_visible_symbol(arg_name).has_value());
if (std::find(cellvars.begin(), cellvars.end(), arg_name) != cellvars.end()) {
Expand Down
4 changes: 3 additions & 1 deletion src/executable/bytecode/codegen/VariablesResolver.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,9 @@ using namespace ast;

namespace {
bool captured_by_closure(VariablesResolver::Visibility v)
{ return v == VariablesResolver::Visibility::CELL || v == VariablesResolver::Visibility::FREE; }
{
return v == VariablesResolver::Visibility::CELL || v == VariablesResolver::Visibility::FREE;
}
}// namespace


Expand Down
7 changes: 2 additions & 5 deletions src/executable/bytecode/instructions/BuildList.hpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,14 +9,11 @@ class BuildList final : public Instruction
size_t m_size;

public:
BuildList(Register dst, size_t size)
: m_dst(dst), m_size(size)
{}
BuildList(Register dst, size_t size) : m_dst(dst), m_size(size) {}

std::string to_string() const final
{
return fmt::format(
"BUILD_LIST r{:<3} (size={})", m_dst, m_size);
return fmt::format("BUILD_LIST r{:<3} (size={})", m_dst, m_size);
}

py::PyResult<py::Value> execute(VirtualMachine &, Interpreter &) const final;
Expand Down
2 changes: 1 addition & 1 deletion src/executable/bytecode/instructions/DeleteFast.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@ using namespace py;
PyResult<Value> DeleteFast::execute(VirtualMachine &vm, Interpreter &) const
{
vm.stack_local(m_stack_index) = nullptr;
return Ok(py_none());
return Ok(py_none());
}

std::vector<uint8_t> DeleteFast::serialize() const
Expand Down
4 changes: 1 addition & 3 deletions src/executable/bytecode/instructions/ForIter.hpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,9 +26,7 @@ class ForIter final : public Instruction
m_exit_label(std::move(exit_label))
{}

ForIter(Register dst, Register src, int32_t offset)
: ForIter(dst, src, offset, int32_t{ 0 })
{}
ForIter(Register dst, Register src, int32_t offset) : ForIter(dst, src, offset, int32_t{ 0 }) {}

ForIter(Register dst, Register src, int32_t offset, int32_t body_offset)
: m_dst(dst), m_src(src), m_offset(offset), m_body_offset(body_offset)
Expand Down
2 changes: 1 addition & 1 deletion src/executable/bytecode/instructions/InplaceOp.cpp
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
#include "InplaceOp.hpp"
#include "runtime/PyObject.hpp"
#include "runtime/Value.hpp"
#include "vm/VM.hpp"
#include "runtime/PyObject.hpp"

using namespace py;

Expand Down
2 changes: 1 addition & 1 deletion src/executable/bytecode/instructions/MakeFunction.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ PyResult<Value> MakeFunction::execute(VirtualMachine &vm, Interpreter &interpret
std::vector<Value> default_values;
default_values.reserve(m_defaults_size);
auto *start = vm.sp() - m_defaults_size - m_kw_defaults_size;
while (start != (vm.sp()- m_kw_defaults_size)) {
while (start != (vm.sp()- m_kw_defaults_size)) {
default_values.push_back(*start);
start = std::next(start);
}
Expand Down
5 changes: 4 additions & 1 deletion src/executable/bytecode/instructions/MakeFunction.hpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,10 @@ class MakeFunction : public Instruction
m_kw_defaults_size(kw_defaults_size), m_captures_tuple(std::move(captures_tuple))
{}

std::string to_string() const final { return fmt::format("MAKE_FUNCTION r{} ({})", m_dst, m_name); }
std::string to_string() const final
{
return fmt::format("MAKE_FUNCTION r{} ({})", m_dst, m_name);
}

py::PyResult<py::Value> execute(VirtualMachine &vm, Interpreter &interpreter) const final;

Expand Down
2 changes: 1 addition & 1 deletion src/executable/bytecode/instructions/Push.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@ using namespace py;
PyResult<Value> Push::execute(VirtualMachine &vm, Interpreter &) const
{
auto value = vm.reg(m_source);
vm.push(value);
vm.push(value);
return Ok(py_none());
}

Expand Down
5 changes: 1 addition & 4 deletions src/executable/bytecode/instructions/Push.hpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,10 +8,7 @@ class Push final : public Instruction

public:
Push(Register source) : m_source(source) {}
std::string to_string() const final
{
return fmt::format("PUSH r{:<3}", m_source);
}
std::string to_string() const final { return fmt::format("PUSH r{:<3}", m_source); }
py::PyResult<py::Value> execute(VirtualMachine &vm, Interpreter &interpreter) const final;

void relocate(size_t) final {}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -1819,7 +1819,7 @@ namespace py {
op, BlockRange{ cleanup_block });
}
} else if (auto op = mlir::dyn_cast<mlir::py::ControlFlowYield>(childOp);
op && !op.getKind().has_value()) {
op && !op.getKind().has_value()) {
auto *current = op->getBlock();
auto *next = rewriter.splitBlock(current, op->getIterator());
rewriter.setInsertionPointToEnd(current);
Expand Down
2 changes: 1 addition & 1 deletion src/executable/mlir/Dialect/Python/IR/Ops.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -195,7 +195,7 @@ namespace py {
getHandlers().end(),
[&point](
mlir::Region &handler) { return point.getRegionOrNull() == &handler; });
it != getHandlers().end()) {
it != getHandlers().end()) {
if (std::next(it) != getHandlers().end()) {
it++;
regions.emplace_back(&*it, it->getArguments());
Expand Down
22 changes: 11 additions & 11 deletions src/executable/mlir/Dialect/Python/MLIRGenerator.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -346,7 +346,7 @@ void MLIRGenerator::store_name(std::string_view name,
ASSERT(visibility_map->type == VariablesResolver::Scope::Type::CLASS);
return it->get().visibility;
} else if (auto it = visibility_map->symbol_map.get_visible_symbol(std::string{ name });
it.has_value()) {
it.has_value()) {
return it->get().visibility;
} else {
TODO();
Expand DownExpand Up@@ -434,7 +434,7 @@ MLIRGenerator::MLIRValue *MLIRGenerator::load_name(std::string_view name,
ASSERT(visibility_map->type == VariablesResolver::Scope::Type::CLASS);
return it->get().visibility;
} else if (auto it = visibility_map->symbol_map.get_visible_symbol(std::string{ name });
it.has_value()) {
it.has_value()) {
return it->get().visibility;
} else {
TODO();
Expand DownExpand Up@@ -516,7 +516,7 @@ void MLIRGenerator::delete_name(std::string_view name, const SourceLocation &loc
ASSERT(visibility_map->type == VariablesResolver::Scope::Type::CLASS);
return it->get().visibility;
} else if (auto it = visibility_map->symbol_map.get_visible_symbol(std::string{ name });
it.has_value()) {
it.has_value()) {
return it->get().visibility;
} else {
TODO();
Expand DownExpand Up@@ -1103,7 +1103,7 @@ ast::Value *MLIRGenerator::visit(const ast::Call *node)
}
arg_values.push_back(static_cast<MLIRValue *>(
build_tuple(args, arg_requires_expansion, node->source_location()))
->value);
->value);
}
if (!node->keywords().empty()) { requires_kwargs_expansion = true; }
{
Expand DownExpand Up@@ -1131,7 +1131,7 @@ ast::Value *MLIRGenerator::visit(const ast::Call *node)
}
keyword_values.push_back(static_cast<MLIRValue *>(
build_dict(keys, values, kwarg_requires_expansion, node->source_location()))
->value);
->value);
}
} else {
arg_values.reserve(node->args().size());
Expand DownExpand Up@@ -1584,9 +1584,9 @@ ast::Value *MLIRGenerator::visit(const ast::For *node)
for (const auto &el : node->body()) { el->codegen(this); }
if (m_context.builder().getInsertionBlock()->empty()
|| !m_context.builder()
.getInsertionBlock()
->back()
.hasTrait<mlir::OpTrait::IsTerminator>()) {
.getInsertionBlock()
->back()
.hasTrait<mlir::OpTrait::IsTerminator>()) {
m_context.builder().create<mlir::py::ControlFlowYield>(m_context.builder().getUnknownLoc());
}

Expand DownExpand Up@@ -2738,9 +2738,9 @@ ast::Value *MLIRGenerator::visit(const ast::Try *node)
for (auto el : handler->body()) { el->codegen(this); }
if (m_context.builder().getBlock()->empty()
|| !m_context.builder()
.getBlock()
->back()
.hasTrait<mlir::OpTrait::IsTerminator>()) {
.getBlock()
->back()
.hasTrait<mlir::OpTrait::IsTerminator>()) {
m_context.builder().create<mlir::py::ControlFlowYield>(
loc(m_context.builder(), m_context.filename(), node->source_location()));
}
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .clang-format-ignore
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
src/runtime/frozen/importlib.h
src/runtime/frozen/importlib_external.h
4 changes: 4 additions & 0 deletions .github/workflows/premerge.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,10 @@ jobs:
steps:
- uses: actions/checkout@v4

- uses: actions/setup-python@v3

- uses: pre-commit/action@v3.0.1

- name: Install LLVM
run: |
wget https://apt.llvm.org/llvm.sh
Expand Down
5 changes: 5 additions & 0 deletions .pre-commit-config.yaml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
repos:
- repo: https://github.com/pre-commit/mirrors-clang-format
rev: 'v20.1.8'
hooks:
- id: clang-format
14 changes: 4 additions & 10 deletions src/ast/AST.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,11 +14,8 @@ namespace ast {
AST_NODE_TYPES
#undef __AST_NODE_TYPE

#define __AST_NODE_TYPE(NodeType) \
Value *NodeType::codegen(CodeGenerator *generator) const \
{ \
return generator->visit(this); \
}
#define __AST_NODE_TYPE(NodeType) \
Value *NodeType::codegen(CodeGenerator *generator) const { return generator->visit(this); }
AST_NODE_TYPES
#undef __AST_NODE_TYPE

Expand All@@ -34,11 +31,8 @@ void NodeVisitor::dispatch(ASTNode *node)
#undef __AST_NODE_TYPE
}

#define __AST_NODE_TYPE(NodeType) \
void NodeVisitor::dispatch(NodeType *node) \
{ \
visit(node); \
}
#define __AST_NODE_TYPE(NodeType) \
void NodeVisitor::dispatch(NodeType *node) { visit(node); }
AST_NODE_TYPES
#undef __AST_NODE_TYPE

Expand Down
4 changes: 2 additions & 2 deletions src/ast/optimizers/Optimizers_tests.cpp
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
#include "ConstantFolding.hpp"
#include "ast/AST.hpp"
#include "executable/Program.hpp"
#include "parser/Parser.hpp"
#include "runtime/Value.hpp"
#include "utilities.hpp"
#include "executable/Program.hpp"

#include "gtest/gtest.h"

Expand DownExpand Up@@ -502,7 +502,7 @@ TEST(Optimizer, ConstantFoldIntegerAddition)
expected_ast->emplace(
std::make_shared<Assign>(std::vector<std::shared_ptr<ASTNode>>{ std::make_shared<Name>(
"a", ContextType::STORE, SourceLocation{}) },
std::make_shared<Constant>(BigIntType{2}, SourceLocation{}),
std::make_shared<Constant>(BigIntType{ 2 }, SourceLocation{}),
"",
SourceLocation{}));

Expand Down
4 changes: 2 additions & 2 deletions src/executable/Program.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,8 +2,8 @@
#include "executable/bytecode/codegen/BytecodeGenerator.hpp"
#include "executable/llvm/LLVMGenerator.hpp"
#include "executable/mlir/Dialect/Python/MLIRGenerator.hpp"
#include "utilities.hpp"
#include "mlir/compile.hpp"
#include "utilities.hpp"


Program::Program(std::string &&filename, std::vector<std::string> &&argv)
Expand DownExpand Up@@ -34,4 +34,4 @@ std::shared_ptr<Program> compile(std::shared_ptr<ast::Module> node,
}
ASSERT_NOT_REACHED();
}
}
}// namespace compiler
20 changes: 12 additions & 8 deletions src/executable/bytecode/Bytecode.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,11 +17,11 @@ Bytecode::Bytecode(size_t register_count,
InstructionVector instructions,
std::shared_ptr<Program> program)
: Function(register_count,
locals_count,
stack_size,
function_name,
FunctionExecutionBackend::BYTECODE,
std::move(program)),
locals_count,
stack_size,
function_name,
FunctionExecutionBackend::BYTECODE,
std::move(program)),
m_instructions(std::move(instructions))
{}

Expand DownExpand Up@@ -78,8 +78,12 @@ std::unique_ptr<Bytecode> Bytecode::deserialize(std::span<const uint8_t> &buffer
instructions.push_back(std::move(instruction));
}

return std::make_unique<Bytecode>(
register_count, locals_count, stack_size, function_name, std::move(instructions), std::move(program));
return std::make_unique<Bytecode>(register_count,
locals_count,
stack_size,
function_name,
std::move(instructions),
std::move(program));
}

PyResult<Value> Bytecode::call(VirtualMachine &vm, Interpreter &interpreter) const
Expand DownExpand Up@@ -124,7 +128,7 @@ py::PyResult<py::Value> Bytecode::eval_loop(VirtualMachine &vm, Interpreter &int

const auto end_instruction_it = end();
for (; vm.instruction_pointer() != end_instruction_it;
vm.set_instruction_pointer(std::next(vm.instruction_pointer()))) {
vm.set_instruction_pointer(std::next(vm.instruction_pointer()))) {
ASSERT((*vm.instruction_pointer()).get());
const auto &current_ip = vm.instruction_pointer();
const auto &instruction = *current_ip;
Expand Down
3 changes: 2 additions & 1 deletion src/executable/bytecode/Bytecode.hpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,8 @@ class Bytecode : public Function

std::vector<uint8_t> serialize() const override;

static std::unique_ptr<Bytecode> deserialize(std::span<const uint8_t> &buffer, std::shared_ptr<Program> program);
static std::unique_ptr<Bytecode> deserialize(std::span<const uint8_t> &buffer,
std::shared_ptr<Program> program);

py::PyResult<py::Value> call(VirtualMachine &, Interpreter &) const override;
py::PyResult<py::Value> call_without_setup(VirtualMachine &, Interpreter &) const override;
Expand Down
10 changes: 5 additions & 5 deletions src/executable/bytecode/codegen/BytecodeGenerator.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,9 +34,9 @@
#include "executable/bytecode/instructions/Instructions.hpp"
#include "executable/bytecode/instructions/Jump.hpp"
#include "executable/bytecode/instructions/JumpForward.hpp"
#include "executable/bytecode/instructions/JumpIfExceptionMatch.hpp"
#include "executable/bytecode/instructions/JumpIfFalse.hpp"
#include "executable/bytecode/instructions/JumpIfFalseOrPop.hpp"
#include "executable/bytecode/instructions/JumpIfExceptionMatch.hpp"
#include "executable/bytecode/instructions/JumpIfNotExceptionMatch.hpp"
#include "executable/bytecode/instructions/JumpIfTrue.hpp"
#include "executable/bytecode/instructions/JumpIfTrueOrPop.hpp"
Expand DownExpand Up@@ -277,7 +277,7 @@ void BytecodeGenerator::store_name(const std::string &name, BytecodeValue *src)
ASSERT(visibility->second->type == VariablesResolver::Scope::Type::CLASS);
return *it;
} else if (auto it = visibility->second->symbol_map.get_visible_symbol(name);
it.has_value()) {
it.has_value()) {
return *it;
} else {
TODO();
Expand DownExpand Up@@ -396,7 +396,7 @@ void BytecodeGenerator::delete_var(const std::string &name)
ASSERT(visibility->second->type == VariablesResolver::Scope::Type::CLASS);
return *it;
} else if (auto it = visibility->second->symbol_map.get_visible_symbol(name);
it.has_value()) {
it.has_value()) {
return *it;
} else {
TODO();
Expand DownExpand Up@@ -699,7 +699,7 @@ Value *BytecodeGenerator::generate_function(const FunctionType *node)
idx++;
}
for (size_t idx = node->args()->argument_names().size();
const auto &arg_name : node->args()->kw_only_argument_names()) {
const auto &arg_name : node->args()->kw_only_argument_names()) {
varnames.push_back(arg_name);
ASSERT(symbol_map.get_visible_symbol(arg_name).has_value());
if (std::find(cellvars.begin(), cellvars.end(), arg_name) != cellvars.end()) {
Expand DownExpand Up@@ -950,7 +950,7 @@ Value *BytecodeGenerator::visit(const Lambda *node)
idx++;
}
for (size_t idx = node->args()->argument_names().size();
const auto &arg_name : node->args()->kw_only_argument_names()) {
const auto &arg_name : node->args()->kw_only_argument_names()) {
varnames.push_back(arg_name);
ASSERT(symbol_map.get_visible_symbol(arg_name).has_value());
if (std::find(cellvars.begin(), cellvars.end(), arg_name) != cellvars.end()) {
Expand Down
4 changes: 3 additions & 1 deletion src/executable/bytecode/codegen/VariablesResolver.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,9 @@ using namespace ast;

namespace {
bool captured_by_closure(VariablesResolver::Visibility v)
{ return v == VariablesResolver::Visibility::CELL || v == VariablesResolver::Visibility::FREE; }
{
return v == VariablesResolver::Visibility::CELL || v == VariablesResolver::Visibility::FREE;
}
}// namespace


Expand Down
7 changes: 2 additions & 5 deletions src/executable/bytecode/instructions/BuildList.hpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,14 +9,11 @@ class BuildList final : public Instruction
size_t m_size;

public:
BuildList(Register dst, size_t size)
: m_dst(dst), m_size(size)
{}
BuildList(Register dst, size_t size) : m_dst(dst), m_size(size) {}

std::string to_string() const final
{
return fmt::format(
"BUILD_LIST r{:<3} (size={})", m_dst, m_size);
return fmt::format("BUILD_LIST r{:<3} (size={})", m_dst, m_size);
}

py::PyResult<py::Value> execute(VirtualMachine &, Interpreter &) const final;
Expand Down
2 changes: 1 addition & 1 deletion src/executable/bytecode/instructions/DeleteFast.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@ using namespace py;
PyResult<Value> DeleteFast::execute(VirtualMachine &vm, Interpreter &) const
{
vm.stack_local(m_stack_index) = nullptr;
return Ok(py_none());
return Ok(py_none());
}

std::vector<uint8_t> DeleteFast::serialize() const
Expand Down
4 changes: 1 addition & 3 deletions src/executable/bytecode/instructions/ForIter.hpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,9 +26,7 @@ class ForIter final : public Instruction
m_exit_label(std::move(exit_label))
{}

ForIter(Register dst, Register src, int32_t offset)
: ForIter(dst, src, offset, int32_t{ 0 })
{}
ForIter(Register dst, Register src, int32_t offset) : ForIter(dst, src, offset, int32_t{ 0 }) {}

ForIter(Register dst, Register src, int32_t offset, int32_t body_offset)
: m_dst(dst), m_src(src), m_offset(offset), m_body_offset(body_offset)
Expand Down
2 changes: 1 addition & 1 deletion src/executable/bytecode/instructions/InplaceOp.cpp
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
#include "InplaceOp.hpp"
#include "runtime/PyObject.hpp"
#include "runtime/Value.hpp"
#include "vm/VM.hpp"
#include "runtime/PyObject.hpp"

using namespace py;

Expand Down
2 changes: 1 addition & 1 deletion src/executable/bytecode/instructions/MakeFunction.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ PyResult<Value> MakeFunction::execute(VirtualMachine &vm, Interpreter &interpret
std::vector<Value> default_values;
default_values.reserve(m_defaults_size);
auto *start = vm.sp() - m_defaults_size - m_kw_defaults_size;
while (start != (vm.sp()- m_kw_defaults_size)) {
while (start != (vm.sp()- m_kw_defaults_size)) {
default_values.push_back(*start);
start = std::next(start);
}
Expand Down
5 changes: 4 additions & 1 deletion src/executable/bytecode/instructions/MakeFunction.hpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,10 @@ class MakeFunction : public Instruction
m_kw_defaults_size(kw_defaults_size), m_captures_tuple(std::move(captures_tuple))
{}

std::string to_string() const final { return fmt::format("MAKE_FUNCTION r{} ({})", m_dst, m_name); }
std::string to_string() const final
{
return fmt::format("MAKE_FUNCTION r{} ({})", m_dst, m_name);
}

py::PyResult<py::Value> execute(VirtualMachine &vm, Interpreter &interpreter) const final;

Expand Down
2 changes: 1 addition & 1 deletion src/executable/bytecode/instructions/Push.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@ using namespace py;
PyResult<Value> Push::execute(VirtualMachine &vm, Interpreter &) const
{
auto value = vm.reg(m_source);
vm.push(value);
vm.push(value);
return Ok(py_none());
}

Expand Down
5 changes: 1 addition & 4 deletions src/executable/bytecode/instructions/Push.hpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,10 +8,7 @@ class Push final : public Instruction

public:
Push(Register source) : m_source(source) {}
std::string to_string() const final
{
return fmt::format("PUSH r{:<3}", m_source);
}
std::string to_string() const final { return fmt::format("PUSH r{:<3}", m_source); }
py::PyResult<py::Value> execute(VirtualMachine &vm, Interpreter &interpreter) const final;

void relocate(size_t) final {}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -1819,7 +1819,7 @@ namespace py {
op, BlockRange{ cleanup_block });
}
} else if (auto op = mlir::dyn_cast<mlir::py::ControlFlowYield>(childOp);
op && !op.getKind().has_value()) {
op && !op.getKind().has_value()) {
auto *current = op->getBlock();
auto *next = rewriter.splitBlock(current, op->getIterator());
rewriter.setInsertionPointToEnd(current);
Expand Down
2 changes: 1 addition & 1 deletion src/executable/mlir/Dialect/Python/IR/Ops.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -195,7 +195,7 @@ namespace py {
getHandlers().end(),
[&point](
mlir::Region &handler) { return point.getRegionOrNull() == &handler; });
it != getHandlers().end()) {
it != getHandlers().end()) {
if (std::next(it) != getHandlers().end()) {
it++;
regions.emplace_back(&*it, it->getArguments());
Expand Down
22 changes: 11 additions & 11 deletions src/executable/mlir/Dialect/Python/MLIRGenerator.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -346,7 +346,7 @@ void MLIRGenerator::store_name(std::string_view name,
ASSERT(visibility_map->type == VariablesResolver::Scope::Type::CLASS);
return it->get().visibility;
} else if (auto it = visibility_map->symbol_map.get_visible_symbol(std::string{ name });
it.has_value()) {
it.has_value()) {
return it->get().visibility;
} else {
TODO();
Expand DownExpand Up@@ -434,7 +434,7 @@ MLIRGenerator::MLIRValue *MLIRGenerator::load_name(std::string_view name,
ASSERT(visibility_map->type == VariablesResolver::Scope::Type::CLASS);
return it->get().visibility;
} else if (auto it = visibility_map->symbol_map.get_visible_symbol(std::string{ name });
it.has_value()) {
it.has_value()) {
return it->get().visibility;
} else {
TODO();
Expand DownExpand Up@@ -516,7 +516,7 @@ void MLIRGenerator::delete_name(std::string_view name, const SourceLocation &loc
ASSERT(visibility_map->type == VariablesResolver::Scope::Type::CLASS);
return it->get().visibility;
} else if (auto it = visibility_map->symbol_map.get_visible_symbol(std::string{ name });
it.has_value()) {
it.has_value()) {
return it->get().visibility;
} else {
TODO();
Expand DownExpand Up@@ -1103,7 +1103,7 @@ ast::Value *MLIRGenerator::visit(const ast::Call *node)
}
arg_values.push_back(static_cast<MLIRValue *>(
build_tuple(args, arg_requires_expansion, node->source_location()))
->value);
->value);
}
if (!node->keywords().empty()) { requires_kwargs_expansion = true; }
{
Expand DownExpand Up@@ -1131,7 +1131,7 @@ ast::Value *MLIRGenerator::visit(const ast::Call *node)
}
keyword_values.push_back(static_cast<MLIRValue *>(
build_dict(keys, values, kwarg_requires_expansion, node->source_location()))
->value);
->value);
}
} else {
arg_values.reserve(node->args().size());
Expand DownExpand Up@@ -1584,9 +1584,9 @@ ast::Value *MLIRGenerator::visit(const ast::For *node)
for (const auto &el : node->body()) { el->codegen(this); }
if (m_context.builder().getInsertionBlock()->empty()
|| !m_context.builder()
.getInsertionBlock()
->back()
.hasTrait<mlir::OpTrait::IsTerminator>()) {
.getInsertionBlock()
->back()
.hasTrait<mlir::OpTrait::IsTerminator>()) {
m_context.builder().create<mlir::py::ControlFlowYield>(m_context.builder().getUnknownLoc());
}

Expand DownExpand Up@@ -2738,9 +2738,9 @@ ast::Value *MLIRGenerator::visit(const ast::Try *node)
for (auto el : handler->body()) { el->codegen(this); }
if (m_context.builder().getBlock()->empty()
|| !m_context.builder()
.getBlock()
->back()
.hasTrait<mlir::OpTrait::IsTerminator>()) {
.getBlock()
->back()
.hasTrait<mlir::OpTrait::IsTerminator>()) {
m_context.builder().create<mlir::py::ControlFlowYield>(
loc(m_context.builder(), m_context.filename(), node->source_location()));
}
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .clang-format-ignore
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
src/runtime/frozen/importlib.h
src/runtime/frozen/importlib_external.h
4 changes: 4 additions & 0 deletions .github/workflows/premerge.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,10 @@ jobs:
steps:
- uses: actions/checkout@v4

- uses: actions/setup-python@v3

- uses: pre-commit/action@v3.0.1

- name: Install LLVM
run: |
wget https://apt.llvm.org/llvm.sh
Expand Down
5 changes: 5 additions & 0 deletions .pre-commit-config.yaml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
repos:
- repo: https://github.com/pre-commit/mirrors-clang-format
rev: 'v20.1.8'
hooks:
- id: clang-format
14 changes: 4 additions & 10 deletions src/ast/AST.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,11 +14,8 @@ namespace ast {
AST_NODE_TYPES
#undef __AST_NODE_TYPE

#define __AST_NODE_TYPE(NodeType) \
Value *NodeType::codegen(CodeGenerator *generator) const \
{ \
return generator->visit(this); \
}
#define __AST_NODE_TYPE(NodeType) \
Value *NodeType::codegen(CodeGenerator *generator) const { return generator->visit(this); }
AST_NODE_TYPES
#undef __AST_NODE_TYPE

Expand All@@ -34,11 +31,8 @@ void NodeVisitor::dispatch(ASTNode *node)
#undef __AST_NODE_TYPE
}

#define __AST_NODE_TYPE(NodeType) \
void NodeVisitor::dispatch(NodeType *node) \
{ \
visit(node); \
}
#define __AST_NODE_TYPE(NodeType) \
void NodeVisitor::dispatch(NodeType *node) { visit(node); }
AST_NODE_TYPES
#undef __AST_NODE_TYPE

Expand Down
4 changes: 2 additions & 2 deletions src/ast/optimizers/Optimizers_tests.cpp
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
#include "ConstantFolding.hpp"
#include "ast/AST.hpp"
#include "executable/Program.hpp"
#include "parser/Parser.hpp"
#include "runtime/Value.hpp"
#include "utilities.hpp"
#include "executable/Program.hpp"

#include "gtest/gtest.h"

Expand DownExpand Up@@ -502,7 +502,7 @@ TEST(Optimizer, ConstantFoldIntegerAddition)
expected_ast->emplace(
std::make_shared<Assign>(std::vector<std::shared_ptr<ASTNode>>{ std::make_shared<Name>(
"a", ContextType::STORE, SourceLocation{}) },
std::make_shared<Constant>(BigIntType{2}, SourceLocation{}),
std::make_shared<Constant>(BigIntType{ 2 }, SourceLocation{}),
"",
SourceLocation{}));

Expand Down
4 changes: 2 additions & 2 deletions src/executable/Program.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,8 +2,8 @@
#include "executable/bytecode/codegen/BytecodeGenerator.hpp"
#include "executable/llvm/LLVMGenerator.hpp"
#include "executable/mlir/Dialect/Python/MLIRGenerator.hpp"
#include "utilities.hpp"
#include "mlir/compile.hpp"
#include "utilities.hpp"


Program::Program(std::string &&filename, std::vector<std::string> &&argv)
Expand DownExpand Up@@ -34,4 +34,4 @@ std::shared_ptr<Program> compile(std::shared_ptr<ast::Module> node,
}
ASSERT_NOT_REACHED();
}
}
}// namespace compiler
20 changes: 12 additions & 8 deletions src/executable/bytecode/Bytecode.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,11 +17,11 @@ Bytecode::Bytecode(size_t register_count,
InstructionVector instructions,
std::shared_ptr<Program> program)
: Function(register_count,
locals_count,
stack_size,
function_name,
FunctionExecutionBackend::BYTECODE,
std::move(program)),
locals_count,
stack_size,
function_name,
FunctionExecutionBackend::BYTECODE,
std::move(program)),
m_instructions(std::move(instructions))
{}

Expand DownExpand Up@@ -78,8 +78,12 @@ std::unique_ptr<Bytecode> Bytecode::deserialize(std::span<const uint8_t> &buffer
instructions.push_back(std::move(instruction));
}

return std::make_unique<Bytecode>(
register_count, locals_count, stack_size, function_name, std::move(instructions), std::move(program));
return std::make_unique<Bytecode>(register_count,
locals_count,
stack_size,
function_name,
std::move(instructions),
std::move(program));
}

PyResult<Value> Bytecode::call(VirtualMachine &vm, Interpreter &interpreter) const
Expand DownExpand Up@@ -124,7 +128,7 @@ py::PyResult<py::Value> Bytecode::eval_loop(VirtualMachine &vm, Interpreter &int

const auto end_instruction_it = end();
for (; vm.instruction_pointer() != end_instruction_it;
vm.set_instruction_pointer(std::next(vm.instruction_pointer()))) {
vm.set_instruction_pointer(std::next(vm.instruction_pointer()))) {
ASSERT((*vm.instruction_pointer()).get());
const auto &current_ip = vm.instruction_pointer();
const auto &instruction = *current_ip;
Expand Down
3 changes: 2 additions & 1 deletion src/executable/bytecode/Bytecode.hpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,8 @@ class Bytecode : public Function

std::vector<uint8_t> serialize() const override;

static std::unique_ptr<Bytecode> deserialize(std::span<const uint8_t> &buffer, std::shared_ptr<Program> program);
static std::unique_ptr<Bytecode> deserialize(std::span<const uint8_t> &buffer,
std::shared_ptr<Program> program);

py::PyResult<py::Value> call(VirtualMachine &, Interpreter &) const override;
py::PyResult<py::Value> call_without_setup(VirtualMachine &, Interpreter &) const override;
Expand Down
10 changes: 5 additions & 5 deletions src/executable/bytecode/codegen/BytecodeGenerator.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,9 +34,9 @@
#include "executable/bytecode/instructions/Instructions.hpp"
#include "executable/bytecode/instructions/Jump.hpp"
#include "executable/bytecode/instructions/JumpForward.hpp"
#include "executable/bytecode/instructions/JumpIfExceptionMatch.hpp"
#include "executable/bytecode/instructions/JumpIfFalse.hpp"
#include "executable/bytecode/instructions/JumpIfFalseOrPop.hpp"
#include "executable/bytecode/instructions/JumpIfExceptionMatch.hpp"
#include "executable/bytecode/instructions/JumpIfNotExceptionMatch.hpp"
#include "executable/bytecode/instructions/JumpIfTrue.hpp"
#include "executable/bytecode/instructions/JumpIfTrueOrPop.hpp"
Expand DownExpand Up@@ -277,7 +277,7 @@ void BytecodeGenerator::store_name(const std::string &name, BytecodeValue *src)
ASSERT(visibility->second->type == VariablesResolver::Scope::Type::CLASS);
return *it;
} else if (auto it = visibility->second->symbol_map.get_visible_symbol(name);
it.has_value()) {
it.has_value()) {
return *it;
} else {
TODO();
Expand DownExpand Up@@ -396,7 +396,7 @@ void BytecodeGenerator::delete_var(const std::string &name)
ASSERT(visibility->second->type == VariablesResolver::Scope::Type::CLASS);
return *it;
} else if (auto it = visibility->second->symbol_map.get_visible_symbol(name);
it.has_value()) {
it.has_value()) {
return *it;
} else {
TODO();
Expand DownExpand Up@@ -699,7 +699,7 @@ Value *BytecodeGenerator::generate_function(const FunctionType *node)
idx++;
}
for (size_t idx = node->args()->argument_names().size();
const auto &arg_name : node->args()->kw_only_argument_names()) {
const auto &arg_name : node->args()->kw_only_argument_names()) {
varnames.push_back(arg_name);
ASSERT(symbol_map.get_visible_symbol(arg_name).has_value());
if (std::find(cellvars.begin(), cellvars.end(), arg_name) != cellvars.end()) {
Expand DownExpand Up@@ -950,7 +950,7 @@ Value *BytecodeGenerator::visit(const Lambda *node)
idx++;
}
for (size_t idx = node->args()->argument_names().size();
const auto &arg_name : node->args()->kw_only_argument_names()) {
const auto &arg_name : node->args()->kw_only_argument_names()) {
varnames.push_back(arg_name);
ASSERT(symbol_map.get_visible_symbol(arg_name).has_value());
if (std::find(cellvars.begin(), cellvars.end(), arg_name) != cellvars.end()) {
Expand Down
4 changes: 3 additions & 1 deletion src/executable/bytecode/codegen/VariablesResolver.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,9 @@ using namespace ast;

namespace {
bool captured_by_closure(VariablesResolver::Visibility v)
{ return v == VariablesResolver::Visibility::CELL || v == VariablesResolver::Visibility::FREE; }
{
return v == VariablesResolver::Visibility::CELL || v == VariablesResolver::Visibility::FREE;
}
}// namespace


Expand Down
7 changes: 2 additions & 5 deletions src/executable/bytecode/instructions/BuildList.hpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,14 +9,11 @@ class BuildList final : public Instruction
size_t m_size;

public:
BuildList(Register dst, size_t size)
: m_dst(dst), m_size(size)
{}
BuildList(Register dst, size_t size) : m_dst(dst), m_size(size) {}

std::string to_string() const final
{
return fmt::format(
"BUILD_LIST r{:<3} (size={})", m_dst, m_size);
return fmt::format("BUILD_LIST r{:<3} (size={})", m_dst, m_size);
}

py::PyResult<py::Value> execute(VirtualMachine &, Interpreter &) const final;
Expand Down
2 changes: 1 addition & 1 deletion src/executable/bytecode/instructions/DeleteFast.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@ using namespace py;
PyResult<Value> DeleteFast::execute(VirtualMachine &vm, Interpreter &) const
{
vm.stack_local(m_stack_index) = nullptr;
return Ok(py_none());
return Ok(py_none());
}

std::vector<uint8_t> DeleteFast::serialize() const
Expand Down
4 changes: 1 addition & 3 deletions src/executable/bytecode/instructions/ForIter.hpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,9 +26,7 @@ class ForIter final : public Instruction
m_exit_label(std::move(exit_label))
{}

ForIter(Register dst, Register src, int32_t offset)
: ForIter(dst, src, offset, int32_t{ 0 })
{}
ForIter(Register dst, Register src, int32_t offset) : ForIter(dst, src, offset, int32_t{ 0 }) {}

ForIter(Register dst, Register src, int32_t offset, int32_t body_offset)
: m_dst(dst), m_src(src), m_offset(offset), m_body_offset(body_offset)
Expand Down
2 changes: 1 addition & 1 deletion src/executable/bytecode/instructions/InplaceOp.cpp
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
#include "InplaceOp.hpp"
#include "runtime/PyObject.hpp"
#include "runtime/Value.hpp"
#include "vm/VM.hpp"
#include "runtime/PyObject.hpp"

using namespace py;

Expand Down
2 changes: 1 addition & 1 deletion src/executable/bytecode/instructions/MakeFunction.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ PyResult<Value> MakeFunction::execute(VirtualMachine &vm, Interpreter &interpret
std::vector<Value> default_values;
default_values.reserve(m_defaults_size);
auto *start = vm.sp() - m_defaults_size - m_kw_defaults_size;
while (start != (vm.sp()- m_kw_defaults_size)) {
while (start != (vm.sp()- m_kw_defaults_size)) {
default_values.push_back(*start);
start = std::next(start);
}
Expand Down
5 changes: 4 additions & 1 deletion src/executable/bytecode/instructions/MakeFunction.hpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,10 @@ class MakeFunction : public Instruction
m_kw_defaults_size(kw_defaults_size), m_captures_tuple(std::move(captures_tuple))
{}

std::string to_string() const final { return fmt::format("MAKE_FUNCTION r{} ({})", m_dst, m_name); }
std::string to_string() const final
{
return fmt::format("MAKE_FUNCTION r{} ({})", m_dst, m_name);
}

py::PyResult<py::Value> execute(VirtualMachine &vm, Interpreter &interpreter) const final;

Expand Down
2 changes: 1 addition & 1 deletion src/executable/bytecode/instructions/Push.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@ using namespace py;
PyResult<Value> Push::execute(VirtualMachine &vm, Interpreter &) const
{
auto value = vm.reg(m_source);
vm.push(value);
vm.push(value);
return Ok(py_none());
}

Expand Down
5 changes: 1 addition & 4 deletions src/executable/bytecode/instructions/Push.hpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,10 +8,7 @@ class Push final : public Instruction

public:
Push(Register source) : m_source(source) {}
std::string to_string() const final
{
return fmt::format("PUSH r{:<3}", m_source);
}
std::string to_string() const final { return fmt::format("PUSH r{:<3}", m_source); }
py::PyResult<py::Value> execute(VirtualMachine &vm, Interpreter &interpreter) const final;

void relocate(size_t) final {}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -1819,7 +1819,7 @@ namespace py {
op, BlockRange{ cleanup_block });
}
} else if (auto op = mlir::dyn_cast<mlir::py::ControlFlowYield>(childOp);
op && !op.getKind().has_value()) {
op && !op.getKind().has_value()) {
auto *current = op->getBlock();
auto *next = rewriter.splitBlock(current, op->getIterator());
rewriter.setInsertionPointToEnd(current);
Expand Down
2 changes: 1 addition & 1 deletion src/executable/mlir/Dialect/Python/IR/Ops.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -195,7 +195,7 @@ namespace py {
getHandlers().end(),
[&point](
mlir::Region &handler) { return point.getRegionOrNull() == &handler; });
it != getHandlers().end()) {
it != getHandlers().end()) {
if (std::next(it) != getHandlers().end()) {
it++;
regions.emplace_back(&*it, it->getArguments());
Expand Down
22 changes: 11 additions & 11 deletions src/executable/mlir/Dialect/Python/MLIRGenerator.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -346,7 +346,7 @@ void MLIRGenerator::store_name(std::string_view name,
ASSERT(visibility_map->type == VariablesResolver::Scope::Type::CLASS);
return it->get().visibility;
} else if (auto it = visibility_map->symbol_map.get_visible_symbol(std::string{ name });
it.has_value()) {
it.has_value()) {
return it->get().visibility;
} else {
TODO();
Expand DownExpand Up@@ -434,7 +434,7 @@ MLIRGenerator::MLIRValue *MLIRGenerator::load_name(std::string_view name,
ASSERT(visibility_map->type == VariablesResolver::Scope::Type::CLASS);
return it->get().visibility;
} else if (auto it = visibility_map->symbol_map.get_visible_symbol(std::string{ name });
it.has_value()) {
it.has_value()) {
return it->get().visibility;
} else {
TODO();
Expand DownExpand Up@@ -516,7 +516,7 @@ void MLIRGenerator::delete_name(std::string_view name, const SourceLocation &loc
ASSERT(visibility_map->type == VariablesResolver::Scope::Type::CLASS);
return it->get().visibility;
} else if (auto it = visibility_map->symbol_map.get_visible_symbol(std::string{ name });
it.has_value()) {
it.has_value()) {
return it->get().visibility;
} else {
TODO();
Expand DownExpand Up@@ -1103,7 +1103,7 @@ ast::Value *MLIRGenerator::visit(const ast::Call *node)
}
arg_values.push_back(static_cast<MLIRValue *>(
build_tuple(args, arg_requires_expansion, node->source_location()))
->value);
->value);
}
if (!node->keywords().empty()) { requires_kwargs_expansion = true; }
{
Expand DownExpand Up@@ -1131,7 +1131,7 @@ ast::Value *MLIRGenerator::visit(const ast::Call *node)
}
keyword_values.push_back(static_cast<MLIRValue *>(
build_dict(keys, values, kwarg_requires_expansion, node->source_location()))
->value);
->value);
}
} else {
arg_values.reserve(node->args().size());
Expand DownExpand Up@@ -1584,9 +1584,9 @@ ast::Value *MLIRGenerator::visit(const ast::For *node)
for (const auto &el : node->body()) { el->codegen(this); }
if (m_context.builder().getInsertionBlock()->empty()
|| !m_context.builder()
.getInsertionBlock()
->back()
.hasTrait<mlir::OpTrait::IsTerminator>()) {
.getInsertionBlock()
->back()
.hasTrait<mlir::OpTrait::IsTerminator>()) {
m_context.builder().create<mlir::py::ControlFlowYield>(m_context.builder().getUnknownLoc());
}

Expand DownExpand Up@@ -2738,9 +2738,9 @@ ast::Value *MLIRGenerator::visit(const ast::Try *node)
for (auto el : handler->body()) { el->codegen(this); }
if (m_context.builder().getBlock()->empty()
|| !m_context.builder()
.getBlock()
->back()
.hasTrait<mlir::OpTrait::IsTerminator>()) {
.getBlock()
->back()
.hasTrait<mlir::OpTrait::IsTerminator>()) {
m_context.builder().create<mlir::py::ControlFlowYield>(
loc(m_context.builder(), m_context.filename(), node->source_location()));
}
Expand Down
Loading