Skip to content

Align symtable flag names with CPython #8184

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
youknowone merged 12 commits into from
Jul 2, 2026
Merged

Align symtable flag names with CPython #8184

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
7a53285
ASSIGNED -> DEF_LOCAL
ShaharNaveh Jun 27, 2026
d84717a
GLOBAL -> DEF_GLOBAL
ShaharNaveh Jun 27, 2026
a75c55b
REFERENCED -> USE
ShaharNaveh Jun 27, 2026
70e834c
PARAMETER -> DEF_PARAM
ShaharNaveh Jun 27, 2026
fd2a934
expose symbol flags directly as a pyattr
ShaharNaveh Jun 27, 2026
5d36d38
FREE_CLASS -> DEF_FREE_CLASS
ShaharNaveh Jun 27, 2026
c3b424c
IMPORTED -> DEF_IMPORT
ShaharNaveh Jun 27, 2026
3c2480b
ANNOTATED -> DEF_ANNOT
ShaharNaveh Jun 27, 2026
d25ca85
DEF_COMP_ITER DEF_COMP_CELL DEF_TYPE_PARAM
ShaharNaveh Jun 27, 2026
037f05e
DEF_NONLOCAL DEF_BOUND
ShaharNaveh Jun 27, 2026
6678195
Align flag values
ShaharNaveh Jun 27, 2026
560b9cb
unmark passing tests
ShaharNaveh Jun 27, 2026
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
Prev Previous commit
Next Next commit
GLOBAL -> DEF_GLOBAL
  • Loading branch information
@ShaharNaveh
ShaharNaveh committed Jun 27, 2026
commit d84717a81210966b909a8abfd74a2a42c6d07e9e
2 changes: 1 addition & 1 deletion crates/codegen/src/compile.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3048,7 +3048,7 @@ impl<'warnings> Compiler<'warnings> {
.rev()
.find(|table| table.typ == CompilerScope::Class)
.and_then(|table| table.lookup(name.as_ref()))
.is_some_and(|symbol| symbol.flags.contains(SymbolFlags::GLOBAL));
.is_some_and(|symbol| symbol.flags.contains(SymbolFlags::DEF_GLOBAL));

(
symbol.map(|s| s.scope),
Expand Down
23 changes: 12 additions & 11 deletions crates/codegen/src/symboltable.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,6 +289,7 @@ impl From<SymbolScope> for i32 {
bitflags! {
#[derive(Copy, Clone, Debug, PartialEq, Eq)]
pub struct SymbolFlags: u16 {
const DEF_GLOBAL = 0x200;
const REFERENCED = 0x001; // USE
const DEF_LOCAL = 2;
const PARAMETER = 0x004; // DEF_PARAM
Expand All @@ -310,7 +311,6 @@ bitflags! {
/// return x // is_free_class
/// ```
const FREE_CLASS = 0x100; // DEF_FREE_CLASS
const GLOBAL = 0x200; // DEF_GLOBAL
const COMP_ITER = 0x400; // DEF_COMP_ITER
const COMP_CELL = 0x800; // DEF_COMP_CELL
const TYPE_PARAM = 0x1000; // DEF_TYPE_PARAM
Expand Down Expand Up @@ -846,7 +846,7 @@ impl SymbolTableAnalyzer {
} else if let Some(scope) = class_entry
.and_then(|class_symbols| class_symbols.get(&symbol.name))
.and_then(|class_sym| {
if class_sym.flags.contains(SymbolFlags::GLOBAL) {
if class_sym.flags.contains(SymbolFlags::DEF_GLOBAL) {
Some(SymbolScope::GlobalExplicit)
} else if class_sym.is_bound() && class_sym.scope != SymbolScope::Free {
// If name is bound in enclosing class, use GlobalImplicit
Expand Down Expand Up @@ -1833,9 +1833,10 @@ impl SymbolTableBuilder {
.last()
.is_some_and(|table| table.typ != CompilerScope::Module)
&& let Some(flags) = existing_flags
&& flags.intersects(SymbolFlags::GLOBAL | SymbolFlags::NONLOCAL)
&& flags
.intersects(SymbolFlags::DEF_GLOBAL | SymbolFlags::NONLOCAL)
{
let usage = if flags.contains(SymbolFlags::GLOBAL) {
let usage = if flags.contains(SymbolFlags::DEF_GLOBAL) {
"global"
} else {
"nonlocal"
Expand Down Expand Up @@ -3105,14 +3106,14 @@ impl SymbolTableBuilder {
let parent_is_global = self.tables[table_idx]
.symbols
.get(mangled.as_str())
.is_some_and(|symbol| symbol.flags.contains(SymbolFlags::GLOBAL));
.is_some_and(|symbol| symbol.flags.contains(SymbolFlags::DEF_GLOBAL));
let current = self.tables.last_mut().unwrap();
let current_symbol = current
.symbols
.entry(mangled.clone())
.or_insert_with(|| Symbol::new(mangled.as_str()));
if parent_is_global {
current_symbol.flags.insert(SymbolFlags::GLOBAL);
current_symbol.flags.insert(SymbolFlags::DEF_GLOBAL);
current_symbol.scope = SymbolScope::GlobalExplicit;
} else {
current_symbol.flags.insert(SymbolFlags::NONLOCAL);
Expand All @@ -3132,14 +3133,14 @@ impl SymbolTableBuilder {
.symbols
.entry(mangled.clone())
.or_insert_with(|| Symbol::new(mangled.as_str()));
current_symbol.flags.insert(SymbolFlags::GLOBAL);
current_symbol.flags.insert(SymbolFlags::DEF_GLOBAL);
current_symbol.scope = SymbolScope::GlobalExplicit;

let symbol = self.tables[table_idx]
.symbols
.entry(mangled.clone())
.or_insert_with(|| Symbol::new(mangled.as_str()));
symbol.flags.insert(SymbolFlags::GLOBAL);
symbol.flags.insert(SymbolFlags::DEF_GLOBAL);
symbol.scope = SymbolScope::GlobalExplicit;
return Ok(());
}
Expand Down Expand Up @@ -3322,9 +3323,9 @@ impl SymbolTableBuilder {
}
SymbolUsage::AnnotationAssigned
if current_scope != CompilerScope::Module
&& flags.intersects(SymbolFlags::GLOBAL | SymbolFlags::NONLOCAL) =>
&& flags.intersects(SymbolFlags::DEF_GLOBAL | SymbolFlags::NONLOCAL) =>
{
let usage = if flags.contains(SymbolFlags::GLOBAL) {
let usage = if flags.contains(SymbolFlags::DEF_GLOBAL) {
"global"
} else {
"nonlocal"
Expand Down Expand Up @@ -3399,7 +3400,7 @@ impl SymbolTableBuilder {
}
SymbolUsage::Global => {
symbol.scope = SymbolScope::GlobalExplicit;
flags.insert(SymbolFlags::GLOBAL);
flags.insert(SymbolFlags::DEF_GLOBAL);
}
SymbolUsage::Used => {
flags.insert(SymbolFlags::REFERENCED);
Expand Down
4 changes: 2 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 @@ -20,10 +20,10 @@ mod _symtable {
// https://github.com/python/cpython/blob/6cb20a219a860eaf687b2d968b41c480c7461909/Include/internal/pycore_symtable.h#L156

#[pyattr]
pub(super) const DEF_GLOBAL: i32 = 1;
pub(super) const DEF_GLOBAL: i32 = SymbolFlags::DEF_GLOBAL.bits() as i32;

#[pyattr]
pub(super) const DEF_LOCAL: i32 = 2;
pub(super) const DEF_LOCAL: i32 = SymbolFlags::DEF_LOCAL.bits() as i32;

#[pyattr]
pub(super) const DEF_PARAM: i32 = 2 << 1;
Expand Down