Skip to content

Dis dis #555

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

Merged
merged 3 commits into from
Feb 26, 2019
Merged

Dis dis #555

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2c0016a
Minimal definition of dis.dis.
cthulahoops Feb 22, 2019
79f43ad
Add support for pulling __code__ out of a function (and a test that h…
cthulahoops Feb 22, 2019
73a65a1
dis.rs - small refactor dis_dis.
cthulahoops Feb 26, 2019
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
32 changes: 28 additions & 4 deletions tests/snippets/dismod.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,34 @@
import dis

dis.disassemble(compile("5 + x + 5 or 2", "", "eval"))
dis.dis(compile("5 + x + 5 or 2", "", "eval"))
print("\n")
dis.disassemble(compile("def f(x):\n return 1", "", "exec"))
dis.dis(compile("def f(x):\n return 1", "", "exec"))
print("\n")
dis.disassemble(compile("if a:\n 1 or 2\nelif x == 'hello':\n 3\nelse:\n 4", "", "exec"))
dis.dis(compile("if a:\n 1 or 2\nelif x == 'hello':\n 3\nelse:\n 4", "", "exec"))
print("\n")
dis.disassemble(compile("f(x=1, y=2)", "", "eval"))
dis.dis(compile("f(x=1, y=2)", "", "eval"))
print("\n")

def f():
with g():
try:
for a in {1: 4, 2: 5}:
yield [True and False or True, []]
except Exception:
raise not ValueError({1 for i in [1,2,3]})

dis.dis(f)

class A(object):
def f():
x += 1
pass
def g():
for i in range(5):
if i:
continue
else:
break

print("A.f\n")
dis.dis(A.f)
13 changes: 13 additions & 0 deletions vm/src/stdlib/dis.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,18 @@ use crate::obj::objcode;
use crate::pyobject::{PyContext, PyFuncArgs, PyObjectRef, PyResult, TypeProtocol};
use crate::vm::VirtualMachine;

fn dis_dis(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
arg_check!(vm, args, required = [(obj, None)]);

// Method or function:
let code_name = vm.new_str("__code__".to_string());
if let Ok(co) = vm.get_attribute(obj.clone(), code_name) {
return dis_disassemble(vm, PyFuncArgs::new(vec![co], vec![]));
}

dis_disassemble(vm, PyFuncArgs::new(vec![obj.clone()], vec![]))
}

fn dis_disassemble(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
arg_check!(vm, args, required = [(co, Some(vm.ctx.code_type()))]);

Expand All @@ -12,6 +24,7 @@ fn dis_disassemble(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {

pub fn mk_module(ctx: &PyContext) -> PyObjectRef {
py_module!(ctx, "dis", {
"dis" => ctx.new_rustfunc(dis_dis),
"disassemble" => ctx.new_rustfunc(dis_disassemble)
})
}