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
33 changes: 33 additions & 0 deletions .github/workflows/premerge.yml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
name: Premerge

on:
pull_request:
branches: [ "main" ]

env:
BUILD_TYPE: Release

jobs:
build:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4

- name: Install LLVM
run: |
wget https://apt.llvm.org/llvm.sh
chmod +x llvm.sh
sudo ./llvm.sh 20
sudo apt install libmlir-20-dev mlir-20-tools

- name: Configure CMake
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DENABLE_CACHE=OFF

- name: Build
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}

- name: Test
working-directory: ${{github.workspace}}/build
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --target test

2 changes: 1 addition & 1 deletion integration/program.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -88,7 +88,7 @@ template<typename T> void assert_interpreter_object_value(std::string name, T ex
auto key_ = p->operator[](0);
auto value_ = p->operator[](1);
// only support string keys for now
ASSERT(key_.unwrap())
ASSERT(key_.unwrap());
auto key_string = as<PyString>(key_.unwrap())->value();
check_value(value_.unwrap(), expected_value[key_string]);
}
Expand Down
2 changes: 1 addition & 1 deletion src/CMakeLists.txt
Original file line numberDiff line numberDiff line change
Expand Up@@ -298,7 +298,7 @@ target_link_libraries(python-cpp
)

# LLVM backend
find_package(LLVM CONFIG 20.0)
find_package(LLVM CONFIG 20.1)
if(ENABLE_LLVM_BACKEND AND NOT LLVM_FOUND)
message(FATAL_ERROR "Could not find LLVM in the local environment")
elseif(ENABLE_LLVM_BACKEND AND LLVM_FOUND)
Expand Down
4 changes: 2 additions & 2 deletions src/ast/AST.hpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -1187,7 +1187,7 @@ class Subscript : public ASTNode
const std::shared_ptr<ASTNode> &value() const { return m_value; }
const SliceType &slice() const
{
ASSERT(m_slice)
ASSERT(m_slice);
return *m_slice;
}
ContextType context() const { return m_ctx; }
Expand DownExpand Up@@ -1304,7 +1304,7 @@ class Assert : public ASTNode
: ASTNode(ASTNodeType::Assert, source_location), m_test(std::move(test)),
m_msg(std::move(msg))
{
ASSERT(m_test)
ASSERT(m_test);
}

const std::shared_ptr<ASTNode> &test() const { return m_test; }
Expand Down
4 changes: 2 additions & 2 deletions src/ast/optimizers/ConstantFolding.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,8 +11,8 @@ namespace optimizer {
&& node->rhs()->node_type() == ASTNodeType::Constant) {
const auto &lhs = as<Constant>(node->lhs())->value();
const auto &rhs = as<Constant>(node->rhs())->value();
ASSERT(lhs)
ASSERT(rhs)
ASSERT(lhs);
ASSERT(rhs);
switch (node->op_type()) {
case BinaryOpType::PLUS: {
auto result = std::visit(
Expand Down
2 changes: 1 addition & 1 deletion src/executable/Label.hpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ class Label
protected:
void set_position(int64_t position) const
{
ASSERT(!m_position.has_value())
ASSERT(!m_position.has_value());
m_position = position;
}

Expand Down
4 changes: 2 additions & 2 deletions src/executable/Mangler.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -62,8 +62,8 @@ class DefaultMangler : public Mangler

std::string_view mangled_class{ mangled_name.c_str() + start, end - start };

ASSERT(mangled_class.starts_with("__class__"))
ASSERT(mangled_class.ends_with("__"))
ASSERT(mangled_class.starts_with("__class__"));
ASSERT(mangled_class.ends_with("__"));

// extract name from __class__{}__
return std::string{ mangled_class.begin() + 9, mangled_class.end() - 2 };
Expand Down
8 changes: 4 additions & 4 deletions src/executable/bytecode/Bytecode.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -125,14 +125,14 @@ 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()))) {
ASSERT((*vm.instruction_pointer()).get())
ASSERT((*vm.instruction_pointer()).get());
const auto &current_ip = vm.instruction_pointer();
const auto &instruction = *current_ip;
spdlog::debug("{} {}", (void *)instruction.get(), instruction->to_string());
auto result = instruction->execute(vm, vm.interpreter());
// we left the current stack frame in the previous instruction
if (vm.stack().size() != stack_depth) {
ASSERT(result.is_ok())
ASSERT(result.is_ok());
return result;
}
// vm.dump();
Expand All@@ -143,7 +143,7 @@ py::PyResult<py::Value> Bytecode::eval_loop(VirtualMachine &vm, Interpreter &int
PyTraceback *tb_next = exception->traceback();
auto traceback =
PyTraceback::create(interpreter.execution_frame(), tb_lasti, tb_lineno, tb_next);
ASSERT(traceback.is_ok())
ASSERT(traceback.is_ok());
exception->set_traceback(traceback.unwrap());

interpreter.raise_exception(exception);
Expand All@@ -165,6 +165,6 @@ py::PyResult<py::Value> Bytecode::eval_loop(VirtualMachine &vm, Interpreter &int
}
}

ASSERT(value.has_value())
ASSERT(value.has_value());
return Ok(*value);
}
12 changes: 6 additions & 6 deletions src/executable/bytecode/BytecodeProgram.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -104,14 +104,14 @@ size_t BytecodeProgram::main_stack_size() const { return m_main_function->regist
InstructionVector::const_iterator BytecodeProgram::begin() const
{
// FIXME: assumes all functions are bytecode
ASSERT(m_main_function->function()->backend() == FunctionExecutionBackend::BYTECODE)
ASSERT(m_main_function->function()->backend() == FunctionExecutionBackend::BYTECODE);
return static_cast<Bytecode *>(m_main_function->function().get())->begin();
}

InstructionVector::const_iterator BytecodeProgram::end() const
{
// FIXME: assumes all functions are bytecode
ASSERT(m_main_function->function()->backend() == FunctionExecutionBackend::BYTECODE)
ASSERT(m_main_function->function()->backend() == FunctionExecutionBackend::BYTECODE);
return static_cast<Bytecode *>(m_main_function->function().get())->end();
}

Expand All@@ -136,7 +136,7 @@ int BytecodeProgram::execute(VirtualMachine *vm)

if (result.is_err()) {
auto *exception = interpreter.execution_frame()->pop_exception();
ASSERT(exception == result.unwrap_err())
ASSERT(exception == result.unwrap_err());
std::cout << exception->format_traceback() << std::endl;

// if (interpreter.execution_frame()->exception_info().has_value()) {
Expand DownExpand Up@@ -214,7 +214,7 @@ std::vector<uint8_t> BytecodeProgram::serialize() const
}

// TODO: Add support to serialize functions from different backends
ASSERT(m_backends.empty())
ASSERT(m_backends.empty());

return result;
}
Expand All@@ -226,14 +226,14 @@ std::shared_ptr<BytecodeProgram> BytecodeProgram::deserialize(const std::vector<

auto span = std::span{ buffer };
auto deserialized_result = PyCode::deserialize(span, program);
ASSERT(deserialized_result.first.is_ok())
ASSERT(deserialized_result.first.is_ok());
program->m_main_function = deserialized_result.first.unwrap();
spdlog::debug(
"Deserialized main function:\n{}\n\n", program->m_main_function->function()->to_string());

while (!span.empty()) {
deserialized_result = PyCode::deserialize(span, program);
ASSERT(deserialized_result.first.is_ok())
ASSERT(deserialized_result.first.is_ok());
program->m_functions.push_back(deserialized_result.first.unwrap());
spdlog::debug("Deserialized function {}:\n{}\n\n",
program->m_functions.back()->function()->function_name(),
Expand Down
2 changes: 1 addition & 1 deletion src/executable/bytecode/BytecodeProgram_tests.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ std::shared_ptr<BytecodeProgram> generate_bytecode(std::string_view program)
p.parse();

auto module = as<ast::Module>(p.module());
ASSERT(module)
ASSERT(module);

return std::static_pointer_cast<BytecodeProgram>(compiler::compile(
module, {}, compiler::Backend::BYTECODE_GENERATOR, compiler::OptimizationLevel::None));
Expand Down
2 changes: 1 addition & 1 deletion src/executable/bytecode/Bytecode_tests.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@
// p.parse();

// auto module = as<ast::Module>(p.module());
// ASSERT(module)
// ASSERT(module);

// auto bytecode =
// codegen::BytecodeGenerator::compile(module, {}, compiler::OptimizationLevel::None);
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
33 changes: 33 additions & 0 deletions .github/workflows/premerge.yml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
name: Premerge

on:
pull_request:
branches: [ "main" ]

env:
BUILD_TYPE: Release

jobs:
build:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4

- name: Install LLVM
run: |
wget https://apt.llvm.org/llvm.sh
chmod +x llvm.sh
sudo ./llvm.sh 20
sudo apt install libmlir-20-dev mlir-20-tools

- name: Configure CMake
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DENABLE_CACHE=OFF

- name: Build
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}

- name: Test
working-directory: ${{github.workspace}}/build
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --target test

2 changes: 1 addition & 1 deletion integration/program.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -88,7 +88,7 @@ template<typename T> void assert_interpreter_object_value(std::string name, T ex
auto key_ = p->operator[](0);
auto value_ = p->operator[](1);
// only support string keys for now
ASSERT(key_.unwrap())
ASSERT(key_.unwrap());
auto key_string = as<PyString>(key_.unwrap())->value();
check_value(value_.unwrap(), expected_value[key_string]);
}
Expand Down
2 changes: 1 addition & 1 deletion src/CMakeLists.txt
Original file line numberDiff line numberDiff line change
Expand Up@@ -298,7 +298,7 @@ target_link_libraries(python-cpp
)

# LLVM backend
find_package(LLVM CONFIG 20.0)
find_package(LLVM CONFIG 20.1)
if(ENABLE_LLVM_BACKEND AND NOT LLVM_FOUND)
message(FATAL_ERROR "Could not find LLVM in the local environment")
elseif(ENABLE_LLVM_BACKEND AND LLVM_FOUND)
Expand Down
4 changes: 2 additions & 2 deletions src/ast/AST.hpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -1187,7 +1187,7 @@ class Subscript : public ASTNode
const std::shared_ptr<ASTNode> &value() const { return m_value; }
const SliceType &slice() const
{
ASSERT(m_slice)
ASSERT(m_slice);
return *m_slice;
}
ContextType context() const { return m_ctx; }
Expand DownExpand Up@@ -1304,7 +1304,7 @@ class Assert : public ASTNode
: ASTNode(ASTNodeType::Assert, source_location), m_test(std::move(test)),
m_msg(std::move(msg))
{
ASSERT(m_test)
ASSERT(m_test);
}

const std::shared_ptr<ASTNode> &test() const { return m_test; }
Expand Down
4 changes: 2 additions & 2 deletions src/ast/optimizers/ConstantFolding.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,8 +11,8 @@ namespace optimizer {
&& node->rhs()->node_type() == ASTNodeType::Constant) {
const auto &lhs = as<Constant>(node->lhs())->value();
const auto &rhs = as<Constant>(node->rhs())->value();
ASSERT(lhs)
ASSERT(rhs)
ASSERT(lhs);
ASSERT(rhs);
switch (node->op_type()) {
case BinaryOpType::PLUS: {
auto result = std::visit(
Expand Down
2 changes: 1 addition & 1 deletion src/executable/Label.hpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ class Label
protected:
void set_position(int64_t position) const
{
ASSERT(!m_position.has_value())
ASSERT(!m_position.has_value());
m_position = position;
}

Expand Down
4 changes: 2 additions & 2 deletions src/executable/Mangler.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -62,8 +62,8 @@ class DefaultMangler : public Mangler

std::string_view mangled_class{ mangled_name.c_str() + start, end - start };

ASSERT(mangled_class.starts_with("__class__"))
ASSERT(mangled_class.ends_with("__"))
ASSERT(mangled_class.starts_with("__class__"));
ASSERT(mangled_class.ends_with("__"));

// extract name from __class__{}__
return std::string{ mangled_class.begin() + 9, mangled_class.end() - 2 };
Expand Down
8 changes: 4 additions & 4 deletions src/executable/bytecode/Bytecode.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -125,14 +125,14 @@ 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()))) {
ASSERT((*vm.instruction_pointer()).get())
ASSERT((*vm.instruction_pointer()).get());
const auto &current_ip = vm.instruction_pointer();
const auto &instruction = *current_ip;
spdlog::debug("{} {}", (void *)instruction.get(), instruction->to_string());
auto result = instruction->execute(vm, vm.interpreter());
// we left the current stack frame in the previous instruction
if (vm.stack().size() != stack_depth) {
ASSERT(result.is_ok())
ASSERT(result.is_ok());
return result;
}
// vm.dump();
Expand All@@ -143,7 +143,7 @@ py::PyResult<py::Value> Bytecode::eval_loop(VirtualMachine &vm, Interpreter &int
PyTraceback *tb_next = exception->traceback();
auto traceback =
PyTraceback::create(interpreter.execution_frame(), tb_lasti, tb_lineno, tb_next);
ASSERT(traceback.is_ok())
ASSERT(traceback.is_ok());
exception->set_traceback(traceback.unwrap());

interpreter.raise_exception(exception);
Expand All@@ -165,6 +165,6 @@ py::PyResult<py::Value> Bytecode::eval_loop(VirtualMachine &vm, Interpreter &int
}
}

ASSERT(value.has_value())
ASSERT(value.has_value());
return Ok(*value);
}
12 changes: 6 additions & 6 deletions src/executable/bytecode/BytecodeProgram.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -104,14 +104,14 @@ size_t BytecodeProgram::main_stack_size() const { return m_main_function->regist
InstructionVector::const_iterator BytecodeProgram::begin() const
{
// FIXME: assumes all functions are bytecode
ASSERT(m_main_function->function()->backend() == FunctionExecutionBackend::BYTECODE)
ASSERT(m_main_function->function()->backend() == FunctionExecutionBackend::BYTECODE);
return static_cast<Bytecode *>(m_main_function->function().get())->begin();
}

InstructionVector::const_iterator BytecodeProgram::end() const
{
// FIXME: assumes all functions are bytecode
ASSERT(m_main_function->function()->backend() == FunctionExecutionBackend::BYTECODE)
ASSERT(m_main_function->function()->backend() == FunctionExecutionBackend::BYTECODE);
return static_cast<Bytecode *>(m_main_function->function().get())->end();
}

Expand All@@ -136,7 +136,7 @@ int BytecodeProgram::execute(VirtualMachine *vm)

if (result.is_err()) {
auto *exception = interpreter.execution_frame()->pop_exception();
ASSERT(exception == result.unwrap_err())
ASSERT(exception == result.unwrap_err());
std::cout << exception->format_traceback() << std::endl;

// if (interpreter.execution_frame()->exception_info().has_value()) {
Expand DownExpand Up@@ -214,7 +214,7 @@ std::vector<uint8_t> BytecodeProgram::serialize() const
}

// TODO: Add support to serialize functions from different backends
ASSERT(m_backends.empty())
ASSERT(m_backends.empty());

return result;
}
Expand All@@ -226,14 +226,14 @@ std::shared_ptr<BytecodeProgram> BytecodeProgram::deserialize(const std::vector<

auto span = std::span{ buffer };
auto deserialized_result = PyCode::deserialize(span, program);
ASSERT(deserialized_result.first.is_ok())
ASSERT(deserialized_result.first.is_ok());
program->m_main_function = deserialized_result.first.unwrap();
spdlog::debug(
"Deserialized main function:\n{}\n\n", program->m_main_function->function()->to_string());

while (!span.empty()) {
deserialized_result = PyCode::deserialize(span, program);
ASSERT(deserialized_result.first.is_ok())
ASSERT(deserialized_result.first.is_ok());
program->m_functions.push_back(deserialized_result.first.unwrap());
spdlog::debug("Deserialized function {}:\n{}\n\n",
program->m_functions.back()->function()->function_name(),
Expand Down
2 changes: 1 addition & 1 deletion src/executable/bytecode/BytecodeProgram_tests.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ std::shared_ptr<BytecodeProgram> generate_bytecode(std::string_view program)
p.parse();

auto module = as<ast::Module>(p.module());
ASSERT(module)
ASSERT(module);

return std::static_pointer_cast<BytecodeProgram>(compiler::compile(
module, {}, compiler::Backend::BYTECODE_GENERATOR, compiler::OptimizationLevel::None));
Expand Down
2 changes: 1 addition & 1 deletion src/executable/bytecode/Bytecode_tests.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@
// p.parse();

// auto module = as<ast::Module>(p.module());
// ASSERT(module)
// ASSERT(module);

// auto bytecode =
// codegen::BytecodeGenerator::compile(module, {}, compiler::OptimizationLevel::None);
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
33 changes: 33 additions & 0 deletions .github/workflows/premerge.yml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
name: Premerge

on:
pull_request:
branches: [ "main" ]

env:
BUILD_TYPE: Release

jobs:
build:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4

- name: Install LLVM
run: |
wget https://apt.llvm.org/llvm.sh
chmod +x llvm.sh
sudo ./llvm.sh 20
sudo apt install libmlir-20-dev mlir-20-tools

- name: Configure CMake
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DENABLE_CACHE=OFF

- name: Build
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}

- name: Test
working-directory: ${{github.workspace}}/build
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --target test

2 changes: 1 addition & 1 deletion integration/program.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -88,7 +88,7 @@ template<typename T> void assert_interpreter_object_value(std::string name, T ex
auto key_ = p->operator[](0);
auto value_ = p->operator[](1);
// only support string keys for now
ASSERT(key_.unwrap())
ASSERT(key_.unwrap());
auto key_string = as<PyString>(key_.unwrap())->value();
check_value(value_.unwrap(), expected_value[key_string]);
}
Expand Down
2 changes: 1 addition & 1 deletion src/CMakeLists.txt
Original file line numberDiff line numberDiff line change
Expand Up@@ -298,7 +298,7 @@ target_link_libraries(python-cpp
)

# LLVM backend
find_package(LLVM CONFIG 20.0)
find_package(LLVM CONFIG 20.1)
if(ENABLE_LLVM_BACKEND AND NOT LLVM_FOUND)
message(FATAL_ERROR "Could not find LLVM in the local environment")
elseif(ENABLE_LLVM_BACKEND AND LLVM_FOUND)
Expand Down
4 changes: 2 additions & 2 deletions src/ast/AST.hpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -1187,7 +1187,7 @@ class Subscript : public ASTNode
const std::shared_ptr<ASTNode> &value() const { return m_value; }
const SliceType &slice() const
{
ASSERT(m_slice)
ASSERT(m_slice);
return *m_slice;
}
ContextType context() const { return m_ctx; }
Expand DownExpand Up@@ -1304,7 +1304,7 @@ class Assert : public ASTNode
: ASTNode(ASTNodeType::Assert, source_location), m_test(std::move(test)),
m_msg(std::move(msg))
{
ASSERT(m_test)
ASSERT(m_test);
}

const std::shared_ptr<ASTNode> &test() const { return m_test; }
Expand Down
4 changes: 2 additions & 2 deletions src/ast/optimizers/ConstantFolding.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,8 +11,8 @@ namespace optimizer {
&& node->rhs()->node_type() == ASTNodeType::Constant) {
const auto &lhs = as<Constant>(node->lhs())->value();
const auto &rhs = as<Constant>(node->rhs())->value();
ASSERT(lhs)
ASSERT(rhs)
ASSERT(lhs);
ASSERT(rhs);
switch (node->op_type()) {
case BinaryOpType::PLUS: {
auto result = std::visit(
Expand Down
2 changes: 1 addition & 1 deletion src/executable/Label.hpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ class Label
protected:
void set_position(int64_t position) const
{
ASSERT(!m_position.has_value())
ASSERT(!m_position.has_value());
m_position = position;
}

Expand Down
4 changes: 2 additions & 2 deletions src/executable/Mangler.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -62,8 +62,8 @@ class DefaultMangler : public Mangler

std::string_view mangled_class{ mangled_name.c_str() + start, end - start };

ASSERT(mangled_class.starts_with("__class__"))
ASSERT(mangled_class.ends_with("__"))
ASSERT(mangled_class.starts_with("__class__"));
ASSERT(mangled_class.ends_with("__"));

// extract name from __class__{}__
return std::string{ mangled_class.begin() + 9, mangled_class.end() - 2 };
Expand Down
8 changes: 4 additions & 4 deletions src/executable/bytecode/Bytecode.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -125,14 +125,14 @@ 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()))) {
ASSERT((*vm.instruction_pointer()).get())
ASSERT((*vm.instruction_pointer()).get());
const auto &current_ip = vm.instruction_pointer();
const auto &instruction = *current_ip;
spdlog::debug("{} {}", (void *)instruction.get(), instruction->to_string());
auto result = instruction->execute(vm, vm.interpreter());
// we left the current stack frame in the previous instruction
if (vm.stack().size() != stack_depth) {
ASSERT(result.is_ok())
ASSERT(result.is_ok());
return result;
}
// vm.dump();
Expand All@@ -143,7 +143,7 @@ py::PyResult<py::Value> Bytecode::eval_loop(VirtualMachine &vm, Interpreter &int
PyTraceback *tb_next = exception->traceback();
auto traceback =
PyTraceback::create(interpreter.execution_frame(), tb_lasti, tb_lineno, tb_next);
ASSERT(traceback.is_ok())
ASSERT(traceback.is_ok());
exception->set_traceback(traceback.unwrap());

interpreter.raise_exception(exception);
Expand All@@ -165,6 +165,6 @@ py::PyResult<py::Value> Bytecode::eval_loop(VirtualMachine &vm, Interpreter &int
}
}

ASSERT(value.has_value())
ASSERT(value.has_value());
return Ok(*value);
}
12 changes: 6 additions & 6 deletions src/executable/bytecode/BytecodeProgram.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -104,14 +104,14 @@ size_t BytecodeProgram::main_stack_size() const { return m_main_function->regist
InstructionVector::const_iterator BytecodeProgram::begin() const
{
// FIXME: assumes all functions are bytecode
ASSERT(m_main_function->function()->backend() == FunctionExecutionBackend::BYTECODE)
ASSERT(m_main_function->function()->backend() == FunctionExecutionBackend::BYTECODE);
return static_cast<Bytecode *>(m_main_function->function().get())->begin();
}

InstructionVector::const_iterator BytecodeProgram::end() const
{
// FIXME: assumes all functions are bytecode
ASSERT(m_main_function->function()->backend() == FunctionExecutionBackend::BYTECODE)
ASSERT(m_main_function->function()->backend() == FunctionExecutionBackend::BYTECODE);
return static_cast<Bytecode *>(m_main_function->function().get())->end();
}

Expand All@@ -136,7 +136,7 @@ int BytecodeProgram::execute(VirtualMachine *vm)

if (result.is_err()) {
auto *exception = interpreter.execution_frame()->pop_exception();
ASSERT(exception == result.unwrap_err())
ASSERT(exception == result.unwrap_err());
std::cout << exception->format_traceback() << std::endl;

// if (interpreter.execution_frame()->exception_info().has_value()) {
Expand DownExpand Up@@ -214,7 +214,7 @@ std::vector<uint8_t> BytecodeProgram::serialize() const
}

// TODO: Add support to serialize functions from different backends
ASSERT(m_backends.empty())
ASSERT(m_backends.empty());

return result;
}
Expand All@@ -226,14 +226,14 @@ std::shared_ptr<BytecodeProgram> BytecodeProgram::deserialize(const std::vector<

auto span = std::span{ buffer };
auto deserialized_result = PyCode::deserialize(span, program);
ASSERT(deserialized_result.first.is_ok())
ASSERT(deserialized_result.first.is_ok());
program->m_main_function = deserialized_result.first.unwrap();
spdlog::debug(
"Deserialized main function:\n{}\n\n", program->m_main_function->function()->to_string());

while (!span.empty()) {
deserialized_result = PyCode::deserialize(span, program);
ASSERT(deserialized_result.first.is_ok())
ASSERT(deserialized_result.first.is_ok());
program->m_functions.push_back(deserialized_result.first.unwrap());
spdlog::debug("Deserialized function {}:\n{}\n\n",
program->m_functions.back()->function()->function_name(),
Expand Down
2 changes: 1 addition & 1 deletion src/executable/bytecode/BytecodeProgram_tests.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ std::shared_ptr<BytecodeProgram> generate_bytecode(std::string_view program)
p.parse();

auto module = as<ast::Module>(p.module());
ASSERT(module)
ASSERT(module);

return std::static_pointer_cast<BytecodeProgram>(compiler::compile(
module, {}, compiler::Backend::BYTECODE_GENERATOR, compiler::OptimizationLevel::None));
Expand Down
2 changes: 1 addition & 1 deletion src/executable/bytecode/Bytecode_tests.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@
// p.parse();

// auto module = as<ast::Module>(p.module());
// ASSERT(module)
// ASSERT(module);

// auto bytecode =
// codegen::BytecodeGenerator::compile(module, {}, compiler::OptimizationLevel::None);
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
33 changes: 33 additions & 0 deletions .github/workflows/premerge.yml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
name: Premerge

on:
pull_request:
branches: [ "main" ]

env:
BUILD_TYPE: Release

jobs:
build:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4

- name: Install LLVM
run: |
wget https://apt.llvm.org/llvm.sh
chmod +x llvm.sh
sudo ./llvm.sh 20
sudo apt install libmlir-20-dev mlir-20-tools

- name: Configure CMake
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DENABLE_CACHE=OFF

- name: Build
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}

- name: Test
working-directory: ${{github.workspace}}/build
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --target test

2 changes: 1 addition & 1 deletion integration/program.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -88,7 +88,7 @@ template<typename T> void assert_interpreter_object_value(std::string name, T ex
auto key_ = p->operator[](0);
auto value_ = p->operator[](1);
// only support string keys for now
ASSERT(key_.unwrap())
ASSERT(key_.unwrap());
auto key_string = as<PyString>(key_.unwrap())->value();
check_value(value_.unwrap(), expected_value[key_string]);
}
Expand Down
2 changes: 1 addition & 1 deletion src/CMakeLists.txt
Original file line numberDiff line numberDiff line change
Expand Up@@ -298,7 +298,7 @@ target_link_libraries(python-cpp
)

# LLVM backend
find_package(LLVM CONFIG 20.0)
find_package(LLVM CONFIG 20.1)
if(ENABLE_LLVM_BACKEND AND NOT LLVM_FOUND)
message(FATAL_ERROR "Could not find LLVM in the local environment")
elseif(ENABLE_LLVM_BACKEND AND LLVM_FOUND)
Expand Down
4 changes: 2 additions & 2 deletions src/ast/AST.hpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -1187,7 +1187,7 @@ class Subscript : public ASTNode
const std::shared_ptr<ASTNode> &value() const { return m_value; }
const SliceType &slice() const
{
ASSERT(m_slice)
ASSERT(m_slice);
return *m_slice;
}
ContextType context() const { return m_ctx; }
Expand DownExpand Up@@ -1304,7 +1304,7 @@ class Assert : public ASTNode
: ASTNode(ASTNodeType::Assert, source_location), m_test(std::move(test)),
m_msg(std::move(msg))
{
ASSERT(m_test)
ASSERT(m_test);
}

const std::shared_ptr<ASTNode> &test() const { return m_test; }
Expand Down
4 changes: 2 additions & 2 deletions src/ast/optimizers/ConstantFolding.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,8 +11,8 @@ namespace optimizer {
&& node->rhs()->node_type() == ASTNodeType::Constant) {
const auto &lhs = as<Constant>(node->lhs())->value();
const auto &rhs = as<Constant>(node->rhs())->value();
ASSERT(lhs)
ASSERT(rhs)
ASSERT(lhs);
ASSERT(rhs);
switch (node->op_type()) {
case BinaryOpType::PLUS: {
auto result = std::visit(
Expand Down
2 changes: 1 addition & 1 deletion src/executable/Label.hpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ class Label
protected:
void set_position(int64_t position) const
{
ASSERT(!m_position.has_value())
ASSERT(!m_position.has_value());
m_position = position;
}

Expand Down
4 changes: 2 additions & 2 deletions src/executable/Mangler.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -62,8 +62,8 @@ class DefaultMangler : public Mangler

std::string_view mangled_class{ mangled_name.c_str() + start, end - start };

ASSERT(mangled_class.starts_with("__class__"))
ASSERT(mangled_class.ends_with("__"))
ASSERT(mangled_class.starts_with("__class__"));
ASSERT(mangled_class.ends_with("__"));

// extract name from __class__{}__
return std::string{ mangled_class.begin() + 9, mangled_class.end() - 2 };
Expand Down
8 changes: 4 additions & 4 deletions src/executable/bytecode/Bytecode.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -125,14 +125,14 @@ 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()))) {
ASSERT((*vm.instruction_pointer()).get())
ASSERT((*vm.instruction_pointer()).get());
const auto &current_ip = vm.instruction_pointer();
const auto &instruction = *current_ip;
spdlog::debug("{} {}", (void *)instruction.get(), instruction->to_string());
auto result = instruction->execute(vm, vm.interpreter());
// we left the current stack frame in the previous instruction
if (vm.stack().size() != stack_depth) {
ASSERT(result.is_ok())
ASSERT(result.is_ok());
return result;
}
// vm.dump();
Expand All@@ -143,7 +143,7 @@ py::PyResult<py::Value> Bytecode::eval_loop(VirtualMachine &vm, Interpreter &int
PyTraceback *tb_next = exception->traceback();
auto traceback =
PyTraceback::create(interpreter.execution_frame(), tb_lasti, tb_lineno, tb_next);
ASSERT(traceback.is_ok())
ASSERT(traceback.is_ok());
exception->set_traceback(traceback.unwrap());

interpreter.raise_exception(exception);
Expand All@@ -165,6 +165,6 @@ py::PyResult<py::Value> Bytecode::eval_loop(VirtualMachine &vm, Interpreter &int
}
}

ASSERT(value.has_value())
ASSERT(value.has_value());
return Ok(*value);
}
12 changes: 6 additions & 6 deletions src/executable/bytecode/BytecodeProgram.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -104,14 +104,14 @@ size_t BytecodeProgram::main_stack_size() const { return m_main_function->regist
InstructionVector::const_iterator BytecodeProgram::begin() const
{
// FIXME: assumes all functions are bytecode
ASSERT(m_main_function->function()->backend() == FunctionExecutionBackend::BYTECODE)
ASSERT(m_main_function->function()->backend() == FunctionExecutionBackend::BYTECODE);
return static_cast<Bytecode *>(m_main_function->function().get())->begin();
}

InstructionVector::const_iterator BytecodeProgram::end() const
{
// FIXME: assumes all functions are bytecode
ASSERT(m_main_function->function()->backend() == FunctionExecutionBackend::BYTECODE)
ASSERT(m_main_function->function()->backend() == FunctionExecutionBackend::BYTECODE);
return static_cast<Bytecode *>(m_main_function->function().get())->end();
}

Expand All@@ -136,7 +136,7 @@ int BytecodeProgram::execute(VirtualMachine *vm)

if (result.is_err()) {
auto *exception = interpreter.execution_frame()->pop_exception();
ASSERT(exception == result.unwrap_err())
ASSERT(exception == result.unwrap_err());
std::cout << exception->format_traceback() << std::endl;

// if (interpreter.execution_frame()->exception_info().has_value()) {
Expand DownExpand Up@@ -214,7 +214,7 @@ std::vector<uint8_t> BytecodeProgram::serialize() const
}

// TODO: Add support to serialize functions from different backends
ASSERT(m_backends.empty())
ASSERT(m_backends.empty());

return result;
}
Expand All@@ -226,14 +226,14 @@ std::shared_ptr<BytecodeProgram> BytecodeProgram::deserialize(const std::vector<

auto span = std::span{ buffer };
auto deserialized_result = PyCode::deserialize(span, program);
ASSERT(deserialized_result.first.is_ok())
ASSERT(deserialized_result.first.is_ok());
program->m_main_function = deserialized_result.first.unwrap();
spdlog::debug(
"Deserialized main function:\n{}\n\n", program->m_main_function->function()->to_string());

while (!span.empty()) {
deserialized_result = PyCode::deserialize(span, program);
ASSERT(deserialized_result.first.is_ok())
ASSERT(deserialized_result.first.is_ok());
program->m_functions.push_back(deserialized_result.first.unwrap());
spdlog::debug("Deserialized function {}:\n{}\n\n",
program->m_functions.back()->function()->function_name(),
Expand Down
2 changes: 1 addition & 1 deletion src/executable/bytecode/BytecodeProgram_tests.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ std::shared_ptr<BytecodeProgram> generate_bytecode(std::string_view program)
p.parse();

auto module = as<ast::Module>(p.module());
ASSERT(module)
ASSERT(module);

return std::static_pointer_cast<BytecodeProgram>(compiler::compile(
module, {}, compiler::Backend::BYTECODE_GENERATOR, compiler::OptimizationLevel::None));
Expand Down
2 changes: 1 addition & 1 deletion src/executable/bytecode/Bytecode_tests.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@
// p.parse();

// auto module = as<ast::Module>(p.module());
// ASSERT(module)
// ASSERT(module);

// auto bytecode =
// codegen::BytecodeGenerator::compile(module, {}, compiler::OptimizationLevel::None);
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
33 changes: 33 additions & 0 deletions .github/workflows/premerge.yml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
name: Premerge

on:
pull_request:
branches: [ "main" ]

env:
BUILD_TYPE: Release

jobs:
build:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4

- name: Install LLVM
run: |
wget https://apt.llvm.org/llvm.sh
chmod +x llvm.sh
sudo ./llvm.sh 20
sudo apt install libmlir-20-dev mlir-20-tools

- name: Configure CMake
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DENABLE_CACHE=OFF

- name: Build
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}

- name: Test
working-directory: ${{github.workspace}}/build
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --target test

2 changes: 1 addition & 1 deletion integration/program.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -88,7 +88,7 @@ template<typename T> void assert_interpreter_object_value(std::string name, T ex
auto key_ = p->operator[](0);
auto value_ = p->operator[](1);
// only support string keys for now
ASSERT(key_.unwrap())
ASSERT(key_.unwrap());
auto key_string = as<PyString>(key_.unwrap())->value();
check_value(value_.unwrap(), expected_value[key_string]);
}
Expand Down
2 changes: 1 addition & 1 deletion src/CMakeLists.txt
Original file line numberDiff line numberDiff line change
Expand Up@@ -298,7 +298,7 @@ target_link_libraries(python-cpp
)

# LLVM backend
find_package(LLVM CONFIG 20.0)
find_package(LLVM CONFIG 20.1)
if(ENABLE_LLVM_BACKEND AND NOT LLVM_FOUND)
message(FATAL_ERROR "Could not find LLVM in the local environment")
elseif(ENABLE_LLVM_BACKEND AND LLVM_FOUND)
Expand Down
4 changes: 2 additions & 2 deletions src/ast/AST.hpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -1187,7 +1187,7 @@ class Subscript : public ASTNode
const std::shared_ptr<ASTNode> &value() const { return m_value; }
const SliceType &slice() const
{
ASSERT(m_slice)
ASSERT(m_slice);
return *m_slice;
}
ContextType context() const { return m_ctx; }
Expand DownExpand Up@@ -1304,7 +1304,7 @@ class Assert : public ASTNode
: ASTNode(ASTNodeType::Assert, source_location), m_test(std::move(test)),
m_msg(std::move(msg))
{
ASSERT(m_test)
ASSERT(m_test);
}

const std::shared_ptr<ASTNode> &test() const { return m_test; }
Expand Down
4 changes: 2 additions & 2 deletions src/ast/optimizers/ConstantFolding.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,8 +11,8 @@ namespace optimizer {
&& node->rhs()->node_type() == ASTNodeType::Constant) {
const auto &lhs = as<Constant>(node->lhs())->value();
const auto &rhs = as<Constant>(node->rhs())->value();
ASSERT(lhs)
ASSERT(rhs)
ASSERT(lhs);
ASSERT(rhs);
switch (node->op_type()) {
case BinaryOpType::PLUS: {
auto result = std::visit(
Expand Down
2 changes: 1 addition & 1 deletion src/executable/Label.hpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ class Label
protected:
void set_position(int64_t position) const
{
ASSERT(!m_position.has_value())
ASSERT(!m_position.has_value());
m_position = position;
}

Expand Down
4 changes: 2 additions & 2 deletions src/executable/Mangler.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -62,8 +62,8 @@ class DefaultMangler : public Mangler

std::string_view mangled_class{ mangled_name.c_str() + start, end - start };

ASSERT(mangled_class.starts_with("__class__"))
ASSERT(mangled_class.ends_with("__"))
ASSERT(mangled_class.starts_with("__class__"));
ASSERT(mangled_class.ends_with("__"));

// extract name from __class__{}__
return std::string{ mangled_class.begin() + 9, mangled_class.end() - 2 };
Expand Down
8 changes: 4 additions & 4 deletions src/executable/bytecode/Bytecode.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -125,14 +125,14 @@ 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()))) {
ASSERT((*vm.instruction_pointer()).get())
ASSERT((*vm.instruction_pointer()).get());
const auto &current_ip = vm.instruction_pointer();
const auto &instruction = *current_ip;
spdlog::debug("{} {}", (void *)instruction.get(), instruction->to_string());
auto result = instruction->execute(vm, vm.interpreter());
// we left the current stack frame in the previous instruction
if (vm.stack().size() != stack_depth) {
ASSERT(result.is_ok())
ASSERT(result.is_ok());
return result;
}
// vm.dump();
Expand All@@ -143,7 +143,7 @@ py::PyResult<py::Value> Bytecode::eval_loop(VirtualMachine &vm, Interpreter &int
PyTraceback *tb_next = exception->traceback();
auto traceback =
PyTraceback::create(interpreter.execution_frame(), tb_lasti, tb_lineno, tb_next);
ASSERT(traceback.is_ok())
ASSERT(traceback.is_ok());
exception->set_traceback(traceback.unwrap());

interpreter.raise_exception(exception);
Expand All@@ -165,6 +165,6 @@ py::PyResult<py::Value> Bytecode::eval_loop(VirtualMachine &vm, Interpreter &int
}
}

ASSERT(value.has_value())
ASSERT(value.has_value());
return Ok(*value);
}
12 changes: 6 additions & 6 deletions src/executable/bytecode/BytecodeProgram.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -104,14 +104,14 @@ size_t BytecodeProgram::main_stack_size() const { return m_main_function->regist
InstructionVector::const_iterator BytecodeProgram::begin() const
{
// FIXME: assumes all functions are bytecode
ASSERT(m_main_function->function()->backend() == FunctionExecutionBackend::BYTECODE)
ASSERT(m_main_function->function()->backend() == FunctionExecutionBackend::BYTECODE);
return static_cast<Bytecode *>(m_main_function->function().get())->begin();
}

InstructionVector::const_iterator BytecodeProgram::end() const
{
// FIXME: assumes all functions are bytecode
ASSERT(m_main_function->function()->backend() == FunctionExecutionBackend::BYTECODE)
ASSERT(m_main_function->function()->backend() == FunctionExecutionBackend::BYTECODE);
return static_cast<Bytecode *>(m_main_function->function().get())->end();
}

Expand All@@ -136,7 +136,7 @@ int BytecodeProgram::execute(VirtualMachine *vm)

if (result.is_err()) {
auto *exception = interpreter.execution_frame()->pop_exception();
ASSERT(exception == result.unwrap_err())
ASSERT(exception == result.unwrap_err());
std::cout << exception->format_traceback() << std::endl;

// if (interpreter.execution_frame()->exception_info().has_value()) {
Expand DownExpand Up@@ -214,7 +214,7 @@ std::vector<uint8_t> BytecodeProgram::serialize() const
}

// TODO: Add support to serialize functions from different backends
ASSERT(m_backends.empty())
ASSERT(m_backends.empty());

return result;
}
Expand All@@ -226,14 +226,14 @@ std::shared_ptr<BytecodeProgram> BytecodeProgram::deserialize(const std::vector<

auto span = std::span{ buffer };
auto deserialized_result = PyCode::deserialize(span, program);
ASSERT(deserialized_result.first.is_ok())
ASSERT(deserialized_result.first.is_ok());
program->m_main_function = deserialized_result.first.unwrap();
spdlog::debug(
"Deserialized main function:\n{}\n\n", program->m_main_function->function()->to_string());

while (!span.empty()) {
deserialized_result = PyCode::deserialize(span, program);
ASSERT(deserialized_result.first.is_ok())
ASSERT(deserialized_result.first.is_ok());
program->m_functions.push_back(deserialized_result.first.unwrap());
spdlog::debug("Deserialized function {}:\n{}\n\n",
program->m_functions.back()->function()->function_name(),
Expand Down
2 changes: 1 addition & 1 deletion src/executable/bytecode/BytecodeProgram_tests.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ std::shared_ptr<BytecodeProgram> generate_bytecode(std::string_view program)
p.parse();

auto module = as<ast::Module>(p.module());
ASSERT(module)
ASSERT(module);

return std::static_pointer_cast<BytecodeProgram>(compiler::compile(
module, {}, compiler::Backend::BYTECODE_GENERATOR, compiler::OptimizationLevel::None));
Expand Down
2 changes: 1 addition & 1 deletion src/executable/bytecode/Bytecode_tests.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@
// p.parse();

// auto module = as<ast::Module>(p.module());
// ASSERT(module)
// ASSERT(module);

// auto bytecode =
// codegen::BytecodeGenerator::compile(module, {}, compiler::OptimizationLevel::None);
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
33 changes: 33 additions & 0 deletions .github/workflows/premerge.yml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
name: Premerge

on:
pull_request:
branches: [ "main" ]

env:
BUILD_TYPE: Release

jobs:
build:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4

- name: Install LLVM
run: |
wget https://apt.llvm.org/llvm.sh
chmod +x llvm.sh
sudo ./llvm.sh 20
sudo apt install libmlir-20-dev mlir-20-tools

- name: Configure CMake
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DENABLE_CACHE=OFF

- name: Build
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}

- name: Test
working-directory: ${{github.workspace}}/build
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --target test

2 changes: 1 addition & 1 deletion integration/program.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -88,7 +88,7 @@ template<typename T> void assert_interpreter_object_value(std::string name, T ex
auto key_ = p->operator[](0);
auto value_ = p->operator[](1);
// only support string keys for now
ASSERT(key_.unwrap())
ASSERT(key_.unwrap());
auto key_string = as<PyString>(key_.unwrap())->value();
check_value(value_.unwrap(), expected_value[key_string]);
}
Expand Down
2 changes: 1 addition & 1 deletion src/CMakeLists.txt
Original file line numberDiff line numberDiff line change
Expand Up@@ -298,7 +298,7 @@ target_link_libraries(python-cpp
)

# LLVM backend
find_package(LLVM CONFIG 20.0)
find_package(LLVM CONFIG 20.1)
if(ENABLE_LLVM_BACKEND AND NOT LLVM_FOUND)
message(FATAL_ERROR "Could not find LLVM in the local environment")
elseif(ENABLE_LLVM_BACKEND AND LLVM_FOUND)
Expand Down
4 changes: 2 additions & 2 deletions src/ast/AST.hpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -1187,7 +1187,7 @@ class Subscript : public ASTNode
const std::shared_ptr<ASTNode> &value() const { return m_value; }
const SliceType &slice() const
{
ASSERT(m_slice)
ASSERT(m_slice);
return *m_slice;
}
ContextType context() const { return m_ctx; }
Expand DownExpand Up@@ -1304,7 +1304,7 @@ class Assert : public ASTNode
: ASTNode(ASTNodeType::Assert, source_location), m_test(std::move(test)),
m_msg(std::move(msg))
{
ASSERT(m_test)
ASSERT(m_test);
}

const std::shared_ptr<ASTNode> &test() const { return m_test; }
Expand Down
4 changes: 2 additions & 2 deletions src/ast/optimizers/ConstantFolding.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,8 +11,8 @@ namespace optimizer {
&& node->rhs()->node_type() == ASTNodeType::Constant) {
const auto &lhs = as<Constant>(node->lhs())->value();
const auto &rhs = as<Constant>(node->rhs())->value();
ASSERT(lhs)
ASSERT(rhs)
ASSERT(lhs);
ASSERT(rhs);
switch (node->op_type()) {
case BinaryOpType::PLUS: {
auto result = std::visit(
Expand Down
2 changes: 1 addition & 1 deletion src/executable/Label.hpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ class Label
protected:
void set_position(int64_t position) const
{
ASSERT(!m_position.has_value())
ASSERT(!m_position.has_value());
m_position = position;
}

Expand Down
4 changes: 2 additions & 2 deletions src/executable/Mangler.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -62,8 +62,8 @@ class DefaultMangler : public Mangler

std::string_view mangled_class{ mangled_name.c_str() + start, end - start };

ASSERT(mangled_class.starts_with("__class__"))
ASSERT(mangled_class.ends_with("__"))
ASSERT(mangled_class.starts_with("__class__"));
ASSERT(mangled_class.ends_with("__"));

// extract name from __class__{}__
return std::string{ mangled_class.begin() + 9, mangled_class.end() - 2 };
Expand Down
8 changes: 4 additions & 4 deletions src/executable/bytecode/Bytecode.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -125,14 +125,14 @@ 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()))) {
ASSERT((*vm.instruction_pointer()).get())
ASSERT((*vm.instruction_pointer()).get());
const auto &current_ip = vm.instruction_pointer();
const auto &instruction = *current_ip;
spdlog::debug("{} {}", (void *)instruction.get(), instruction->to_string());
auto result = instruction->execute(vm, vm.interpreter());
// we left the current stack frame in the previous instruction
if (vm.stack().size() != stack_depth) {
ASSERT(result.is_ok())
ASSERT(result.is_ok());
return result;
}
// vm.dump();
Expand All@@ -143,7 +143,7 @@ py::PyResult<py::Value> Bytecode::eval_loop(VirtualMachine &vm, Interpreter &int
PyTraceback *tb_next = exception->traceback();
auto traceback =
PyTraceback::create(interpreter.execution_frame(), tb_lasti, tb_lineno, tb_next);
ASSERT(traceback.is_ok())
ASSERT(traceback.is_ok());
exception->set_traceback(traceback.unwrap());

interpreter.raise_exception(exception);
Expand All@@ -165,6 +165,6 @@ py::PyResult<py::Value> Bytecode::eval_loop(VirtualMachine &vm, Interpreter &int
}
}

ASSERT(value.has_value())
ASSERT(value.has_value());
return Ok(*value);
}
12 changes: 6 additions & 6 deletions src/executable/bytecode/BytecodeProgram.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -104,14 +104,14 @@ size_t BytecodeProgram::main_stack_size() const { return m_main_function->regist
InstructionVector::const_iterator BytecodeProgram::begin() const
{
// FIXME: assumes all functions are bytecode
ASSERT(m_main_function->function()->backend() == FunctionExecutionBackend::BYTECODE)
ASSERT(m_main_function->function()->backend() == FunctionExecutionBackend::BYTECODE);
return static_cast<Bytecode *>(m_main_function->function().get())->begin();
}

InstructionVector::const_iterator BytecodeProgram::end() const
{
// FIXME: assumes all functions are bytecode
ASSERT(m_main_function->function()->backend() == FunctionExecutionBackend::BYTECODE)
ASSERT(m_main_function->function()->backend() == FunctionExecutionBackend::BYTECODE);
return static_cast<Bytecode *>(m_main_function->function().get())->end();
}

Expand All@@ -136,7 +136,7 @@ int BytecodeProgram::execute(VirtualMachine *vm)

if (result.is_err()) {
auto *exception = interpreter.execution_frame()->pop_exception();
ASSERT(exception == result.unwrap_err())
ASSERT(exception == result.unwrap_err());
std::cout << exception->format_traceback() << std::endl;

// if (interpreter.execution_frame()->exception_info().has_value()) {
Expand DownExpand Up@@ -214,7 +214,7 @@ std::vector<uint8_t> BytecodeProgram::serialize() const
}

// TODO: Add support to serialize functions from different backends
ASSERT(m_backends.empty())
ASSERT(m_backends.empty());

return result;
}
Expand All@@ -226,14 +226,14 @@ std::shared_ptr<BytecodeProgram> BytecodeProgram::deserialize(const std::vector<

auto span = std::span{ buffer };
auto deserialized_result = PyCode::deserialize(span, program);
ASSERT(deserialized_result.first.is_ok())
ASSERT(deserialized_result.first.is_ok());
program->m_main_function = deserialized_result.first.unwrap();
spdlog::debug(
"Deserialized main function:\n{}\n\n", program->m_main_function->function()->to_string());

while (!span.empty()) {
deserialized_result = PyCode::deserialize(span, program);
ASSERT(deserialized_result.first.is_ok())
ASSERT(deserialized_result.first.is_ok());
program->m_functions.push_back(deserialized_result.first.unwrap());
spdlog::debug("Deserialized function {}:\n{}\n\n",
program->m_functions.back()->function()->function_name(),
Expand Down
2 changes: 1 addition & 1 deletion src/executable/bytecode/BytecodeProgram_tests.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ std::shared_ptr<BytecodeProgram> generate_bytecode(std::string_view program)
p.parse();

auto module = as<ast::Module>(p.module());
ASSERT(module)
ASSERT(module);

return std::static_pointer_cast<BytecodeProgram>(compiler::compile(
module, {}, compiler::Backend::BYTECODE_GENERATOR, compiler::OptimizationLevel::None));
Expand Down
2 changes: 1 addition & 1 deletion src/executable/bytecode/Bytecode_tests.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@
// p.parse();

// auto module = as<ast::Module>(p.module());
// ASSERT(module)
// ASSERT(module);

// auto bytecode =
// codegen::BytecodeGenerator::compile(module, {}, compiler::OptimizationLevel::None);
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
33 changes: 33 additions & 0 deletions .github/workflows/premerge.yml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
name: Premerge

on:
pull_request:
branches: [ "main" ]

env:
BUILD_TYPE: Release

jobs:
build:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4

- name: Install LLVM
run: |
wget https://apt.llvm.org/llvm.sh
chmod +x llvm.sh
sudo ./llvm.sh 20
sudo apt install libmlir-20-dev mlir-20-tools

- name: Configure CMake
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DENABLE_CACHE=OFF

- name: Build
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}

- name: Test
working-directory: ${{github.workspace}}/build
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --target test

2 changes: 1 addition & 1 deletion integration/program.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -88,7 +88,7 @@ template<typename T> void assert_interpreter_object_value(std::string name, T ex
auto key_ = p->operator[](0);
auto value_ = p->operator[](1);
// only support string keys for now
ASSERT(key_.unwrap())
ASSERT(key_.unwrap());
auto key_string = as<PyString>(key_.unwrap())->value();
check_value(value_.unwrap(), expected_value[key_string]);
}
Expand Down
2 changes: 1 addition & 1 deletion src/CMakeLists.txt
Original file line numberDiff line numberDiff line change
Expand Up@@ -298,7 +298,7 @@ target_link_libraries(python-cpp
)

# LLVM backend
find_package(LLVM CONFIG 20.0)
find_package(LLVM CONFIG 20.1)
if(ENABLE_LLVM_BACKEND AND NOT LLVM_FOUND)
message(FATAL_ERROR "Could not find LLVM in the local environment")
elseif(ENABLE_LLVM_BACKEND AND LLVM_FOUND)
Expand Down
4 changes: 2 additions & 2 deletions src/ast/AST.hpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -1187,7 +1187,7 @@ class Subscript : public ASTNode
const std::shared_ptr<ASTNode> &value() const { return m_value; }
const SliceType &slice() const
{
ASSERT(m_slice)
ASSERT(m_slice);
return *m_slice;
}
ContextType context() const { return m_ctx; }
Expand DownExpand Up@@ -1304,7 +1304,7 @@ class Assert : public ASTNode
: ASTNode(ASTNodeType::Assert, source_location), m_test(std::move(test)),
m_msg(std::move(msg))
{
ASSERT(m_test)
ASSERT(m_test);
}

const std::shared_ptr<ASTNode> &test() const { return m_test; }
Expand Down
4 changes: 2 additions & 2 deletions src/ast/optimizers/ConstantFolding.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,8 +11,8 @@ namespace optimizer {
&& node->rhs()->node_type() == ASTNodeType::Constant) {
const auto &lhs = as<Constant>(node->lhs())->value();
const auto &rhs = as<Constant>(node->rhs())->value();
ASSERT(lhs)
ASSERT(rhs)
ASSERT(lhs);
ASSERT(rhs);
switch (node->op_type()) {
case BinaryOpType::PLUS: {
auto result = std::visit(
Expand Down
2 changes: 1 addition & 1 deletion src/executable/Label.hpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ class Label
protected:
void set_position(int64_t position) const
{
ASSERT(!m_position.has_value())
ASSERT(!m_position.has_value());
m_position = position;
}

Expand Down
4 changes: 2 additions & 2 deletions src/executable/Mangler.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -62,8 +62,8 @@ class DefaultMangler : public Mangler

std::string_view mangled_class{ mangled_name.c_str() + start, end - start };

ASSERT(mangled_class.starts_with("__class__"))
ASSERT(mangled_class.ends_with("__"))
ASSERT(mangled_class.starts_with("__class__"));
ASSERT(mangled_class.ends_with("__"));

// extract name from __class__{}__
return std::string{ mangled_class.begin() + 9, mangled_class.end() - 2 };
Expand Down
8 changes: 4 additions & 4 deletions src/executable/bytecode/Bytecode.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -125,14 +125,14 @@ 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()))) {
ASSERT((*vm.instruction_pointer()).get())
ASSERT((*vm.instruction_pointer()).get());
const auto &current_ip = vm.instruction_pointer();
const auto &instruction = *current_ip;
spdlog::debug("{} {}", (void *)instruction.get(), instruction->to_string());
auto result = instruction->execute(vm, vm.interpreter());
// we left the current stack frame in the previous instruction
if (vm.stack().size() != stack_depth) {
ASSERT(result.is_ok())
ASSERT(result.is_ok());
return result;
}
// vm.dump();
Expand All@@ -143,7 +143,7 @@ py::PyResult<py::Value> Bytecode::eval_loop(VirtualMachine &vm, Interpreter &int
PyTraceback *tb_next = exception->traceback();
auto traceback =
PyTraceback::create(interpreter.execution_frame(), tb_lasti, tb_lineno, tb_next);
ASSERT(traceback.is_ok())
ASSERT(traceback.is_ok());
exception->set_traceback(traceback.unwrap());

interpreter.raise_exception(exception);
Expand All@@ -165,6 +165,6 @@ py::PyResult<py::Value> Bytecode::eval_loop(VirtualMachine &vm, Interpreter &int
}
}

ASSERT(value.has_value())
ASSERT(value.has_value());
return Ok(*value);
}
12 changes: 6 additions & 6 deletions src/executable/bytecode/BytecodeProgram.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -104,14 +104,14 @@ size_t BytecodeProgram::main_stack_size() const { return m_main_function->regist
InstructionVector::const_iterator BytecodeProgram::begin() const
{
// FIXME: assumes all functions are bytecode
ASSERT(m_main_function->function()->backend() == FunctionExecutionBackend::BYTECODE)
ASSERT(m_main_function->function()->backend() == FunctionExecutionBackend::BYTECODE);
return static_cast<Bytecode *>(m_main_function->function().get())->begin();
}

InstructionVector::const_iterator BytecodeProgram::end() const
{
// FIXME: assumes all functions are bytecode
ASSERT(m_main_function->function()->backend() == FunctionExecutionBackend::BYTECODE)
ASSERT(m_main_function->function()->backend() == FunctionExecutionBackend::BYTECODE);
return static_cast<Bytecode *>(m_main_function->function().get())->end();
}

Expand All@@ -136,7 +136,7 @@ int BytecodeProgram::execute(VirtualMachine *vm)

if (result.is_err()) {
auto *exception = interpreter.execution_frame()->pop_exception();
ASSERT(exception == result.unwrap_err())
ASSERT(exception == result.unwrap_err());
std::cout << exception->format_traceback() << std::endl;

// if (interpreter.execution_frame()->exception_info().has_value()) {
Expand DownExpand Up@@ -214,7 +214,7 @@ std::vector<uint8_t> BytecodeProgram::serialize() const
}

// TODO: Add support to serialize functions from different backends
ASSERT(m_backends.empty())
ASSERT(m_backends.empty());

return result;
}
Expand All@@ -226,14 +226,14 @@ std::shared_ptr<BytecodeProgram> BytecodeProgram::deserialize(const std::vector<

auto span = std::span{ buffer };
auto deserialized_result = PyCode::deserialize(span, program);
ASSERT(deserialized_result.first.is_ok())
ASSERT(deserialized_result.first.is_ok());
program->m_main_function = deserialized_result.first.unwrap();
spdlog::debug(
"Deserialized main function:\n{}\n\n", program->m_main_function->function()->to_string());

while (!span.empty()) {
deserialized_result = PyCode::deserialize(span, program);
ASSERT(deserialized_result.first.is_ok())
ASSERT(deserialized_result.first.is_ok());
program->m_functions.push_back(deserialized_result.first.unwrap());
spdlog::debug("Deserialized function {}:\n{}\n\n",
program->m_functions.back()->function()->function_name(),
Expand Down
2 changes: 1 addition & 1 deletion src/executable/bytecode/BytecodeProgram_tests.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ std::shared_ptr<BytecodeProgram> generate_bytecode(std::string_view program)
p.parse();

auto module = as<ast::Module>(p.module());
ASSERT(module)
ASSERT(module);

return std::static_pointer_cast<BytecodeProgram>(compiler::compile(
module, {}, compiler::Backend::BYTECODE_GENERATOR, compiler::OptimizationLevel::None));
Expand Down
2 changes: 1 addition & 1 deletion src/executable/bytecode/Bytecode_tests.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@
// p.parse();

// auto module = as<ast::Module>(p.module());
// ASSERT(module)
// ASSERT(module);

// auto bytecode =
// codegen::BytecodeGenerator::compile(module, {}, compiler::OptimizationLevel::None);
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
33 changes: 33 additions & 0 deletions .github/workflows/premerge.yml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
name: Premerge

on:
pull_request:
branches: [ "main" ]

env:
BUILD_TYPE: Release

jobs:
build:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4

- name: Install LLVM
run: |
wget https://apt.llvm.org/llvm.sh
chmod +x llvm.sh
sudo ./llvm.sh 20
sudo apt install libmlir-20-dev mlir-20-tools

- name: Configure CMake
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DENABLE_CACHE=OFF

- name: Build
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}

- name: Test
working-directory: ${{github.workspace}}/build
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --target test

2 changes: 1 addition & 1 deletion integration/program.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -88,7 +88,7 @@ template<typename T> void assert_interpreter_object_value(std::string name, T ex
auto key_ = p->operator[](0);
auto value_ = p->operator[](1);
// only support string keys for now
ASSERT(key_.unwrap())
ASSERT(key_.unwrap());
auto key_string = as<PyString>(key_.unwrap())->value();
check_value(value_.unwrap(), expected_value[key_string]);
}
Expand Down
2 changes: 1 addition & 1 deletion src/CMakeLists.txt
Original file line numberDiff line numberDiff line change
Expand Up@@ -298,7 +298,7 @@ target_link_libraries(python-cpp
)

# LLVM backend
find_package(LLVM CONFIG 20.0)
find_package(LLVM CONFIG 20.1)
if(ENABLE_LLVM_BACKEND AND NOT LLVM_FOUND)
message(FATAL_ERROR "Could not find LLVM in the local environment")
elseif(ENABLE_LLVM_BACKEND AND LLVM_FOUND)
Expand Down
4 changes: 2 additions & 2 deletions src/ast/AST.hpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -1187,7 +1187,7 @@ class Subscript : public ASTNode
const std::shared_ptr<ASTNode> &value() const { return m_value; }
const SliceType &slice() const
{
ASSERT(m_slice)
ASSERT(m_slice);
return *m_slice;
}
ContextType context() const { return m_ctx; }
Expand DownExpand Up@@ -1304,7 +1304,7 @@ class Assert : public ASTNode
: ASTNode(ASTNodeType::Assert, source_location), m_test(std::move(test)),
m_msg(std::move(msg))
{
ASSERT(m_test)
ASSERT(m_test);
}

const std::shared_ptr<ASTNode> &test() const { return m_test; }
Expand Down
4 changes: 2 additions & 2 deletions src/ast/optimizers/ConstantFolding.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,8 +11,8 @@ namespace optimizer {
&& node->rhs()->node_type() == ASTNodeType::Constant) {
const auto &lhs = as<Constant>(node->lhs())->value();
const auto &rhs = as<Constant>(node->rhs())->value();
ASSERT(lhs)
ASSERT(rhs)
ASSERT(lhs);
ASSERT(rhs);
switch (node->op_type()) {
case BinaryOpType::PLUS: {
auto result = std::visit(
Expand Down
2 changes: 1 addition & 1 deletion src/executable/Label.hpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ class Label
protected:
void set_position(int64_t position) const
{
ASSERT(!m_position.has_value())
ASSERT(!m_position.has_value());
m_position = position;
}

Expand Down
4 changes: 2 additions & 2 deletions src/executable/Mangler.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -62,8 +62,8 @@ class DefaultMangler : public Mangler

std::string_view mangled_class{ mangled_name.c_str() + start, end - start };

ASSERT(mangled_class.starts_with("__class__"))
ASSERT(mangled_class.ends_with("__"))
ASSERT(mangled_class.starts_with("__class__"));
ASSERT(mangled_class.ends_with("__"));

// extract name from __class__{}__
return std::string{ mangled_class.begin() + 9, mangled_class.end() - 2 };
Expand Down
8 changes: 4 additions & 4 deletions src/executable/bytecode/Bytecode.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -125,14 +125,14 @@ 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()))) {
ASSERT((*vm.instruction_pointer()).get())
ASSERT((*vm.instruction_pointer()).get());
const auto &current_ip = vm.instruction_pointer();
const auto &instruction = *current_ip;
spdlog::debug("{} {}", (void *)instruction.get(), instruction->to_string());
auto result = instruction->execute(vm, vm.interpreter());
// we left the current stack frame in the previous instruction
if (vm.stack().size() != stack_depth) {
ASSERT(result.is_ok())
ASSERT(result.is_ok());
return result;
}
// vm.dump();
Expand All@@ -143,7 +143,7 @@ py::PyResult<py::Value> Bytecode::eval_loop(VirtualMachine &vm, Interpreter &int
PyTraceback *tb_next = exception->traceback();
auto traceback =
PyTraceback::create(interpreter.execution_frame(), tb_lasti, tb_lineno, tb_next);
ASSERT(traceback.is_ok())
ASSERT(traceback.is_ok());
exception->set_traceback(traceback.unwrap());

interpreter.raise_exception(exception);
Expand All@@ -165,6 +165,6 @@ py::PyResult<py::Value> Bytecode::eval_loop(VirtualMachine &vm, Interpreter &int
}
}

ASSERT(value.has_value())
ASSERT(value.has_value());
return Ok(*value);
}
12 changes: 6 additions & 6 deletions src/executable/bytecode/BytecodeProgram.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -104,14 +104,14 @@ size_t BytecodeProgram::main_stack_size() const { return m_main_function->regist
InstructionVector::const_iterator BytecodeProgram::begin() const
{
// FIXME: assumes all functions are bytecode
ASSERT(m_main_function->function()->backend() == FunctionExecutionBackend::BYTECODE)
ASSERT(m_main_function->function()->backend() == FunctionExecutionBackend::BYTECODE);
return static_cast<Bytecode *>(m_main_function->function().get())->begin();
}

InstructionVector::const_iterator BytecodeProgram::end() const
{
// FIXME: assumes all functions are bytecode
ASSERT(m_main_function->function()->backend() == FunctionExecutionBackend::BYTECODE)
ASSERT(m_main_function->function()->backend() == FunctionExecutionBackend::BYTECODE);
return static_cast<Bytecode *>(m_main_function->function().get())->end();
}

Expand All@@ -136,7 +136,7 @@ int BytecodeProgram::execute(VirtualMachine *vm)

if (result.is_err()) {
auto *exception = interpreter.execution_frame()->pop_exception();
ASSERT(exception == result.unwrap_err())
ASSERT(exception == result.unwrap_err());
std::cout << exception->format_traceback() << std::endl;

// if (interpreter.execution_frame()->exception_info().has_value()) {
Expand DownExpand Up@@ -214,7 +214,7 @@ std::vector<uint8_t> BytecodeProgram::serialize() const
}

// TODO: Add support to serialize functions from different backends
ASSERT(m_backends.empty())
ASSERT(m_backends.empty());

return result;
}
Expand All@@ -226,14 +226,14 @@ std::shared_ptr<BytecodeProgram> BytecodeProgram::deserialize(const std::vector<

auto span = std::span{ buffer };
auto deserialized_result = PyCode::deserialize(span, program);
ASSERT(deserialized_result.first.is_ok())
ASSERT(deserialized_result.first.is_ok());
program->m_main_function = deserialized_result.first.unwrap();
spdlog::debug(
"Deserialized main function:\n{}\n\n", program->m_main_function->function()->to_string());

while (!span.empty()) {
deserialized_result = PyCode::deserialize(span, program);
ASSERT(deserialized_result.first.is_ok())
ASSERT(deserialized_result.first.is_ok());
program->m_functions.push_back(deserialized_result.first.unwrap());
spdlog::debug("Deserialized function {}:\n{}\n\n",
program->m_functions.back()->function()->function_name(),
Expand Down
2 changes: 1 addition & 1 deletion src/executable/bytecode/BytecodeProgram_tests.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ std::shared_ptr<BytecodeProgram> generate_bytecode(std::string_view program)
p.parse();

auto module = as<ast::Module>(p.module());
ASSERT(module)
ASSERT(module);

return std::static_pointer_cast<BytecodeProgram>(compiler::compile(
module, {}, compiler::Backend::BYTECODE_GENERATOR, compiler::OptimizationLevel::None));
Expand Down
2 changes: 1 addition & 1 deletion src/executable/bytecode/Bytecode_tests.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@
// p.parse();

// auto module = as<ast::Module>(p.module());
// ASSERT(module)
// ASSERT(module);

// auto bytecode =
// codegen::BytecodeGenerator::compile(module, {}, compiler::OptimizationLevel::None);
Expand Down
Loading