mirror of
https://github.com/RustPython/RustPython.git
synced 2026-10-29 03:04:38 +08:00
* Align compiler and AST behavior with CPython
Update the compiler pipeline, AST module support, and related VM compile/eval paths toward CPython 3.14 behavior.
Use upstream Ruff parser crates directly and keep RustPython-specific syntax preflight handling in the compile path.
Refresh opcode metadata, snapshots, and targeted tests for the aligned bytecode and AST behavior.
* fix
* Fix PR 8138 CI failures
* Fix match mapping wildcard scan complexity
* fixes
* Use Ruff runtime AST fields
* Minimize residual patch diff
* refactor error handling
* Remove _ast conversion context wrappers
* Clean up _ast conversion glue and compiler warning escalation
Rename the Node conversion parameter `ctx` to `vm` throughout the _ast
module.
Remove the unused compile_program, compile_program_single,
compile_block_expression, and compile_expression forwarders; compile_top
stays as the entry point.
Stash an escalated compiler SyntaxWarning so a non-SyntaxWarning category
propagates unchanged instead of being rewritten to SyntaxError, matching
PyErr_ExceptionMatches(SyntaxWarning) in compiler_warn. Drop the now-unused
CompileWarningError::into_codegen_error.
Replace the PositionalArguments two-variant enum with a struct holding a
shared range and a PositionalArgumentsKind enum.
Assisted-by: Claude
* Represent compiler flags as a CompilerFlags bitflags
Replace the loose PY_CF_*/CO_* i32 constants in compile_mode with a
CompilerFlags bitflags covering the PyCF_* flags and __future__
CO_FUTURE_* bits. The Python-visible ast.PyCF_* attribute values are
derived from it via bits(); parser input modes stay plain consts.
builtins::compile and the compile_string flag handling test flags
through CompilerFlags::contains instead of raw bit math.
Assisted-by: Claude
* Fix PR 8138 test regressions
* Fix PR 8138 CI failures
* Avoid shell interpolation in Linux deps action
* Fix review findings in compiler/AST changes
- frame.rs: compute the MATCH_CLASS class name lazily so a successful
match no longer takes the type name lock or allocates; the
__match_args__-not-a-tuple branch reuses it instead of recomputing.
- _ast/constant.rs: add the missing leading space to the with_recursion
label ("maximum recursion depth exceeded during compilation").
- sys.set_int_max_str_digits: restore the "maxdigits must be 0 or larger
than {n}" error text.
- codegen: set CO_MAXBLOCKS to 20 in both ir.rs and compile.rs.
- _ast/exception.rs: extract the duplicated excepthandler node guard
into ensure_excepthandler_node.
- codegen: correct the validate_keywords doc comment.
- Drop redundant "CPython" qualifiers from comments added in this branch.
Assisted-by: Claude
86 lines
2.9 KiB
Rust
86 lines
2.9 KiB
Rust
//! This example show cases a very simple REPL.
|
|
//! While a much better REPL can be found in ../src/shell,
|
|
//! This much smaller REPL is still a useful example because it showcases inserting
|
|
//! values and functions into the Python runtime's scope, and showcases use
|
|
//! of the compilation mode "Single".
|
|
|
|
use rustpython_vm as vm;
|
|
// these are needed for special memory shenanigans to let us share a variable with Python and Rust
|
|
use std::sync::atomic::{AtomicBool, Ordering};
|
|
|
|
// This has to be a macro because it uses the py_compile macro,
|
|
// which compiles python source to optimized bytecode at compile time, so that
|
|
// the program you're embedding this into doesn't take longer to start up.
|
|
macro_rules! add_python_function {
|
|
( $scope:ident, $vm:ident, $src:literal $(,)? ) => {{
|
|
// compile the code to bytecode
|
|
let code = vm::py_compile!(source = $src);
|
|
// convert the rustpython_compiler_core::CodeObject to a PyRef<PyCode>
|
|
let code = $vm.ctx.new_code(code);
|
|
|
|
// run the python code in the scope to store the function
|
|
$vm.run_code_obj(code, $scope.clone())
|
|
}};
|
|
}
|
|
|
|
static ON: AtomicBool = AtomicBool::new(true);
|
|
|
|
fn on(b: bool) {
|
|
ON.store(b, Ordering::Relaxed);
|
|
}
|
|
|
|
fn main() -> vm::PyResult<()> {
|
|
vm::Interpreter::without_stdlib(Default::default()).enter(run)
|
|
}
|
|
|
|
fn run(vm: &vm::VirtualMachine) -> vm::PyResult<()> {
|
|
let mut input = String::with_capacity(50);
|
|
let stdin = std::io::stdin();
|
|
|
|
let scope: vm::scope::Scope = vm.new_scope_with_builtins();
|
|
|
|
// typing `quit()` is too long, let's make `on(False)` work instead.
|
|
scope
|
|
.globals
|
|
.set_item("on", vm.new_function("on", on).into(), vm)?;
|
|
|
|
// let's include a fibonacci function, but let's be lazy and write it in Python
|
|
add_python_function!(
|
|
scope,
|
|
vm,
|
|
// a fun line to test this with is
|
|
// ''.join( l * fib(i) for i, l in enumerate('supercalifragilistic') )
|
|
r#"\
|
|
def fib(n):
|
|
return n if n <= 1 else fib(n - 1) + fib(n - 2)
|
|
"#
|
|
)?;
|
|
|
|
while ON.load(Ordering::Relaxed) {
|
|
input.clear();
|
|
stdin
|
|
.read_line(&mut input)
|
|
.expect("Failed to read line of input");
|
|
|
|
// this line also automatically prints the output
|
|
// (note that this is only the case when compiler::Mode::Single is passed to vm.compile)
|
|
match vm
|
|
.compile(&input, vm::compiler::Mode::Single, "<embedded>")
|
|
.map_err(|err| err.into_pyexception(vm, Some(&input)))
|
|
.and_then(|code_obj| vm.run_code_obj(code_obj, scope.clone()))
|
|
{
|
|
Ok(output) => {
|
|
// store the last value in the "last" variable
|
|
if !vm.is_none(&output) {
|
|
scope.globals.set_item("last", output, vm)?;
|
|
}
|
|
}
|
|
Err(exc) => {
|
|
vm.print_exception(exc);
|
|
}
|
|
}
|
|
}
|
|
|
|
Ok(())
|
|
}
|