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
20 changes: 20 additions & 0 deletions integration/tests/file_io.py
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
# Regression test: closing a path-opened FileIO after reading must not crash.
# Previously FileIO.close() called ferror() on the underlying FILE* *after*
# closing it (which resets the pointer to NULL), segfaulting on ferror(NULL).
# This is the same path the import machinery uses to read a module's source.

# Run with cwd == integration/ (as the integration runner does).
DATA = "tests/file_io_data.txt"

# 1. read inside a `with` block -> __exit__ closes the file (the crashing path).
with open(DATA, "rb") as f:
data = f.read()
assert data == b"line1\nline2\n", data

# 2. explicit close, and close() must be idempotent (callable more than once).
g = open(DATA, "rb")
assert g.read() == b"line1\nline2\n"
g.close()
g.close()

print("file_io: ok")
2 changes: 2 additions & 0 deletions integration/tests/file_io_data.txt
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
line1
line2
45 changes: 37 additions & 8 deletions src/interpreter/Interpreter.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@
#include "executable/Program.hpp"
#include "executable/bytecode/Bytecode.hpp"
#include "executable/bytecode/BytecodeProgram.hpp"
#include "utilities.hpp"

#include <filesystem>

Expand DownExpand Up@@ -168,20 +169,48 @@ void Interpreter::internal_setup(const std::string &name,
m_codec_search_path = PyList::create().unwrap();
m_codec_search_path_cache = PyDict::create().unwrap();

PyModule *io_module;
for (const auto &[name, module_factory] : builtin_modules) {
if (module_factory) { m_modules->insert(String{ std::string{ name } }, module_factory()); }
if (module_factory) {
auto mod = module_factory();
if (name == "_io") { io_module = mod; }
m_modules->insert(String{ std::string{ name } }, mod);
}
}

{
auto open = io_module()->symbol_table()->map().at(String{ "open" });
ASSERT(io_module);
auto open = io_module->symbol_table()->map().at(String{ "open" });
m_builtins->add_symbol(PyString::create("open").unwrap(), open);
auto *file_io =
std::get<PyObject *>(io_module->symbol_table()->map().at(String{ "FileIO" }));
auto *buffered_writer =
std::get<PyObject *>(io_module->symbol_table()->map().at(String{ "BufferedWriter" }));
auto *text_io_wrapper =
std::get<PyObject *>(io_module->symbol_table()->map().at(String{ "TextIOWrapper" }));
auto py_stdout =
file_io->call(PyTuple::create(Number{ 1 }, String{ "wb" }).unwrap(), nullptr)
.and_then([buffered_writer](PyObject *stdout) {
return buffered_writer->call(PyTuple::create(stdout).unwrap(), nullptr);
})
.and_then([text_io_wrapper](PyObject *stdout_buffer_writer) {
return text_io_wrapper->call(
PyTuple::create(stdout_buffer_writer).unwrap(), nullptr);
});
ASSERT(py_stdout.is_ok());
auto py_stderr =
file_io->call(PyTuple::create(Number{ 2 }, String{ "wb" }).unwrap(), nullptr)
.and_then([buffered_writer](PyObject *stderr) {
return buffered_writer->call(PyTuple::create(stderr).unwrap(), nullptr);
})
.and_then([text_io_wrapper](PyObject *stderr_buffer_writer) {
return text_io_wrapper->call(
PyTuple::create(stderr_buffer_writer).unwrap(), nullptr);
});
ASSERT(py_stderr.is_ok());
sys->add_symbol(PyString::create("stdout").unwrap(), py_stdout.unwrap());
sys->add_symbol(PyString::create("stderr").unwrap(), py_stderr.unwrap());
}
// {
// auto open = io_module()->symbol_table()->map().at(String{ "open" });
// m_builtins->add_symbol(PyString::create("open").unwrap(), open);
// sys->add_symbol(PyString::create("stderr").unwrap(),
// std::get<PyObject *>(open)->call(PyTuple::create().unwrap(), nullptr).unwrap());
// }

if (config.requires_importlib) {
auto *_imp = imp_module();
Expand Down
19 changes: 19 additions & 0 deletions src/runtime/PyMemoryView.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -336,6 +336,25 @@ PyResult<PyObject *> PyMemoryView::tolist()

PyResult<PyObject *> PyMemoryView::__repr__() const { return PyString::create(to_string()); }

PyResult<std::monostate> PyMemoryView::__getbuffer__(PyBuffer &view, int /*flags*/)
{
// TODO: validate flags
view = PyBuffer{
.buf = m_view.buf->view(),
.obj = this,
.len = m_view.len,
.itemsize = m_view.itemsize,
.readonly = m_view.readonly,
.ndim = m_view.ndim,
.format = m_view.format,
.shape = m_view.shape,
.strides = m_view.strides,
.suboffsets = m_view.suboffsets,
.internal = m_view.internal,
};
return Ok(std::monostate{});
}

namespace {
std::once_flag memoryview_flag;

Expand Down
3 changes: 3 additions & 0 deletions src/runtime/PyMemoryView.hpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,9 @@ class PyMemoryView : public PyBaseObject

size_t itemsize() const { return m_view.itemsize; }

PyResult<std::monostate> __getbuffer__(PyBuffer &view, int /*flags*/);


private:
static PyResult<PyBuffer> create_view(PyBuffer &main_view);
};
Expand Down
7 changes: 1 addition & 6 deletions src/runtime/PyObject.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -468,12 +468,7 @@ PyResult<std::monostate> PyObject::get_buffer(PyBuffer &buffer, int flags)
{
return as_buffer().and_then(
[&buffer, flags, this](const PyBufferProcs &bc) -> PyResult<std::monostate> {
(void)buffer;
(void)flags;
(void)this;
(void)bc;
return Err(not_implemented_error("get_buffer not implemented!"));
// return bc.getbuffer(this, buffer, flags);
return bc.getbuffer(this, buffer, flags);
});
}

Expand Down
1 change: 1 addition & 0 deletions src/runtime/PyObject.hpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -433,6 +433,7 @@ class PyObject : public Cell
PyResult<PySequenceWrapper> as_sequence();
PyResult<PyBufferProcs> as_buffer();

// TODO: add strongly typed flags
PyResult<std::monostate> get_buffer(PyBuffer &, int flags);

PyResult<PyObject *> getattribute(PyObject *attribute) const;
Expand Down
58 changes: 50 additions & 8 deletions src/runtime/modules/BuiltinsModule.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -67,10 +67,20 @@ static PyModule *s_builtin_module = nullptr;

namespace {

PyResult<PyObject *> print(const PyTuple *args, const PyDict *kwargs, Interpreter &)
PyResult<PyObject *> print(const PyTuple *args, const PyDict *kwargs, Interpreter &interpreter)
{
std::string separator = " ";
std::string end = "\n";
auto *separator = PyString::create(" ").unwrap();
auto *end = PyString::create("\n").unwrap();
// TODO: handle error case?
PyObject *file =
PyObject::from(interpreter.get_imported_module(PyString::create("sys").unwrap())
->symbol_table()
->map()
.at(String{ "stdout" }))
.unwrap();
// sys.stdout may be None when FILE* stdout isn't connected
if (!file || file == py_none()) { return Ok(py_none()); }
bool flush = true;
if (kwargs) {
static const Value separator_keyword = String{ "sep" };
static const Value end_keyword = String{ "end" };
Expand All@@ -84,7 +94,7 @@ PyResult<PyObject *> print(const PyTuple *args, const PyDict *kwargs, Interprete
return Err(type_error(
"sep must be None or a string, not {}", obj.unwrap()->type()->name()));
}
separator = std::get<String>(maybe_str).s;
separator = PyString::create(std::get<String>(maybe_str).s).unwrap();
}
if (auto it = kwargs->map().find(end_keyword); it != kwargs->map().end()) {
auto maybe_str = it->second;
Expand All@@ -95,9 +105,12 @@ PyResult<PyObject *> print(const PyTuple *args, const PyDict *kwargs, Interprete
return Err(type_error(
"end must be None or a string, not {}", obj.unwrap()->type()->name()));
}
end = std::get<String>(maybe_str).s;
end = PyString::create(std::get<String>(maybe_str).s).unwrap();
}
}
auto file_write_ = file->get_method(PyString::create("write").unwrap());
if (file_write_.is_err()) { return file_write_; }
auto file_write = file_write_.unwrap();
auto strfunc = [](const PyResult<PyObject *> &arg) -> PyResult<PyString *> {
if (arg.is_err()) return Err(arg.unwrap_err());
return arg.unwrap()->str();
Expand All@@ -106,7 +119,16 @@ PyResult<PyObject *> print(const PyTuple *args, const PyDict *kwargs, Interprete
auto arg_it = args->begin();
auto arg_it_end = args->end();
if (arg_it == arg_it_end) {
std::cout << std::endl;
if (auto result =
file_write->call(PyTuple::create(PyString::create(end).unwrap()).unwrap(), nullptr);
result.is_err()) {
return result;
}
if (flush) {
auto file_flush_ = file->get_method(PyString::create("flush").unwrap());
if (file_flush_.is_err()) { return file_flush_; }
return file_flush_.unwrap()->call(nullptr, nullptr);
}
return Ok(py_none());
Comment thread
gf712 marked this conversation as resolved.
}
--arg_it_end;
Expand All@@ -117,7 +139,14 @@ PyResult<PyObject *> print(const PyTuple *args, const PyDict *kwargs, Interprete
if (reprobj_.is_err()) { return reprobj_; }
auto reprobj = reprobj_.unwrap();
spdlog::debug("repr result: {}", reprobj->value());
std::cout << reprobj->value() << separator;
if (auto result = file_write->call(PyTuple::create(reprobj).unwrap(), nullptr);
result.is_err()) {
return result;
}
Comment thread
gf712 marked this conversation as resolved.
if (auto result = file_write->call(PyTuple::create(separator).unwrap(), nullptr);
result.is_err()) {
return result;
}
std::advance(arg_it, 1);
}

Expand All@@ -126,8 +155,21 @@ PyResult<PyObject *> print(const PyTuple *args, const PyDict *kwargs, Interprete
if (reprobj_.is_err()) { return reprobj_; }
auto reprobj = reprobj_.unwrap();
spdlog::debug("repr result: {}", reprobj->value());
std::cout << reprobj->value() << end;
if (auto result = file_write->call(PyTuple::create(reprobj).unwrap(), nullptr);
result.is_err()) {
return result;
}

if (auto result =
file_write->call(PyTuple::create(PyString::create(end).unwrap()).unwrap(), nullptr);
result.is_err()) {
return result;
}
if (flush) {
auto file_flush_ = file->get_method(PyString::create("flush").unwrap());
if (file_flush_.is_err()) { return file_flush_; }
return file_flush_.unwrap()->call(nullptr, nullptr);
}
return Ok(py_none());
}

Expand Down
Loading
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
20 changes: 20 additions & 0 deletions integration/tests/file_io.py
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
# Regression test: closing a path-opened FileIO after reading must not crash.
# Previously FileIO.close() called ferror() on the underlying FILE* *after*
# closing it (which resets the pointer to NULL), segfaulting on ferror(NULL).
# This is the same path the import machinery uses to read a module's source.

# Run with cwd == integration/ (as the integration runner does).
DATA = "tests/file_io_data.txt"

# 1. read inside a `with` block -> __exit__ closes the file (the crashing path).
with open(DATA, "rb") as f:
data = f.read()
assert data == b"line1\nline2\n", data

# 2. explicit close, and close() must be idempotent (callable more than once).
g = open(DATA, "rb")
assert g.read() == b"line1\nline2\n"
g.close()
g.close()

print("file_io: ok")
2 changes: 2 additions & 0 deletions integration/tests/file_io_data.txt
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
line1
line2
45 changes: 37 additions & 8 deletions src/interpreter/Interpreter.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@
#include "executable/Program.hpp"
#include "executable/bytecode/Bytecode.hpp"
#include "executable/bytecode/BytecodeProgram.hpp"
#include "utilities.hpp"

#include <filesystem>

Expand DownExpand Up@@ -168,20 +169,48 @@ void Interpreter::internal_setup(const std::string &name,
m_codec_search_path = PyList::create().unwrap();
m_codec_search_path_cache = PyDict::create().unwrap();

PyModule *io_module;
for (const auto &[name, module_factory] : builtin_modules) {
if (module_factory) { m_modules->insert(String{ std::string{ name } }, module_factory()); }
if (module_factory) {
auto mod = module_factory();
if (name == "_io") { io_module = mod; }
m_modules->insert(String{ std::string{ name } }, mod);
}
}

{
auto open = io_module()->symbol_table()->map().at(String{ "open" });
ASSERT(io_module);
auto open = io_module->symbol_table()->map().at(String{ "open" });
m_builtins->add_symbol(PyString::create("open").unwrap(), open);
auto *file_io =
std::get<PyObject *>(io_module->symbol_table()->map().at(String{ "FileIO" }));
auto *buffered_writer =
std::get<PyObject *>(io_module->symbol_table()->map().at(String{ "BufferedWriter" }));
auto *text_io_wrapper =
std::get<PyObject *>(io_module->symbol_table()->map().at(String{ "TextIOWrapper" }));
auto py_stdout =
file_io->call(PyTuple::create(Number{ 1 }, String{ "wb" }).unwrap(), nullptr)
.and_then([buffered_writer](PyObject *stdout) {
return buffered_writer->call(PyTuple::create(stdout).unwrap(), nullptr);
})
.and_then([text_io_wrapper](PyObject *stdout_buffer_writer) {
return text_io_wrapper->call(
PyTuple::create(stdout_buffer_writer).unwrap(), nullptr);
});
ASSERT(py_stdout.is_ok());
auto py_stderr =
file_io->call(PyTuple::create(Number{ 2 }, String{ "wb" }).unwrap(), nullptr)
.and_then([buffered_writer](PyObject *stderr) {
return buffered_writer->call(PyTuple::create(stderr).unwrap(), nullptr);
})
.and_then([text_io_wrapper](PyObject *stderr_buffer_writer) {
return text_io_wrapper->call(
PyTuple::create(stderr_buffer_writer).unwrap(), nullptr);
});
ASSERT(py_stderr.is_ok());
sys->add_symbol(PyString::create("stdout").unwrap(), py_stdout.unwrap());
sys->add_symbol(PyString::create("stderr").unwrap(), py_stderr.unwrap());
}
// {
// auto open = io_module()->symbol_table()->map().at(String{ "open" });
// m_builtins->add_symbol(PyString::create("open").unwrap(), open);
// sys->add_symbol(PyString::create("stderr").unwrap(),
// std::get<PyObject *>(open)->call(PyTuple::create().unwrap(), nullptr).unwrap());
// }

if (config.requires_importlib) {
auto *_imp = imp_module();
Expand Down
19 changes: 19 additions & 0 deletions src/runtime/PyMemoryView.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -336,6 +336,25 @@ PyResult<PyObject *> PyMemoryView::tolist()

PyResult<PyObject *> PyMemoryView::__repr__() const { return PyString::create(to_string()); }

PyResult<std::monostate> PyMemoryView::__getbuffer__(PyBuffer &view, int /*flags*/)
{
// TODO: validate flags
view = PyBuffer{
.buf = m_view.buf->view(),
.obj = this,
.len = m_view.len,
.itemsize = m_view.itemsize,
.readonly = m_view.readonly,
.ndim = m_view.ndim,
.format = m_view.format,
.shape = m_view.shape,
.strides = m_view.strides,
.suboffsets = m_view.suboffsets,
.internal = m_view.internal,
};
return Ok(std::monostate{});
}

namespace {
std::once_flag memoryview_flag;

Expand Down
3 changes: 3 additions & 0 deletions src/runtime/PyMemoryView.hpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,9 @@ class PyMemoryView : public PyBaseObject

size_t itemsize() const { return m_view.itemsize; }

PyResult<std::monostate> __getbuffer__(PyBuffer &view, int /*flags*/);


private:
static PyResult<PyBuffer> create_view(PyBuffer &main_view);
};
Expand Down
7 changes: 1 addition & 6 deletions src/runtime/PyObject.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -468,12 +468,7 @@ PyResult<std::monostate> PyObject::get_buffer(PyBuffer &buffer, int flags)
{
return as_buffer().and_then(
[&buffer, flags, this](const PyBufferProcs &bc) -> PyResult<std::monostate> {
(void)buffer;
(void)flags;
(void)this;
(void)bc;
return Err(not_implemented_error("get_buffer not implemented!"));
// return bc.getbuffer(this, buffer, flags);
return bc.getbuffer(this, buffer, flags);
});
}

Expand Down
1 change: 1 addition & 0 deletions src/runtime/PyObject.hpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -433,6 +433,7 @@ class PyObject : public Cell
PyResult<PySequenceWrapper> as_sequence();
PyResult<PyBufferProcs> as_buffer();

// TODO: add strongly typed flags
PyResult<std::monostate> get_buffer(PyBuffer &, int flags);

PyResult<PyObject *> getattribute(PyObject *attribute) const;
Expand Down
58 changes: 50 additions & 8 deletions src/runtime/modules/BuiltinsModule.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -67,10 +67,20 @@ static PyModule *s_builtin_module = nullptr;

namespace {

PyResult<PyObject *> print(const PyTuple *args, const PyDict *kwargs, Interpreter &)
PyResult<PyObject *> print(const PyTuple *args, const PyDict *kwargs, Interpreter &interpreter)
{
std::string separator = " ";
std::string end = "\n";
auto *separator = PyString::create(" ").unwrap();
auto *end = PyString::create("\n").unwrap();
// TODO: handle error case?
PyObject *file =
PyObject::from(interpreter.get_imported_module(PyString::create("sys").unwrap())
->symbol_table()
->map()
.at(String{ "stdout" }))
.unwrap();
// sys.stdout may be None when FILE* stdout isn't connected
if (!file || file == py_none()) { return Ok(py_none()); }
bool flush = true;
if (kwargs) {
static const Value separator_keyword = String{ "sep" };
static const Value end_keyword = String{ "end" };
Expand All@@ -84,7 +94,7 @@ PyResult<PyObject *> print(const PyTuple *args, const PyDict *kwargs, Interprete
return Err(type_error(
"sep must be None or a string, not {}", obj.unwrap()->type()->name()));
}
separator = std::get<String>(maybe_str).s;
separator = PyString::create(std::get<String>(maybe_str).s).unwrap();
}
if (auto it = kwargs->map().find(end_keyword); it != kwargs->map().end()) {
auto maybe_str = it->second;
Expand All@@ -95,9 +105,12 @@ PyResult<PyObject *> print(const PyTuple *args, const PyDict *kwargs, Interprete
return Err(type_error(
"end must be None or a string, not {}", obj.unwrap()->type()->name()));
}
end = std::get<String>(maybe_str).s;
end = PyString::create(std::get<String>(maybe_str).s).unwrap();
}
}
auto file_write_ = file->get_method(PyString::create("write").unwrap());
if (file_write_.is_err()) { return file_write_; }
auto file_write = file_write_.unwrap();
auto strfunc = [](const PyResult<PyObject *> &arg) -> PyResult<PyString *> {
if (arg.is_err()) return Err(arg.unwrap_err());
return arg.unwrap()->str();
Expand All@@ -106,7 +119,16 @@ PyResult<PyObject *> print(const PyTuple *args, const PyDict *kwargs, Interprete
auto arg_it = args->begin();
auto arg_it_end = args->end();
if (arg_it == arg_it_end) {
std::cout << std::endl;
if (auto result =
file_write->call(PyTuple::create(PyString::create(end).unwrap()).unwrap(), nullptr);
result.is_err()) {
return result;
}
if (flush) {
auto file_flush_ = file->get_method(PyString::create("flush").unwrap());
if (file_flush_.is_err()) { return file_flush_; }
return file_flush_.unwrap()->call(nullptr, nullptr);
}
return Ok(py_none());
Comment thread
gf712 marked this conversation as resolved.
}
--arg_it_end;
Expand All@@ -117,7 +139,14 @@ PyResult<PyObject *> print(const PyTuple *args, const PyDict *kwargs, Interprete
if (reprobj_.is_err()) { return reprobj_; }
auto reprobj = reprobj_.unwrap();
spdlog::debug("repr result: {}", reprobj->value());
std::cout << reprobj->value() << separator;
if (auto result = file_write->call(PyTuple::create(reprobj).unwrap(), nullptr);
result.is_err()) {
return result;
}
Comment thread
gf712 marked this conversation as resolved.
if (auto result = file_write->call(PyTuple::create(separator).unwrap(), nullptr);
result.is_err()) {
return result;
}
std::advance(arg_it, 1);
}

Expand All@@ -126,8 +155,21 @@ PyResult<PyObject *> print(const PyTuple *args, const PyDict *kwargs, Interprete
if (reprobj_.is_err()) { return reprobj_; }
auto reprobj = reprobj_.unwrap();
spdlog::debug("repr result: {}", reprobj->value());
std::cout << reprobj->value() << end;
if (auto result = file_write->call(PyTuple::create(reprobj).unwrap(), nullptr);
result.is_err()) {
return result;
}

if (auto result =
file_write->call(PyTuple::create(PyString::create(end).unwrap()).unwrap(), nullptr);
result.is_err()) {
return result;
}
if (flush) {
auto file_flush_ = file->get_method(PyString::create("flush").unwrap());
if (file_flush_.is_err()) { return file_flush_; }
return file_flush_.unwrap()->call(nullptr, nullptr);
}
return Ok(py_none());
}

Expand Down
Loading
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
20 changes: 20 additions & 0 deletions integration/tests/file_io.py
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
# Regression test: closing a path-opened FileIO after reading must not crash.
# Previously FileIO.close() called ferror() on the underlying FILE* *after*
# closing it (which resets the pointer to NULL), segfaulting on ferror(NULL).
# This is the same path the import machinery uses to read a module's source.

# Run with cwd == integration/ (as the integration runner does).
DATA = "tests/file_io_data.txt"

# 1. read inside a `with` block -> __exit__ closes the file (the crashing path).
with open(DATA, "rb") as f:
data = f.read()
assert data == b"line1\nline2\n", data

# 2. explicit close, and close() must be idempotent (callable more than once).
g = open(DATA, "rb")
assert g.read() == b"line1\nline2\n"
g.close()
g.close()

print("file_io: ok")
2 changes: 2 additions & 0 deletions integration/tests/file_io_data.txt
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
line1
line2
45 changes: 37 additions & 8 deletions src/interpreter/Interpreter.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@
#include "executable/Program.hpp"
#include "executable/bytecode/Bytecode.hpp"
#include "executable/bytecode/BytecodeProgram.hpp"
#include "utilities.hpp"

#include <filesystem>

Expand DownExpand Up@@ -168,20 +169,48 @@ void Interpreter::internal_setup(const std::string &name,
m_codec_search_path = PyList::create().unwrap();
m_codec_search_path_cache = PyDict::create().unwrap();

PyModule *io_module;
for (const auto &[name, module_factory] : builtin_modules) {
if (module_factory) { m_modules->insert(String{ std::string{ name } }, module_factory()); }
if (module_factory) {
auto mod = module_factory();
if (name == "_io") { io_module = mod; }
m_modules->insert(String{ std::string{ name } }, mod);
}
}

{
auto open = io_module()->symbol_table()->map().at(String{ "open" });
ASSERT(io_module);
auto open = io_module->symbol_table()->map().at(String{ "open" });
m_builtins->add_symbol(PyString::create("open").unwrap(), open);
auto *file_io =
std::get<PyObject *>(io_module->symbol_table()->map().at(String{ "FileIO" }));
auto *buffered_writer =
std::get<PyObject *>(io_module->symbol_table()->map().at(String{ "BufferedWriter" }));
auto *text_io_wrapper =
std::get<PyObject *>(io_module->symbol_table()->map().at(String{ "TextIOWrapper" }));
auto py_stdout =
file_io->call(PyTuple::create(Number{ 1 }, String{ "wb" }).unwrap(), nullptr)
.and_then([buffered_writer](PyObject *stdout) {
return buffered_writer->call(PyTuple::create(stdout).unwrap(), nullptr);
})
.and_then([text_io_wrapper](PyObject *stdout_buffer_writer) {
return text_io_wrapper->call(
PyTuple::create(stdout_buffer_writer).unwrap(), nullptr);
});
ASSERT(py_stdout.is_ok());
auto py_stderr =
file_io->call(PyTuple::create(Number{ 2 }, String{ "wb" }).unwrap(), nullptr)
.and_then([buffered_writer](PyObject *stderr) {
return buffered_writer->call(PyTuple::create(stderr).unwrap(), nullptr);
})
.and_then([text_io_wrapper](PyObject *stderr_buffer_writer) {
return text_io_wrapper->call(
PyTuple::create(stderr_buffer_writer).unwrap(), nullptr);
});
ASSERT(py_stderr.is_ok());
sys->add_symbol(PyString::create("stdout").unwrap(), py_stdout.unwrap());
sys->add_symbol(PyString::create("stderr").unwrap(), py_stderr.unwrap());
}
// {
// auto open = io_module()->symbol_table()->map().at(String{ "open" });
// m_builtins->add_symbol(PyString::create("open").unwrap(), open);
// sys->add_symbol(PyString::create("stderr").unwrap(),
// std::get<PyObject *>(open)->call(PyTuple::create().unwrap(), nullptr).unwrap());
// }

if (config.requires_importlib) {
auto *_imp = imp_module();
Expand Down
19 changes: 19 additions & 0 deletions src/runtime/PyMemoryView.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -336,6 +336,25 @@ PyResult<PyObject *> PyMemoryView::tolist()

PyResult<PyObject *> PyMemoryView::__repr__() const { return PyString::create(to_string()); }

PyResult<std::monostate> PyMemoryView::__getbuffer__(PyBuffer &view, int /*flags*/)
{
// TODO: validate flags
view = PyBuffer{
.buf = m_view.buf->view(),
.obj = this,
.len = m_view.len,
.itemsize = m_view.itemsize,
.readonly = m_view.readonly,
.ndim = m_view.ndim,
.format = m_view.format,
.shape = m_view.shape,
.strides = m_view.strides,
.suboffsets = m_view.suboffsets,
.internal = m_view.internal,
};
return Ok(std::monostate{});
}

namespace {
std::once_flag memoryview_flag;

Expand Down
3 changes: 3 additions & 0 deletions src/runtime/PyMemoryView.hpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,9 @@ class PyMemoryView : public PyBaseObject

size_t itemsize() const { return m_view.itemsize; }

PyResult<std::monostate> __getbuffer__(PyBuffer &view, int /*flags*/);


private:
static PyResult<PyBuffer> create_view(PyBuffer &main_view);
};
Expand Down
7 changes: 1 addition & 6 deletions src/runtime/PyObject.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -468,12 +468,7 @@ PyResult<std::monostate> PyObject::get_buffer(PyBuffer &buffer, int flags)
{
return as_buffer().and_then(
[&buffer, flags, this](const PyBufferProcs &bc) -> PyResult<std::monostate> {
(void)buffer;
(void)flags;
(void)this;
(void)bc;
return Err(not_implemented_error("get_buffer not implemented!"));
// return bc.getbuffer(this, buffer, flags);
return bc.getbuffer(this, buffer, flags);
});
}

Expand Down
1 change: 1 addition & 0 deletions src/runtime/PyObject.hpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -433,6 +433,7 @@ class PyObject : public Cell
PyResult<PySequenceWrapper> as_sequence();
PyResult<PyBufferProcs> as_buffer();

// TODO: add strongly typed flags
PyResult<std::monostate> get_buffer(PyBuffer &, int flags);

PyResult<PyObject *> getattribute(PyObject *attribute) const;
Expand Down
58 changes: 50 additions & 8 deletions src/runtime/modules/BuiltinsModule.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -67,10 +67,20 @@ static PyModule *s_builtin_module = nullptr;

namespace {

PyResult<PyObject *> print(const PyTuple *args, const PyDict *kwargs, Interpreter &)
PyResult<PyObject *> print(const PyTuple *args, const PyDict *kwargs, Interpreter &interpreter)
{
std::string separator = " ";
std::string end = "\n";
auto *separator = PyString::create(" ").unwrap();
auto *end = PyString::create("\n").unwrap();
// TODO: handle error case?
PyObject *file =
PyObject::from(interpreter.get_imported_module(PyString::create("sys").unwrap())
->symbol_table()
->map()
.at(String{ "stdout" }))
.unwrap();
// sys.stdout may be None when FILE* stdout isn't connected
if (!file || file == py_none()) { return Ok(py_none()); }
bool flush = true;
if (kwargs) {
static const Value separator_keyword = String{ "sep" };
static const Value end_keyword = String{ "end" };
Expand All@@ -84,7 +94,7 @@ PyResult<PyObject *> print(const PyTuple *args, const PyDict *kwargs, Interprete
return Err(type_error(
"sep must be None or a string, not {}", obj.unwrap()->type()->name()));
}
separator = std::get<String>(maybe_str).s;
separator = PyString::create(std::get<String>(maybe_str).s).unwrap();
}
if (auto it = kwargs->map().find(end_keyword); it != kwargs->map().end()) {
auto maybe_str = it->second;
Expand All@@ -95,9 +105,12 @@ PyResult<PyObject *> print(const PyTuple *args, const PyDict *kwargs, Interprete
return Err(type_error(
"end must be None or a string, not {}", obj.unwrap()->type()->name()));
}
end = std::get<String>(maybe_str).s;
end = PyString::create(std::get<String>(maybe_str).s).unwrap();
}
}
auto file_write_ = file->get_method(PyString::create("write").unwrap());
if (file_write_.is_err()) { return file_write_; }
auto file_write = file_write_.unwrap();
auto strfunc = [](const PyResult<PyObject *> &arg) -> PyResult<PyString *> {
if (arg.is_err()) return Err(arg.unwrap_err());
return arg.unwrap()->str();
Expand All@@ -106,7 +119,16 @@ PyResult<PyObject *> print(const PyTuple *args, const PyDict *kwargs, Interprete
auto arg_it = args->begin();
auto arg_it_end = args->end();
if (arg_it == arg_it_end) {
std::cout << std::endl;
if (auto result =
file_write->call(PyTuple::create(PyString::create(end).unwrap()).unwrap(), nullptr);
result.is_err()) {
return result;
}
if (flush) {
auto file_flush_ = file->get_method(PyString::create("flush").unwrap());
if (file_flush_.is_err()) { return file_flush_; }
return file_flush_.unwrap()->call(nullptr, nullptr);
}
return Ok(py_none());
Comment thread
gf712 marked this conversation as resolved.
}
--arg_it_end;
Expand All@@ -117,7 +139,14 @@ PyResult<PyObject *> print(const PyTuple *args, const PyDict *kwargs, Interprete
if (reprobj_.is_err()) { return reprobj_; }
auto reprobj = reprobj_.unwrap();
spdlog::debug("repr result: {}", reprobj->value());
std::cout << reprobj->value() << separator;
if (auto result = file_write->call(PyTuple::create(reprobj).unwrap(), nullptr);
result.is_err()) {
return result;
}
Comment thread
gf712 marked this conversation as resolved.
if (auto result = file_write->call(PyTuple::create(separator).unwrap(), nullptr);
result.is_err()) {
return result;
}
std::advance(arg_it, 1);
}

Expand All@@ -126,8 +155,21 @@ PyResult<PyObject *> print(const PyTuple *args, const PyDict *kwargs, Interprete
if (reprobj_.is_err()) { return reprobj_; }
auto reprobj = reprobj_.unwrap();
spdlog::debug("repr result: {}", reprobj->value());
std::cout << reprobj->value() << end;
if (auto result = file_write->call(PyTuple::create(reprobj).unwrap(), nullptr);
result.is_err()) {
return result;
}

if (auto result =
file_write->call(PyTuple::create(PyString::create(end).unwrap()).unwrap(), nullptr);
result.is_err()) {
return result;
}
if (flush) {
auto file_flush_ = file->get_method(PyString::create("flush").unwrap());
if (file_flush_.is_err()) { return file_flush_; }
return file_flush_.unwrap()->call(nullptr, nullptr);
}
return Ok(py_none());
}

Expand Down
Loading
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
20 changes: 20 additions & 0 deletions integration/tests/file_io.py
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
# Regression test: closing a path-opened FileIO after reading must not crash.
# Previously FileIO.close() called ferror() on the underlying FILE* *after*
# closing it (which resets the pointer to NULL), segfaulting on ferror(NULL).
# This is the same path the import machinery uses to read a module's source.

# Run with cwd == integration/ (as the integration runner does).
DATA = "tests/file_io_data.txt"

# 1. read inside a `with` block -> __exit__ closes the file (the crashing path).
with open(DATA, "rb") as f:
data = f.read()
assert data == b"line1\nline2\n", data

# 2. explicit close, and close() must be idempotent (callable more than once).
g = open(DATA, "rb")
assert g.read() == b"line1\nline2\n"
g.close()
g.close()

print("file_io: ok")
2 changes: 2 additions & 0 deletions integration/tests/file_io_data.txt
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
line1
line2
45 changes: 37 additions & 8 deletions src/interpreter/Interpreter.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@
#include "executable/Program.hpp"
#include "executable/bytecode/Bytecode.hpp"
#include "executable/bytecode/BytecodeProgram.hpp"
#include "utilities.hpp"

#include <filesystem>

Expand DownExpand Up@@ -168,20 +169,48 @@ void Interpreter::internal_setup(const std::string &name,
m_codec_search_path = PyList::create().unwrap();
m_codec_search_path_cache = PyDict::create().unwrap();

PyModule *io_module;
for (const auto &[name, module_factory] : builtin_modules) {
if (module_factory) { m_modules->insert(String{ std::string{ name } }, module_factory()); }
if (module_factory) {
auto mod = module_factory();
if (name == "_io") { io_module = mod; }
m_modules->insert(String{ std::string{ name } }, mod);
}
}

{
auto open = io_module()->symbol_table()->map().at(String{ "open" });
ASSERT(io_module);
auto open = io_module->symbol_table()->map().at(String{ "open" });
m_builtins->add_symbol(PyString::create("open").unwrap(), open);
auto *file_io =
std::get<PyObject *>(io_module->symbol_table()->map().at(String{ "FileIO" }));
auto *buffered_writer =
std::get<PyObject *>(io_module->symbol_table()->map().at(String{ "BufferedWriter" }));
auto *text_io_wrapper =
std::get<PyObject *>(io_module->symbol_table()->map().at(String{ "TextIOWrapper" }));
auto py_stdout =
file_io->call(PyTuple::create(Number{ 1 }, String{ "wb" }).unwrap(), nullptr)
.and_then([buffered_writer](PyObject *stdout) {
return buffered_writer->call(PyTuple::create(stdout).unwrap(), nullptr);
})
.and_then([text_io_wrapper](PyObject *stdout_buffer_writer) {
return text_io_wrapper->call(
PyTuple::create(stdout_buffer_writer).unwrap(), nullptr);
});
ASSERT(py_stdout.is_ok());
auto py_stderr =
file_io->call(PyTuple::create(Number{ 2 }, String{ "wb" }).unwrap(), nullptr)
.and_then([buffered_writer](PyObject *stderr) {
return buffered_writer->call(PyTuple::create(stderr).unwrap(), nullptr);
})
.and_then([text_io_wrapper](PyObject *stderr_buffer_writer) {
return text_io_wrapper->call(
PyTuple::create(stderr_buffer_writer).unwrap(), nullptr);
});
ASSERT(py_stderr.is_ok());
sys->add_symbol(PyString::create("stdout").unwrap(), py_stdout.unwrap());
sys->add_symbol(PyString::create("stderr").unwrap(), py_stderr.unwrap());
}
// {
// auto open = io_module()->symbol_table()->map().at(String{ "open" });
// m_builtins->add_symbol(PyString::create("open").unwrap(), open);
// sys->add_symbol(PyString::create("stderr").unwrap(),
// std::get<PyObject *>(open)->call(PyTuple::create().unwrap(), nullptr).unwrap());
// }

if (config.requires_importlib) {
auto *_imp = imp_module();
Expand Down
19 changes: 19 additions & 0 deletions src/runtime/PyMemoryView.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -336,6 +336,25 @@ PyResult<PyObject *> PyMemoryView::tolist()

PyResult<PyObject *> PyMemoryView::__repr__() const { return PyString::create(to_string()); }

PyResult<std::monostate> PyMemoryView::__getbuffer__(PyBuffer &view, int /*flags*/)
{
// TODO: validate flags
view = PyBuffer{
.buf = m_view.buf->view(),
.obj = this,
.len = m_view.len,
.itemsize = m_view.itemsize,
.readonly = m_view.readonly,
.ndim = m_view.ndim,
.format = m_view.format,
.shape = m_view.shape,
.strides = m_view.strides,
.suboffsets = m_view.suboffsets,
.internal = m_view.internal,
};
return Ok(std::monostate{});
}

namespace {
std::once_flag memoryview_flag;

Expand Down
3 changes: 3 additions & 0 deletions src/runtime/PyMemoryView.hpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,9 @@ class PyMemoryView : public PyBaseObject

size_t itemsize() const { return m_view.itemsize; }

PyResult<std::monostate> __getbuffer__(PyBuffer &view, int /*flags*/);


private:
static PyResult<PyBuffer> create_view(PyBuffer &main_view);
};
Expand Down
7 changes: 1 addition & 6 deletions src/runtime/PyObject.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -468,12 +468,7 @@ PyResult<std::monostate> PyObject::get_buffer(PyBuffer &buffer, int flags)
{
return as_buffer().and_then(
[&buffer, flags, this](const PyBufferProcs &bc) -> PyResult<std::monostate> {
(void)buffer;
(void)flags;
(void)this;
(void)bc;
return Err(not_implemented_error("get_buffer not implemented!"));
// return bc.getbuffer(this, buffer, flags);
return bc.getbuffer(this, buffer, flags);
});
}

Expand Down
1 change: 1 addition & 0 deletions src/runtime/PyObject.hpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -433,6 +433,7 @@ class PyObject : public Cell
PyResult<PySequenceWrapper> as_sequence();
PyResult<PyBufferProcs> as_buffer();

// TODO: add strongly typed flags
PyResult<std::monostate> get_buffer(PyBuffer &, int flags);

PyResult<PyObject *> getattribute(PyObject *attribute) const;
Expand Down
58 changes: 50 additions & 8 deletions src/runtime/modules/BuiltinsModule.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -67,10 +67,20 @@ static PyModule *s_builtin_module = nullptr;

namespace {

PyResult<PyObject *> print(const PyTuple *args, const PyDict *kwargs, Interpreter &)
PyResult<PyObject *> print(const PyTuple *args, const PyDict *kwargs, Interpreter &interpreter)
{
std::string separator = " ";
std::string end = "\n";
auto *separator = PyString::create(" ").unwrap();
auto *end = PyString::create("\n").unwrap();
// TODO: handle error case?
PyObject *file =
PyObject::from(interpreter.get_imported_module(PyString::create("sys").unwrap())
->symbol_table()
->map()
.at(String{ "stdout" }))
.unwrap();
// sys.stdout may be None when FILE* stdout isn't connected
if (!file || file == py_none()) { return Ok(py_none()); }
bool flush = true;
if (kwargs) {
static const Value separator_keyword = String{ "sep" };
static const Value end_keyword = String{ "end" };
Expand All@@ -84,7 +94,7 @@ PyResult<PyObject *> print(const PyTuple *args, const PyDict *kwargs, Interprete
return Err(type_error(
"sep must be None or a string, not {}", obj.unwrap()->type()->name()));
}
separator = std::get<String>(maybe_str).s;
separator = PyString::create(std::get<String>(maybe_str).s).unwrap();
}
if (auto it = kwargs->map().find(end_keyword); it != kwargs->map().end()) {
auto maybe_str = it->second;
Expand All@@ -95,9 +105,12 @@ PyResult<PyObject *> print(const PyTuple *args, const PyDict *kwargs, Interprete
return Err(type_error(
"end must be None or a string, not {}", obj.unwrap()->type()->name()));
}
end = std::get<String>(maybe_str).s;
end = PyString::create(std::get<String>(maybe_str).s).unwrap();
}
}
auto file_write_ = file->get_method(PyString::create("write").unwrap());
if (file_write_.is_err()) { return file_write_; }
auto file_write = file_write_.unwrap();
auto strfunc = [](const PyResult<PyObject *> &arg) -> PyResult<PyString *> {
if (arg.is_err()) return Err(arg.unwrap_err());
return arg.unwrap()->str();
Expand All@@ -106,7 +119,16 @@ PyResult<PyObject *> print(const PyTuple *args, const PyDict *kwargs, Interprete
auto arg_it = args->begin();
auto arg_it_end = args->end();
if (arg_it == arg_it_end) {
std::cout << std::endl;
if (auto result =
file_write->call(PyTuple::create(PyString::create(end).unwrap()).unwrap(), nullptr);
result.is_err()) {
return result;
}
if (flush) {
auto file_flush_ = file->get_method(PyString::create("flush").unwrap());
if (file_flush_.is_err()) { return file_flush_; }
return file_flush_.unwrap()->call(nullptr, nullptr);
}
return Ok(py_none());
Comment thread
gf712 marked this conversation as resolved.
}
--arg_it_end;
Expand All@@ -117,7 +139,14 @@ PyResult<PyObject *> print(const PyTuple *args, const PyDict *kwargs, Interprete
if (reprobj_.is_err()) { return reprobj_; }
auto reprobj = reprobj_.unwrap();
spdlog::debug("repr result: {}", reprobj->value());
std::cout << reprobj->value() << separator;
if (auto result = file_write->call(PyTuple::create(reprobj).unwrap(), nullptr);
result.is_err()) {
return result;
}
Comment thread
gf712 marked this conversation as resolved.
if (auto result = file_write->call(PyTuple::create(separator).unwrap(), nullptr);
result.is_err()) {
return result;
}
std::advance(arg_it, 1);
}

Expand All@@ -126,8 +155,21 @@ PyResult<PyObject *> print(const PyTuple *args, const PyDict *kwargs, Interprete
if (reprobj_.is_err()) { return reprobj_; }
auto reprobj = reprobj_.unwrap();
spdlog::debug("repr result: {}", reprobj->value());
std::cout << reprobj->value() << end;
if (auto result = file_write->call(PyTuple::create(reprobj).unwrap(), nullptr);
result.is_err()) {
return result;
}

if (auto result =
file_write->call(PyTuple::create(PyString::create(end).unwrap()).unwrap(), nullptr);
result.is_err()) {
return result;
}
if (flush) {
auto file_flush_ = file->get_method(PyString::create("flush").unwrap());
if (file_flush_.is_err()) { return file_flush_; }
return file_flush_.unwrap()->call(nullptr, nullptr);
}
return Ok(py_none());
}

Expand Down
Loading
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
20 changes: 20 additions & 0 deletions integration/tests/file_io.py
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
# Regression test: closing a path-opened FileIO after reading must not crash.
# Previously FileIO.close() called ferror() on the underlying FILE* *after*
# closing it (which resets the pointer to NULL), segfaulting on ferror(NULL).
# This is the same path the import machinery uses to read a module's source.

# Run with cwd == integration/ (as the integration runner does).
DATA = "tests/file_io_data.txt"

# 1. read inside a `with` block -> __exit__ closes the file (the crashing path).
with open(DATA, "rb") as f:
data = f.read()
assert data == b"line1\nline2\n", data

# 2. explicit close, and close() must be idempotent (callable more than once).
g = open(DATA, "rb")
assert g.read() == b"line1\nline2\n"
g.close()
g.close()

print("file_io: ok")
2 changes: 2 additions & 0 deletions integration/tests/file_io_data.txt
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
line1
line2
45 changes: 37 additions & 8 deletions src/interpreter/Interpreter.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@
#include "executable/Program.hpp"
#include "executable/bytecode/Bytecode.hpp"
#include "executable/bytecode/BytecodeProgram.hpp"
#include "utilities.hpp"

#include <filesystem>

Expand DownExpand Up@@ -168,20 +169,48 @@ void Interpreter::internal_setup(const std::string &name,
m_codec_search_path = PyList::create().unwrap();
m_codec_search_path_cache = PyDict::create().unwrap();

PyModule *io_module;
for (const auto &[name, module_factory] : builtin_modules) {
if (module_factory) { m_modules->insert(String{ std::string{ name } }, module_factory()); }
if (module_factory) {
auto mod = module_factory();
if (name == "_io") { io_module = mod; }
m_modules->insert(String{ std::string{ name } }, mod);
}
}

{
auto open = io_module()->symbol_table()->map().at(String{ "open" });
ASSERT(io_module);
auto open = io_module->symbol_table()->map().at(String{ "open" });
m_builtins->add_symbol(PyString::create("open").unwrap(), open);
auto *file_io =
std::get<PyObject *>(io_module->symbol_table()->map().at(String{ "FileIO" }));
auto *buffered_writer =
std::get<PyObject *>(io_module->symbol_table()->map().at(String{ "BufferedWriter" }));
auto *text_io_wrapper =
std::get<PyObject *>(io_module->symbol_table()->map().at(String{ "TextIOWrapper" }));
auto py_stdout =
file_io->call(PyTuple::create(Number{ 1 }, String{ "wb" }).unwrap(), nullptr)
.and_then([buffered_writer](PyObject *stdout) {
return buffered_writer->call(PyTuple::create(stdout).unwrap(), nullptr);
})
.and_then([text_io_wrapper](PyObject *stdout_buffer_writer) {
return text_io_wrapper->call(
PyTuple::create(stdout_buffer_writer).unwrap(), nullptr);
});
ASSERT(py_stdout.is_ok());
auto py_stderr =
file_io->call(PyTuple::create(Number{ 2 }, String{ "wb" }).unwrap(), nullptr)
.and_then([buffered_writer](PyObject *stderr) {
return buffered_writer->call(PyTuple::create(stderr).unwrap(), nullptr);
})
.and_then([text_io_wrapper](PyObject *stderr_buffer_writer) {
return text_io_wrapper->call(
PyTuple::create(stderr_buffer_writer).unwrap(), nullptr);
});
ASSERT(py_stderr.is_ok());
sys->add_symbol(PyString::create("stdout").unwrap(), py_stdout.unwrap());
sys->add_symbol(PyString::create("stderr").unwrap(), py_stderr.unwrap());
}
// {
// auto open = io_module()->symbol_table()->map().at(String{ "open" });
// m_builtins->add_symbol(PyString::create("open").unwrap(), open);
// sys->add_symbol(PyString::create("stderr").unwrap(),
// std::get<PyObject *>(open)->call(PyTuple::create().unwrap(), nullptr).unwrap());
// }

if (config.requires_importlib) {
auto *_imp = imp_module();
Expand Down
19 changes: 19 additions & 0 deletions src/runtime/PyMemoryView.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -336,6 +336,25 @@ PyResult<PyObject *> PyMemoryView::tolist()

PyResult<PyObject *> PyMemoryView::__repr__() const { return PyString::create(to_string()); }

PyResult<std::monostate> PyMemoryView::__getbuffer__(PyBuffer &view, int /*flags*/)
{
// TODO: validate flags
view = PyBuffer{
.buf = m_view.buf->view(),
.obj = this,
.len = m_view.len,
.itemsize = m_view.itemsize,
.readonly = m_view.readonly,
.ndim = m_view.ndim,
.format = m_view.format,
.shape = m_view.shape,
.strides = m_view.strides,
.suboffsets = m_view.suboffsets,
.internal = m_view.internal,
};
return Ok(std::monostate{});
}

namespace {
std::once_flag memoryview_flag;

Expand Down
3 changes: 3 additions & 0 deletions src/runtime/PyMemoryView.hpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,9 @@ class PyMemoryView : public PyBaseObject

size_t itemsize() const { return m_view.itemsize; }

PyResult<std::monostate> __getbuffer__(PyBuffer &view, int /*flags*/);


private:
static PyResult<PyBuffer> create_view(PyBuffer &main_view);
};
Expand Down
7 changes: 1 addition & 6 deletions src/runtime/PyObject.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -468,12 +468,7 @@ PyResult<std::monostate> PyObject::get_buffer(PyBuffer &buffer, int flags)
{
return as_buffer().and_then(
[&buffer, flags, this](const PyBufferProcs &bc) -> PyResult<std::monostate> {
(void)buffer;
(void)flags;
(void)this;
(void)bc;
return Err(not_implemented_error("get_buffer not implemented!"));
// return bc.getbuffer(this, buffer, flags);
return bc.getbuffer(this, buffer, flags);
});
}

Expand Down
1 change: 1 addition & 0 deletions src/runtime/PyObject.hpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -433,6 +433,7 @@ class PyObject : public Cell
PyResult<PySequenceWrapper> as_sequence();
PyResult<PyBufferProcs> as_buffer();

// TODO: add strongly typed flags
PyResult<std::monostate> get_buffer(PyBuffer &, int flags);

PyResult<PyObject *> getattribute(PyObject *attribute) const;
Expand Down
58 changes: 50 additions & 8 deletions src/runtime/modules/BuiltinsModule.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -67,10 +67,20 @@ static PyModule *s_builtin_module = nullptr;

namespace {

PyResult<PyObject *> print(const PyTuple *args, const PyDict *kwargs, Interpreter &)
PyResult<PyObject *> print(const PyTuple *args, const PyDict *kwargs, Interpreter &interpreter)
{
std::string separator = " ";
std::string end = "\n";
auto *separator = PyString::create(" ").unwrap();
auto *end = PyString::create("\n").unwrap();
// TODO: handle error case?
PyObject *file =
PyObject::from(interpreter.get_imported_module(PyString::create("sys").unwrap())
->symbol_table()
->map()
.at(String{ "stdout" }))
.unwrap();
// sys.stdout may be None when FILE* stdout isn't connected
if (!file || file == py_none()) { return Ok(py_none()); }
bool flush = true;
if (kwargs) {
static const Value separator_keyword = String{ "sep" };
static const Value end_keyword = String{ "end" };
Expand All@@ -84,7 +94,7 @@ PyResult<PyObject *> print(const PyTuple *args, const PyDict *kwargs, Interprete
return Err(type_error(
"sep must be None or a string, not {}", obj.unwrap()->type()->name()));
}
separator = std::get<String>(maybe_str).s;
separator = PyString::create(std::get<String>(maybe_str).s).unwrap();
}
if (auto it = kwargs->map().find(end_keyword); it != kwargs->map().end()) {
auto maybe_str = it->second;
Expand All@@ -95,9 +105,12 @@ PyResult<PyObject *> print(const PyTuple *args, const PyDict *kwargs, Interprete
return Err(type_error(
"end must be None or a string, not {}", obj.unwrap()->type()->name()));
}
end = std::get<String>(maybe_str).s;
end = PyString::create(std::get<String>(maybe_str).s).unwrap();
}
}
auto file_write_ = file->get_method(PyString::create("write").unwrap());
if (file_write_.is_err()) { return file_write_; }
auto file_write = file_write_.unwrap();
auto strfunc = [](const PyResult<PyObject *> &arg) -> PyResult<PyString *> {
if (arg.is_err()) return Err(arg.unwrap_err());
return arg.unwrap()->str();
Expand All@@ -106,7 +119,16 @@ PyResult<PyObject *> print(const PyTuple *args, const PyDict *kwargs, Interprete
auto arg_it = args->begin();
auto arg_it_end = args->end();
if (arg_it == arg_it_end) {
std::cout << std::endl;
if (auto result =
file_write->call(PyTuple::create(PyString::create(end).unwrap()).unwrap(), nullptr);
result.is_err()) {
return result;
}
if (flush) {
auto file_flush_ = file->get_method(PyString::create("flush").unwrap());
if (file_flush_.is_err()) { return file_flush_; }
return file_flush_.unwrap()->call(nullptr, nullptr);
}
return Ok(py_none());
Comment thread
gf712 marked this conversation as resolved.
}
--arg_it_end;
Expand All@@ -117,7 +139,14 @@ PyResult<PyObject *> print(const PyTuple *args, const PyDict *kwargs, Interprete
if (reprobj_.is_err()) { return reprobj_; }
auto reprobj = reprobj_.unwrap();
spdlog::debug("repr result: {}", reprobj->value());
std::cout << reprobj->value() << separator;
if (auto result = file_write->call(PyTuple::create(reprobj).unwrap(), nullptr);
result.is_err()) {
return result;
}
Comment thread
gf712 marked this conversation as resolved.
if (auto result = file_write->call(PyTuple::create(separator).unwrap(), nullptr);
result.is_err()) {
return result;
}
std::advance(arg_it, 1);
}

Expand All@@ -126,8 +155,21 @@ PyResult<PyObject *> print(const PyTuple *args, const PyDict *kwargs, Interprete
if (reprobj_.is_err()) { return reprobj_; }
auto reprobj = reprobj_.unwrap();
spdlog::debug("repr result: {}", reprobj->value());
std::cout << reprobj->value() << end;
if (auto result = file_write->call(PyTuple::create(reprobj).unwrap(), nullptr);
result.is_err()) {
return result;
}

if (auto result =
file_write->call(PyTuple::create(PyString::create(end).unwrap()).unwrap(), nullptr);
result.is_err()) {
return result;
}
if (flush) {
auto file_flush_ = file->get_method(PyString::create("flush").unwrap());
if (file_flush_.is_err()) { return file_flush_; }
return file_flush_.unwrap()->call(nullptr, nullptr);
}
return Ok(py_none());
}

Expand Down
Loading
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
20 changes: 20 additions & 0 deletions integration/tests/file_io.py
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
# Regression test: closing a path-opened FileIO after reading must not crash.
# Previously FileIO.close() called ferror() on the underlying FILE* *after*
# closing it (which resets the pointer to NULL), segfaulting on ferror(NULL).
# This is the same path the import machinery uses to read a module's source.

# Run with cwd == integration/ (as the integration runner does).
DATA = "tests/file_io_data.txt"

# 1. read inside a `with` block -> __exit__ closes the file (the crashing path).
with open(DATA, "rb") as f:
data = f.read()
assert data == b"line1\nline2\n", data

# 2. explicit close, and close() must be idempotent (callable more than once).
g = open(DATA, "rb")
assert g.read() == b"line1\nline2\n"
g.close()
g.close()

print("file_io: ok")
2 changes: 2 additions & 0 deletions integration/tests/file_io_data.txt
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
line1
line2
45 changes: 37 additions & 8 deletions src/interpreter/Interpreter.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@
#include "executable/Program.hpp"
#include "executable/bytecode/Bytecode.hpp"
#include "executable/bytecode/BytecodeProgram.hpp"
#include "utilities.hpp"

#include <filesystem>

Expand DownExpand Up@@ -168,20 +169,48 @@ void Interpreter::internal_setup(const std::string &name,
m_codec_search_path = PyList::create().unwrap();
m_codec_search_path_cache = PyDict::create().unwrap();

PyModule *io_module;
for (const auto &[name, module_factory] : builtin_modules) {
if (module_factory) { m_modules->insert(String{ std::string{ name } }, module_factory()); }
if (module_factory) {
auto mod = module_factory();
if (name == "_io") { io_module = mod; }
m_modules->insert(String{ std::string{ name } }, mod);
}
}

{
auto open = io_module()->symbol_table()->map().at(String{ "open" });
ASSERT(io_module);
auto open = io_module->symbol_table()->map().at(String{ "open" });
m_builtins->add_symbol(PyString::create("open").unwrap(), open);
auto *file_io =
std::get<PyObject *>(io_module->symbol_table()->map().at(String{ "FileIO" }));
auto *buffered_writer =
std::get<PyObject *>(io_module->symbol_table()->map().at(String{ "BufferedWriter" }));
auto *text_io_wrapper =
std::get<PyObject *>(io_module->symbol_table()->map().at(String{ "TextIOWrapper" }));
auto py_stdout =
file_io->call(PyTuple::create(Number{ 1 }, String{ "wb" }).unwrap(), nullptr)
.and_then([buffered_writer](PyObject *stdout) {
return buffered_writer->call(PyTuple::create(stdout).unwrap(), nullptr);
})
.and_then([text_io_wrapper](PyObject *stdout_buffer_writer) {
return text_io_wrapper->call(
PyTuple::create(stdout_buffer_writer).unwrap(), nullptr);
});
ASSERT(py_stdout.is_ok());
auto py_stderr =
file_io->call(PyTuple::create(Number{ 2 }, String{ "wb" }).unwrap(), nullptr)
.and_then([buffered_writer](PyObject *stderr) {
return buffered_writer->call(PyTuple::create(stderr).unwrap(), nullptr);
})
.and_then([text_io_wrapper](PyObject *stderr_buffer_writer) {
return text_io_wrapper->call(
PyTuple::create(stderr_buffer_writer).unwrap(), nullptr);
});
ASSERT(py_stderr.is_ok());
sys->add_symbol(PyString::create("stdout").unwrap(), py_stdout.unwrap());
sys->add_symbol(PyString::create("stderr").unwrap(), py_stderr.unwrap());
}
// {
// auto open = io_module()->symbol_table()->map().at(String{ "open" });
// m_builtins->add_symbol(PyString::create("open").unwrap(), open);
// sys->add_symbol(PyString::create("stderr").unwrap(),
// std::get<PyObject *>(open)->call(PyTuple::create().unwrap(), nullptr).unwrap());
// }

if (config.requires_importlib) {
auto *_imp = imp_module();
Expand Down
19 changes: 19 additions & 0 deletions src/runtime/PyMemoryView.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -336,6 +336,25 @@ PyResult<PyObject *> PyMemoryView::tolist()

PyResult<PyObject *> PyMemoryView::__repr__() const { return PyString::create(to_string()); }

PyResult<std::monostate> PyMemoryView::__getbuffer__(PyBuffer &view, int /*flags*/)
{
// TODO: validate flags
view = PyBuffer{
.buf = m_view.buf->view(),
.obj = this,
.len = m_view.len,
.itemsize = m_view.itemsize,
.readonly = m_view.readonly,
.ndim = m_view.ndim,
.format = m_view.format,
.shape = m_view.shape,
.strides = m_view.strides,
.suboffsets = m_view.suboffsets,
.internal = m_view.internal,
};
return Ok(std::monostate{});
}

namespace {
std::once_flag memoryview_flag;

Expand Down
3 changes: 3 additions & 0 deletions src/runtime/PyMemoryView.hpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,9 @@ class PyMemoryView : public PyBaseObject

size_t itemsize() const { return m_view.itemsize; }

PyResult<std::monostate> __getbuffer__(PyBuffer &view, int /*flags*/);


private:
static PyResult<PyBuffer> create_view(PyBuffer &main_view);
};
Expand Down
7 changes: 1 addition & 6 deletions src/runtime/PyObject.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -468,12 +468,7 @@ PyResult<std::monostate> PyObject::get_buffer(PyBuffer &buffer, int flags)
{
return as_buffer().and_then(
[&buffer, flags, this](const PyBufferProcs &bc) -> PyResult<std::monostate> {
(void)buffer;
(void)flags;
(void)this;
(void)bc;
return Err(not_implemented_error("get_buffer not implemented!"));
// return bc.getbuffer(this, buffer, flags);
return bc.getbuffer(this, buffer, flags);
});
}

Expand Down
1 change: 1 addition & 0 deletions src/runtime/PyObject.hpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -433,6 +433,7 @@ class PyObject : public Cell
PyResult<PySequenceWrapper> as_sequence();
PyResult<PyBufferProcs> as_buffer();

// TODO: add strongly typed flags
PyResult<std::monostate> get_buffer(PyBuffer &, int flags);

PyResult<PyObject *> getattribute(PyObject *attribute) const;
Expand Down
58 changes: 50 additions & 8 deletions src/runtime/modules/BuiltinsModule.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -67,10 +67,20 @@ static PyModule *s_builtin_module = nullptr;

namespace {

PyResult<PyObject *> print(const PyTuple *args, const PyDict *kwargs, Interpreter &)
PyResult<PyObject *> print(const PyTuple *args, const PyDict *kwargs, Interpreter &interpreter)
{
std::string separator = " ";
std::string end = "\n";
auto *separator = PyString::create(" ").unwrap();
auto *end = PyString::create("\n").unwrap();
// TODO: handle error case?
PyObject *file =
PyObject::from(interpreter.get_imported_module(PyString::create("sys").unwrap())
->symbol_table()
->map()
.at(String{ "stdout" }))
.unwrap();
// sys.stdout may be None when FILE* stdout isn't connected
if (!file || file == py_none()) { return Ok(py_none()); }
bool flush = true;
if (kwargs) {
static const Value separator_keyword = String{ "sep" };
static const Value end_keyword = String{ "end" };
Expand All@@ -84,7 +94,7 @@ PyResult<PyObject *> print(const PyTuple *args, const PyDict *kwargs, Interprete
return Err(type_error(
"sep must be None or a string, not {}", obj.unwrap()->type()->name()));
}
separator = std::get<String>(maybe_str).s;
separator = PyString::create(std::get<String>(maybe_str).s).unwrap();
}
if (auto it = kwargs->map().find(end_keyword); it != kwargs->map().end()) {
auto maybe_str = it->second;
Expand All@@ -95,9 +105,12 @@ PyResult<PyObject *> print(const PyTuple *args, const PyDict *kwargs, Interprete
return Err(type_error(
"end must be None or a string, not {}", obj.unwrap()->type()->name()));
}
end = std::get<String>(maybe_str).s;
end = PyString::create(std::get<String>(maybe_str).s).unwrap();
}
}
auto file_write_ = file->get_method(PyString::create("write").unwrap());
if (file_write_.is_err()) { return file_write_; }
auto file_write = file_write_.unwrap();
auto strfunc = [](const PyResult<PyObject *> &arg) -> PyResult<PyString *> {
if (arg.is_err()) return Err(arg.unwrap_err());
return arg.unwrap()->str();
Expand All@@ -106,7 +119,16 @@ PyResult<PyObject *> print(const PyTuple *args, const PyDict *kwargs, Interprete
auto arg_it = args->begin();
auto arg_it_end = args->end();
if (arg_it == arg_it_end) {
std::cout << std::endl;
if (auto result =
file_write->call(PyTuple::create(PyString::create(end).unwrap()).unwrap(), nullptr);
result.is_err()) {
return result;
}
if (flush) {
auto file_flush_ = file->get_method(PyString::create("flush").unwrap());
if (file_flush_.is_err()) { return file_flush_; }
return file_flush_.unwrap()->call(nullptr, nullptr);
}
return Ok(py_none());
Comment thread
gf712 marked this conversation as resolved.
}
--arg_it_end;
Expand All@@ -117,7 +139,14 @@ PyResult<PyObject *> print(const PyTuple *args, const PyDict *kwargs, Interprete
if (reprobj_.is_err()) { return reprobj_; }
auto reprobj = reprobj_.unwrap();
spdlog::debug("repr result: {}", reprobj->value());
std::cout << reprobj->value() << separator;
if (auto result = file_write->call(PyTuple::create(reprobj).unwrap(), nullptr);
result.is_err()) {
return result;
}
Comment thread
gf712 marked this conversation as resolved.
if (auto result = file_write->call(PyTuple::create(separator).unwrap(), nullptr);
result.is_err()) {
return result;
}
std::advance(arg_it, 1);
}

Expand All@@ -126,8 +155,21 @@ PyResult<PyObject *> print(const PyTuple *args, const PyDict *kwargs, Interprete
if (reprobj_.is_err()) { return reprobj_; }
auto reprobj = reprobj_.unwrap();
spdlog::debug("repr result: {}", reprobj->value());
std::cout << reprobj->value() << end;
if (auto result = file_write->call(PyTuple::create(reprobj).unwrap(), nullptr);
result.is_err()) {
return result;
}

if (auto result =
file_write->call(PyTuple::create(PyString::create(end).unwrap()).unwrap(), nullptr);
result.is_err()) {
return result;
}
if (flush) {
auto file_flush_ = file->get_method(PyString::create("flush").unwrap());
if (file_flush_.is_err()) { return file_flush_; }
return file_flush_.unwrap()->call(nullptr, nullptr);
}
return Ok(py_none());
}

Expand Down
Loading
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
20 changes: 20 additions & 0 deletions integration/tests/file_io.py
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
# Regression test: closing a path-opened FileIO after reading must not crash.
# Previously FileIO.close() called ferror() on the underlying FILE* *after*
# closing it (which resets the pointer to NULL), segfaulting on ferror(NULL).
# This is the same path the import machinery uses to read a module's source.

# Run with cwd == integration/ (as the integration runner does).
DATA = "tests/file_io_data.txt"

# 1. read inside a `with` block -> __exit__ closes the file (the crashing path).
with open(DATA, "rb") as f:
data = f.read()
assert data == b"line1\nline2\n", data

# 2. explicit close, and close() must be idempotent (callable more than once).
g = open(DATA, "rb")
assert g.read() == b"line1\nline2\n"
g.close()
g.close()

print("file_io: ok")
2 changes: 2 additions & 0 deletions integration/tests/file_io_data.txt
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
line1
line2
45 changes: 37 additions & 8 deletions src/interpreter/Interpreter.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@
#include "executable/Program.hpp"
#include "executable/bytecode/Bytecode.hpp"
#include "executable/bytecode/BytecodeProgram.hpp"
#include "utilities.hpp"

#include <filesystem>

Expand DownExpand Up@@ -168,20 +169,48 @@ void Interpreter::internal_setup(const std::string &name,
m_codec_search_path = PyList::create().unwrap();
m_codec_search_path_cache = PyDict::create().unwrap();

PyModule *io_module;
for (const auto &[name, module_factory] : builtin_modules) {
if (module_factory) { m_modules->insert(String{ std::string{ name } }, module_factory()); }
if (module_factory) {
auto mod = module_factory();
if (name == "_io") { io_module = mod; }
m_modules->insert(String{ std::string{ name } }, mod);
}
}

{
auto open = io_module()->symbol_table()->map().at(String{ "open" });
ASSERT(io_module);
auto open = io_module->symbol_table()->map().at(String{ "open" });
m_builtins->add_symbol(PyString::create("open").unwrap(), open);
auto *file_io =
std::get<PyObject *>(io_module->symbol_table()->map().at(String{ "FileIO" }));
auto *buffered_writer =
std::get<PyObject *>(io_module->symbol_table()->map().at(String{ "BufferedWriter" }));
auto *text_io_wrapper =
std::get<PyObject *>(io_module->symbol_table()->map().at(String{ "TextIOWrapper" }));
auto py_stdout =
file_io->call(PyTuple::create(Number{ 1 }, String{ "wb" }).unwrap(), nullptr)
.and_then([buffered_writer](PyObject *stdout) {
return buffered_writer->call(PyTuple::create(stdout).unwrap(), nullptr);
})
.and_then([text_io_wrapper](PyObject *stdout_buffer_writer) {
return text_io_wrapper->call(
PyTuple::create(stdout_buffer_writer).unwrap(), nullptr);
});
ASSERT(py_stdout.is_ok());
auto py_stderr =
file_io->call(PyTuple::create(Number{ 2 }, String{ "wb" }).unwrap(), nullptr)
.and_then([buffered_writer](PyObject *stderr) {
return buffered_writer->call(PyTuple::create(stderr).unwrap(), nullptr);
})
.and_then([text_io_wrapper](PyObject *stderr_buffer_writer) {
return text_io_wrapper->call(
PyTuple::create(stderr_buffer_writer).unwrap(), nullptr);
});
ASSERT(py_stderr.is_ok());
sys->add_symbol(PyString::create("stdout").unwrap(), py_stdout.unwrap());
sys->add_symbol(PyString::create("stderr").unwrap(), py_stderr.unwrap());
}
// {
// auto open = io_module()->symbol_table()->map().at(String{ "open" });
// m_builtins->add_symbol(PyString::create("open").unwrap(), open);
// sys->add_symbol(PyString::create("stderr").unwrap(),
// std::get<PyObject *>(open)->call(PyTuple::create().unwrap(), nullptr).unwrap());
// }

if (config.requires_importlib) {
auto *_imp = imp_module();
Expand Down
19 changes: 19 additions & 0 deletions src/runtime/PyMemoryView.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -336,6 +336,25 @@ PyResult<PyObject *> PyMemoryView::tolist()

PyResult<PyObject *> PyMemoryView::__repr__() const { return PyString::create(to_string()); }

PyResult<std::monostate> PyMemoryView::__getbuffer__(PyBuffer &view, int /*flags*/)
{
// TODO: validate flags
view = PyBuffer{
.buf = m_view.buf->view(),
.obj = this,
.len = m_view.len,
.itemsize = m_view.itemsize,
.readonly = m_view.readonly,
.ndim = m_view.ndim,
.format = m_view.format,
.shape = m_view.shape,
.strides = m_view.strides,
.suboffsets = m_view.suboffsets,
.internal = m_view.internal,
};
return Ok(std::monostate{});
}

namespace {
std::once_flag memoryview_flag;

Expand Down
3 changes: 3 additions & 0 deletions src/runtime/PyMemoryView.hpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,9 @@ class PyMemoryView : public PyBaseObject

size_t itemsize() const { return m_view.itemsize; }

PyResult<std::monostate> __getbuffer__(PyBuffer &view, int /*flags*/);


private:
static PyResult<PyBuffer> create_view(PyBuffer &main_view);
};
Expand Down
7 changes: 1 addition & 6 deletions src/runtime/PyObject.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -468,12 +468,7 @@ PyResult<std::monostate> PyObject::get_buffer(PyBuffer &buffer, int flags)
{
return as_buffer().and_then(
[&buffer, flags, this](const PyBufferProcs &bc) -> PyResult<std::monostate> {
(void)buffer;
(void)flags;
(void)this;
(void)bc;
return Err(not_implemented_error("get_buffer not implemented!"));
// return bc.getbuffer(this, buffer, flags);
return bc.getbuffer(this, buffer, flags);
});
}

Expand Down
1 change: 1 addition & 0 deletions src/runtime/PyObject.hpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -433,6 +433,7 @@ class PyObject : public Cell
PyResult<PySequenceWrapper> as_sequence();
PyResult<PyBufferProcs> as_buffer();

// TODO: add strongly typed flags
PyResult<std::monostate> get_buffer(PyBuffer &, int flags);

PyResult<PyObject *> getattribute(PyObject *attribute) const;
Expand Down
58 changes: 50 additions & 8 deletions src/runtime/modules/BuiltinsModule.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -67,10 +67,20 @@ static PyModule *s_builtin_module = nullptr;

namespace {

PyResult<PyObject *> print(const PyTuple *args, const PyDict *kwargs, Interpreter &)
PyResult<PyObject *> print(const PyTuple *args, const PyDict *kwargs, Interpreter &interpreter)
{
std::string separator = " ";
std::string end = "\n";
auto *separator = PyString::create(" ").unwrap();
auto *end = PyString::create("\n").unwrap();
// TODO: handle error case?
PyObject *file =
PyObject::from(interpreter.get_imported_module(PyString::create("sys").unwrap())
->symbol_table()
->map()
.at(String{ "stdout" }))
.unwrap();
// sys.stdout may be None when FILE* stdout isn't connected
if (!file || file == py_none()) { return Ok(py_none()); }
bool flush = true;
if (kwargs) {
static const Value separator_keyword = String{ "sep" };
static const Value end_keyword = String{ "end" };
Expand All@@ -84,7 +94,7 @@ PyResult<PyObject *> print(const PyTuple *args, const PyDict *kwargs, Interprete
return Err(type_error(
"sep must be None or a string, not {}", obj.unwrap()->type()->name()));
}
separator = std::get<String>(maybe_str).s;
separator = PyString::create(std::get<String>(maybe_str).s).unwrap();
}
if (auto it = kwargs->map().find(end_keyword); it != kwargs->map().end()) {
auto maybe_str = it->second;
Expand All@@ -95,9 +105,12 @@ PyResult<PyObject *> print(const PyTuple *args, const PyDict *kwargs, Interprete
return Err(type_error(
"end must be None or a string, not {}", obj.unwrap()->type()->name()));
}
end = std::get<String>(maybe_str).s;
end = PyString::create(std::get<String>(maybe_str).s).unwrap();
}
}
auto file_write_ = file->get_method(PyString::create("write").unwrap());
if (file_write_.is_err()) { return file_write_; }
auto file_write = file_write_.unwrap();
auto strfunc = [](const PyResult<PyObject *> &arg) -> PyResult<PyString *> {
if (arg.is_err()) return Err(arg.unwrap_err());
return arg.unwrap()->str();
Expand All@@ -106,7 +119,16 @@ PyResult<PyObject *> print(const PyTuple *args, const PyDict *kwargs, Interprete
auto arg_it = args->begin();
auto arg_it_end = args->end();
if (arg_it == arg_it_end) {
std::cout << std::endl;
if (auto result =
file_write->call(PyTuple::create(PyString::create(end).unwrap()).unwrap(), nullptr);
result.is_err()) {
return result;
}
if (flush) {
auto file_flush_ = file->get_method(PyString::create("flush").unwrap());
if (file_flush_.is_err()) { return file_flush_; }
return file_flush_.unwrap()->call(nullptr, nullptr);
}
return Ok(py_none());
Comment thread
gf712 marked this conversation as resolved.
}
--arg_it_end;
Expand All@@ -117,7 +139,14 @@ PyResult<PyObject *> print(const PyTuple *args, const PyDict *kwargs, Interprete
if (reprobj_.is_err()) { return reprobj_; }
auto reprobj = reprobj_.unwrap();
spdlog::debug("repr result: {}", reprobj->value());
std::cout << reprobj->value() << separator;
if (auto result = file_write->call(PyTuple::create(reprobj).unwrap(), nullptr);
result.is_err()) {
return result;
}
Comment thread
gf712 marked this conversation as resolved.
if (auto result = file_write->call(PyTuple::create(separator).unwrap(), nullptr);
result.is_err()) {
return result;
}
std::advance(arg_it, 1);
}

Expand All@@ -126,8 +155,21 @@ PyResult<PyObject *> print(const PyTuple *args, const PyDict *kwargs, Interprete
if (reprobj_.is_err()) { return reprobj_; }
auto reprobj = reprobj_.unwrap();
spdlog::debug("repr result: {}", reprobj->value());
std::cout << reprobj->value() << end;
if (auto result = file_write->call(PyTuple::create(reprobj).unwrap(), nullptr);
result.is_err()) {
return result;
}

if (auto result =
file_write->call(PyTuple::create(PyString::create(end).unwrap()).unwrap(), nullptr);
result.is_err()) {
return result;
}
if (flush) {
auto file_flush_ = file->get_method(PyString::create("flush").unwrap());
if (file_flush_.is_err()) { return file_flush_; }
return file_flush_.unwrap()->call(nullptr, nullptr);
}
return Ok(py_none());
}

Expand Down
Loading
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
20 changes: 20 additions & 0 deletions integration/tests/file_io.py
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
# Regression test: closing a path-opened FileIO after reading must not crash.
# Previously FileIO.close() called ferror() on the underlying FILE* *after*
# closing it (which resets the pointer to NULL), segfaulting on ferror(NULL).
# This is the same path the import machinery uses to read a module's source.

# Run with cwd == integration/ (as the integration runner does).
DATA = "tests/file_io_data.txt"

# 1. read inside a `with` block -> __exit__ closes the file (the crashing path).
with open(DATA, "rb") as f:
data = f.read()
assert data == b"line1\nline2\n", data

# 2. explicit close, and close() must be idempotent (callable more than once).
g = open(DATA, "rb")
assert g.read() == b"line1\nline2\n"
g.close()
g.close()

print("file_io: ok")
2 changes: 2 additions & 0 deletions integration/tests/file_io_data.txt
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
line1
line2
45 changes: 37 additions & 8 deletions src/interpreter/Interpreter.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@
#include "executable/Program.hpp"
#include "executable/bytecode/Bytecode.hpp"
#include "executable/bytecode/BytecodeProgram.hpp"
#include "utilities.hpp"

#include <filesystem>

Expand DownExpand Up@@ -168,20 +169,48 @@ void Interpreter::internal_setup(const std::string &name,
m_codec_search_path = PyList::create().unwrap();
m_codec_search_path_cache = PyDict::create().unwrap();

PyModule *io_module;
for (const auto &[name, module_factory] : builtin_modules) {
if (module_factory) { m_modules->insert(String{ std::string{ name } }, module_factory()); }
if (module_factory) {
auto mod = module_factory();
if (name == "_io") { io_module = mod; }
m_modules->insert(String{ std::string{ name } }, mod);
}
}

{
auto open = io_module()->symbol_table()->map().at(String{ "open" });
ASSERT(io_module);
auto open = io_module->symbol_table()->map().at(String{ "open" });
m_builtins->add_symbol(PyString::create("open").unwrap(), open);
auto *file_io =
std::get<PyObject *>(io_module->symbol_table()->map().at(String{ "FileIO" }));
auto *buffered_writer =
std::get<PyObject *>(io_module->symbol_table()->map().at(String{ "BufferedWriter" }));
auto *text_io_wrapper =
std::get<PyObject *>(io_module->symbol_table()->map().at(String{ "TextIOWrapper" }));
auto py_stdout =
file_io->call(PyTuple::create(Number{ 1 }, String{ "wb" }).unwrap(), nullptr)
.and_then([buffered_writer](PyObject *stdout) {
return buffered_writer->call(PyTuple::create(stdout).unwrap(), nullptr);
})
.and_then([text_io_wrapper](PyObject *stdout_buffer_writer) {
return text_io_wrapper->call(
PyTuple::create(stdout_buffer_writer).unwrap(), nullptr);
});
ASSERT(py_stdout.is_ok());
auto py_stderr =
file_io->call(PyTuple::create(Number{ 2 }, String{ "wb" }).unwrap(), nullptr)
.and_then([buffered_writer](PyObject *stderr) {
return buffered_writer->call(PyTuple::create(stderr).unwrap(), nullptr);
})
.and_then([text_io_wrapper](PyObject *stderr_buffer_writer) {
return text_io_wrapper->call(
PyTuple::create(stderr_buffer_writer).unwrap(), nullptr);
});
ASSERT(py_stderr.is_ok());
sys->add_symbol(PyString::create("stdout").unwrap(), py_stdout.unwrap());
sys->add_symbol(PyString::create("stderr").unwrap(), py_stderr.unwrap());
}
// {
// auto open = io_module()->symbol_table()->map().at(String{ "open" });
// m_builtins->add_symbol(PyString::create("open").unwrap(), open);
// sys->add_symbol(PyString::create("stderr").unwrap(),
// std::get<PyObject *>(open)->call(PyTuple::create().unwrap(), nullptr).unwrap());
// }

if (config.requires_importlib) {
auto *_imp = imp_module();
Expand Down
19 changes: 19 additions & 0 deletions src/runtime/PyMemoryView.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -336,6 +336,25 @@ PyResult<PyObject *> PyMemoryView::tolist()

PyResult<PyObject *> PyMemoryView::__repr__() const { return PyString::create(to_string()); }

PyResult<std::monostate> PyMemoryView::__getbuffer__(PyBuffer &view, int /*flags*/)
{
// TODO: validate flags
view = PyBuffer{
.buf = m_view.buf->view(),
.obj = this,
.len = m_view.len,
.itemsize = m_view.itemsize,
.readonly = m_view.readonly,
.ndim = m_view.ndim,
.format = m_view.format,
.shape = m_view.shape,
.strides = m_view.strides,
.suboffsets = m_view.suboffsets,
.internal = m_view.internal,
};
return Ok(std::monostate{});
}

namespace {
std::once_flag memoryview_flag;

Expand Down
3 changes: 3 additions & 0 deletions src/runtime/PyMemoryView.hpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,9 @@ class PyMemoryView : public PyBaseObject

size_t itemsize() const { return m_view.itemsize; }

PyResult<std::monostate> __getbuffer__(PyBuffer &view, int /*flags*/);


private:
static PyResult<PyBuffer> create_view(PyBuffer &main_view);
};
Expand Down
7 changes: 1 addition & 6 deletions src/runtime/PyObject.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -468,12 +468,7 @@ PyResult<std::monostate> PyObject::get_buffer(PyBuffer &buffer, int flags)
{
return as_buffer().and_then(
[&buffer, flags, this](const PyBufferProcs &bc) -> PyResult<std::monostate> {
(void)buffer;
(void)flags;
(void)this;
(void)bc;
return Err(not_implemented_error("get_buffer not implemented!"));
// return bc.getbuffer(this, buffer, flags);
return bc.getbuffer(this, buffer, flags);
});
}

Expand Down
1 change: 1 addition & 0 deletions src/runtime/PyObject.hpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -433,6 +433,7 @@ class PyObject : public Cell
PyResult<PySequenceWrapper> as_sequence();
PyResult<PyBufferProcs> as_buffer();

// TODO: add strongly typed flags
PyResult<std::monostate> get_buffer(PyBuffer &, int flags);

PyResult<PyObject *> getattribute(PyObject *attribute) const;
Expand Down
58 changes: 50 additions & 8 deletions src/runtime/modules/BuiltinsModule.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -67,10 +67,20 @@ static PyModule *s_builtin_module = nullptr;

namespace {

PyResult<PyObject *> print(const PyTuple *args, const PyDict *kwargs, Interpreter &)
PyResult<PyObject *> print(const PyTuple *args, const PyDict *kwargs, Interpreter &interpreter)
{
std::string separator = " ";
std::string end = "\n";
auto *separator = PyString::create(" ").unwrap();
auto *end = PyString::create("\n").unwrap();
// TODO: handle error case?
PyObject *file =
PyObject::from(interpreter.get_imported_module(PyString::create("sys").unwrap())
->symbol_table()
->map()
.at(String{ "stdout" }))
.unwrap();
// sys.stdout may be None when FILE* stdout isn't connected
if (!file || file == py_none()) { return Ok(py_none()); }
bool flush = true;
if (kwargs) {
static const Value separator_keyword = String{ "sep" };
static const Value end_keyword = String{ "end" };
Expand All@@ -84,7 +94,7 @@ PyResult<PyObject *> print(const PyTuple *args, const PyDict *kwargs, Interprete
return Err(type_error(
"sep must be None or a string, not {}", obj.unwrap()->type()->name()));
}
separator = std::get<String>(maybe_str).s;
separator = PyString::create(std::get<String>(maybe_str).s).unwrap();
}
if (auto it = kwargs->map().find(end_keyword); it != kwargs->map().end()) {
auto maybe_str = it->second;
Expand All@@ -95,9 +105,12 @@ PyResult<PyObject *> print(const PyTuple *args, const PyDict *kwargs, Interprete
return Err(type_error(
"end must be None or a string, not {}", obj.unwrap()->type()->name()));
}
end = std::get<String>(maybe_str).s;
end = PyString::create(std::get<String>(maybe_str).s).unwrap();
}
}
auto file_write_ = file->get_method(PyString::create("write").unwrap());
if (file_write_.is_err()) { return file_write_; }
auto file_write = file_write_.unwrap();
auto strfunc = [](const PyResult<PyObject *> &arg) -> PyResult<PyString *> {
if (arg.is_err()) return Err(arg.unwrap_err());
return arg.unwrap()->str();
Expand All@@ -106,7 +119,16 @@ PyResult<PyObject *> print(const PyTuple *args, const PyDict *kwargs, Interprete
auto arg_it = args->begin();
auto arg_it_end = args->end();
if (arg_it == arg_it_end) {
std::cout << std::endl;
if (auto result =
file_write->call(PyTuple::create(PyString::create(end).unwrap()).unwrap(), nullptr);
result.is_err()) {
return result;
}
if (flush) {
auto file_flush_ = file->get_method(PyString::create("flush").unwrap());
if (file_flush_.is_err()) { return file_flush_; }
return file_flush_.unwrap()->call(nullptr, nullptr);
}
return Ok(py_none());
Comment thread
gf712 marked this conversation as resolved.
}
--arg_it_end;
Expand All@@ -117,7 +139,14 @@ PyResult<PyObject *> print(const PyTuple *args, const PyDict *kwargs, Interprete
if (reprobj_.is_err()) { return reprobj_; }
auto reprobj = reprobj_.unwrap();
spdlog::debug("repr result: {}", reprobj->value());
std::cout << reprobj->value() << separator;
if (auto result = file_write->call(PyTuple::create(reprobj).unwrap(), nullptr);
result.is_err()) {
return result;
}
Comment thread
gf712 marked this conversation as resolved.
if (auto result = file_write->call(PyTuple::create(separator).unwrap(), nullptr);
result.is_err()) {
return result;
}
std::advance(arg_it, 1);
}

Expand All@@ -126,8 +155,21 @@ PyResult<PyObject *> print(const PyTuple *args, const PyDict *kwargs, Interprete
if (reprobj_.is_err()) { return reprobj_; }
auto reprobj = reprobj_.unwrap();
spdlog::debug("repr result: {}", reprobj->value());
std::cout << reprobj->value() << end;
if (auto result = file_write->call(PyTuple::create(reprobj).unwrap(), nullptr);
result.is_err()) {
return result;
}

if (auto result =
file_write->call(PyTuple::create(PyString::create(end).unwrap()).unwrap(), nullptr);
result.is_err()) {
return result;
}
if (flush) {
auto file_flush_ = file->get_method(PyString::create("flush").unwrap());
if (file_flush_.is_err()) { return file_flush_; }
return file_flush_.unwrap()->call(nullptr, nullptr);
}
return Ok(py_none());
}

Expand Down
Loading
Loading