Skip to content

Allow dis.dis to take file #6078

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Allow dis.dis to take file #6078

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
49 changes: 44 additions & 5 deletions stdlib/src/dis.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,24 @@ pub(crate) use decl::make_module;

#[pymodule(name = "dis")]
mod decl {
use crate::vm::{
use rustpython_vm::{
PyObjectRef, PyRef, PyResult, TryFromObject, VirtualMachine,
builtins::{PyCode, PyDictRef, PyStrRef},
bytecode::CodeFlags,
function::OptionalArg,
};

#[derive(FromArgs)]
struct DisArgs {
#[pyarg(positional)]
obj: PyObjectRef,
#[pyarg(any, optional)]
file: OptionalArg<PyObjectRef>,
}

#[pyfunction]
fn dis(obj: PyObjectRef, vm: &VirtualMachine) -> PyResult<()> {
fn dis(args: DisArgs, vm: &VirtualMachine) -> PyResult<()> {
let DisArgs { obj, file } = args;
let co = if let Ok(co) = obj.get_attr("__code__", vm) {
// Method or function:
PyRef::try_from_object(vm, co)?
Expand All @@ -33,12 +43,41 @@ mod decl {
} else {
PyRef::try_from_object(vm, obj)?
};
disassemble(co)
disassemble_to_file(co, file.into_option(), vm)
}

#[pyfunction]
fn disassemble(co: PyRef<PyCode>) -> PyResult<()> {
print!("{}", &co.code);
fn disassemble(
co: PyRef<PyCode>,
file: OptionalArg<PyObjectRef>,
vm: &VirtualMachine,
) -> PyResult<()> {
disassemble_to_file(co, file.into_option(), vm)
}

fn disassemble_to_file(
co: PyRef<PyCode>,
file: Option<PyObjectRef>,
vm: &VirtualMachine,
) -> PyResult<()> {
let output = format!("{}", &co.code);

match file {
Some(file_obj) => {
// Write to the provided file object
if let Ok(write_method) = file_obj.get_attr("write", vm) {
write_method.call((output,), vm)?;
} else {
return Err(
vm.new_type_error("file argument must have a write method".to_owned())
);
}
}
None => {
// Write to stdout
print!("{output}");
}
}
Ok(())
}

Expand Down
Loading