Skip to content

Add 3.12 typing features to the compiler #5302

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 16 commits into from
May 10, 2024
Merged

Add 3.12 typing features to the compiler #5302

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
61a5c9b
Add first draft of typing.rs
dchiquito May 6, 2024
f6a5c12
Split up compiler push_output
dchiquito May 7, 2024
46a7d2c
Add type params to function definitions
dchiquito May 7, 2024
a0f6d5f
Add type params to class definitions
dchiquito May 7, 2024
df8b2c2
Add type params to type alias statements
dchiquito May 7, 2024
bfa18d2
Add TypeVar bytecodes
dchiquito May 7, 2024
42111ae
Add various Types to frame.rs
dchiquito May 7, 2024
d6261f5
Add _typing module to stdlib
dchiquito May 7, 2024
55f916c
Add _typing to default imports
dchiquito May 7, 2024
3d263a0
Remove unused comment
dchiquito May 7, 2024
2d97503
Fix clippy lints
dchiquito May 7, 2024
a230ca3
Use empty_tuple singleton in execute_make_function
dchiquito May 9, 2024
55e37f8
Update bytecode LAST_INSTRUCTION comments
dchiquito May 9, 2024
2f01963
Merge branch 'main' into typing-draft
dchiquito May 9, 2024
c907a4d
Switch emit_constant to emit_load_const
dchiquito May 9, 2024
ed30604
Remove unwrap
youknowone May 10, 2024
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
Add various Types to frame.rs
  • Loading branch information
@dchiquito
dchiquito committed May 7, 2024
commit 42111ae6a2ebebe8a430279e36107d58de47b95f
59 changes: 56 additions & 3 deletions vm/src/frame.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use crate::{
builtins::{
asyncgenerator::PyAsyncGenWrappedValue,
function::{PyCell, PyCellRef, PyFunction},
tuple::{PyTuple, PyTupleTyped},
tuple::{PyTuple, PyTupleRef, PyTupleTyped},
PyBaseExceptionRef, PyCode, PyCoroutine, PyDict, PyDictRef, PyGenerator, PyList, PySet,
PySlice, PyStr, PyStrInterned, PyStrRef, PyTraceback, PyType,
},
Expand All @@ -15,7 +15,7 @@ use crate::{
protocol::{PyIter, PyIterReturn},
scope::Scope,
source_code::SourceLocation,
stdlib::builtins,
stdlib::{builtins, typing::_typing},
vm::{Context, PyMethod},
AsObject, Py, PyObject, PyObjectRef, PyPayload, PyRef, PyResult, TryFromObject, VirtualMachine,
};
Expand Down Expand Up @@ -1158,6 +1158,51 @@ impl ExecutingFrame<'_> {
*extend_arg = true;
Ok(None)
}
bytecode::Instruction::TypeVar => {
let type_name = self.pop_value();
let type_var: PyObjectRef =
_typing::make_typevar(vm, type_name.clone(), vm.ctx.none(), vm.ctx.none())
.into_ref(&vm.ctx)
.into();
// // Inject the type var into locals so it is usable
// self.locals
// .mapping()
// .ass_subscript(&type_name, Some(type_var.clone()), vm)?;
self.push_value(type_var);
Ok(None)
}
bytecode::Instruction::TypeVarWithBound => {
let type_name = self.pop_value();
let bound = self.pop_value();
let type_var: PyObjectRef =
_typing::make_typevar(vm, type_name.clone(), bound, vm.ctx.none())
.into_ref(&vm.ctx)
.into();
self.push_value(type_var);
Ok(None)
}
bytecode::Instruction::TypeVarWithConstraint => {
let type_name = self.pop_value();
let constraint = self.pop_value();
let type_var: PyObjectRef =
_typing::make_typevar(vm, type_name.clone(), vm.ctx.none(), constraint)
.into_ref(&vm.ctx)
.into();
self.push_value(type_var);
Ok(None)
}
bytecode::Instruction::TypeAlias => {
let name = self.pop_value();
let x = self.state.stack.last();
let type_params: PyTupleRef = self
.pop_value()
.downcast()
.map_err(|_| vm.new_type_error("Type params must be a tuple.".to_owned()))?;
let value = self.pop_value();
let type_alias = _typing::TypeAliasType::new(name, type_params, value);
self.push_value(type_alias.into_ref(&vm.ctx).into());
Ok(None)
}
}
}

Expand Down Expand Up @@ -1659,6 +1704,14 @@ impl ExecutingFrame<'_> {
vm.ctx.new_dict().into()
};

let type_params: PyTupleRef = if flags.contains(bytecode::MakeFunctionFlags::TYPE_PARAMS) {
self.pop_value()
.downcast()
.map_err(|_| vm.new_type_error("Type params must be a tuple.".to_owned()))?
} else {
vm.ctx.new_tuple(vec![])
Comment thread
dchiquito marked this conversation as resolved.
Outdated
};

let kw_only_defaults = if flags.contains(bytecode::MakeFunctionFlags::KW_ONLY_DEFAULTS) {
Some(
self.pop_value()
Expand Down Expand Up @@ -1689,7 +1742,7 @@ impl ExecutingFrame<'_> {
defaults,
kw_only_defaults,
qualified_name.clone(),
vm.ctx.empty_tuple.clone(), // FIXME: fake implementation
type_params,
)
.into_pyobject(vm);

Expand Down