X Tutup
Skip to content

Align symtable filename handling and global error locations with CPython #7142

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

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

Align symtable filename handling and global error locations with CPython #7142

Show file tree
Hide file tree
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
1 change: 0 additions & 1 deletion Lib/test/test_symtable.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,7 +457,6 @@ def check_body(body, expected_methods):
check_body('\n'.join((gen, func)), ('genexpr',))
check_body('\n'.join((func, gen)), ('genexpr',))

@unittest.expectedFailure # TODO: RUSTPYTHON
def test_filename_correct(self):
### Bug tickler: SyntaxError file name correct whether error raised
### while parsing or building symbol table.
Expand Down
6 changes: 4 additions & 2 deletions crates/codegen/src/symboltable.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1185,13 +1185,15 @@ impl SymbolTableBuilder {

match &statement {
Stmt::Global(StmtGlobal { names, .. }) => {
let statement_range = statement.range();
for name in names {
self.register_ident(name, SymbolUsage::Global)?;
self.register_name(name.as_str(), SymbolUsage::Global, statement_range)?;
}
}
Stmt::Nonlocal(StmtNonlocal { names, .. }) => {
let statement_range = statement.range();
for name in names {
self.register_ident(name, SymbolUsage::Nonlocal)?;
self.register_name(name.as_str(), SymbolUsage::Nonlocal, statement_range)?;
}
}
Stmt::FunctionDef(StmtFunctionDef {
Expand Down
6 changes: 4 additions & 2 deletions crates/vm/src/stdlib/symtable.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ mod _symtable {
PyObjectRef, PyPayload, PyRef, PyResult, VirtualMachine,
builtins::{PyDictRef, PyStrRef},
compiler,
ospath::OsPath,
};
use alloc::fmt;
use rustpython_codegen::symboltable::{
Expand Down Expand Up @@ -111,16 +112,17 @@ mod _symtable {
#[pyfunction]
fn symtable(
source: PyStrRef,
filename: PyStrRef,
filename: OsPath,
mode: PyStrRef,
vm: &VirtualMachine,
) -> PyResult<PyRef<PySymbolTable>> {
let mode = mode
.as_str()
.parse::<compiler::Mode>()
.map_err(|err| vm.new_value_error(err.to_string()))?;
let filename = filename.to_string_lossy();

let symtable = compiler::compile_symtable(source.as_str(), mode, filename.as_str())
let symtable = compiler::compile_symtable(source.as_str(), mode, filename.as_ref())
.map_err(|err| vm.new_syntax_error(&err, Some(source.as_str())))?;

let py_symbol_table = to_py_symbol_table(symtable);
Expand Down
Loading
X Tutup