Complement _typing module

moreal · moreal · commit fd8eda294169 · 2025-01-26T21:53:15.000+09:00
diff --git a/vm/src/stdlib/typing.rs b/vm/src/stdlib/typing.rs
@@ -1,4 +1,16 @@
-pub(crate) use _typing::make_module;
+use crate::{
+    builtins::{PyModule, PyTypeRef},
+    types::{Constructor, Representable},
+    PyRef, PyResult, VirtualMachine,
+};
+
+pub(crate) fn make_module(vm: &VirtualMachine) -> PyRef<PyModule> {
+    let module = _typing::make_module(vm);
+    module
+        .set_attr("NoDefault", vm.ctx.no_default.clone(), vm)
+        .unwrap();
+    module
+}
 
 #[pymodule]
 pub(crate) mod _typing {
@@ -172,3 +184,30 @@ pub(crate) mod _typing {
     //     }
     // }
 }
+
+#[pyclass(module = false, name)]
+#[derive(Debug, PyPayload)]
+#[allow(dead_code)]
+pub struct NoDefaultType {}
+
+#[pyclass(with(Constructor, Representable))]
+impl NoDefaultType {
+    #[pymethod(magic)]
+    fn reduce() -> String {
+        "NoDefault".to_string()
+    }
+}
+
+impl Constructor for NoDefaultType {
+    type Args = ();
+
+    fn py_new(_: PyTypeRef, _args: Self::Args, vm: &VirtualMachine) -> PyResult {
+        Ok(vm.ctx.no_default.clone().into())
+    }
+}
+
+impl Representable for NoDefaultType {
+    fn repr_str(_zelf: &crate::Py<Self>, _vm: &VirtualMachine) -> crate::PyResult<String> {
+        Ok("typing.NoDefault".to_owned())
+    }
+}
diff --git a/vm/src/types/zoo.rs b/vm/src/types/zoo.rs
@@ -9,6 +9,7 @@ use crate::{
         union_, weakproxy, weakref, zip,
     },
     class::StaticType,
+    stdlib::typing,
     vm::Context,
     Py,
 };
@@ -92,6 +93,7 @@ pub struct TypeZoo {
     pub generic_alias_type: &'static Py<PyType>,
     pub union_type: &'static Py<PyType>,
     pub member_descriptor_type: &'static Py<PyType>,
+    pub no_default_type: &'static Py<PyType>,
 
     // RustPython-original types
     pub method_def: &'static Py<PyType>,
@@ -184,6 +186,8 @@ impl TypeZoo {
             union_type: union_::PyUnion::init_builtin_type(),
             member_descriptor_type: descriptor::PyMemberDescriptor::init_builtin_type(),
 
+            no_default_type: typing::NoDefaultType::init_builtin_type(),
+
             method_def: crate::function::HeapMethodDef::init_builtin_type(),
         }
     }
diff --git a/vm/src/vm/context.rs b/vm/src/vm/context.rs
@@ -22,6 +22,7 @@ use crate::{
     },
     intern::{InternableString, MaybeInternedString, StringPool},
     object::{Py, PyObjectPayload, PyObjectRef, PyPayload, PyRef},
+    stdlib::typing::NoDefaultType,
     types::{PyTypeFlags, PyTypeSlots, TypeZoo},
     PyResult, VirtualMachine,
 };
@@ -41,6 +42,7 @@ pub struct Context {
     pub empty_bytes: PyRef<PyBytes>,
     pub ellipsis: PyRef<PyEllipsis>,
     pub not_implemented: PyRef<PyNotImplemented>,
+    pub no_default: PyRef<NoDefaultType>,
 
     pub types: TypeZoo,
     pub exceptions: exceptions::ExceptionZoo,
@@ -303,6 +305,7 @@ impl Context {
 
         let empty_str = unsafe { string_pool.intern("", types.str_type.to_owned()) };
         let empty_bytes = create_object(PyBytes::from(Vec::new()), types.bytes_type);
+        let no_default = create_object(NoDefaultType {}, types.no_default_type);
         Context {
             true_value,
             false_value,
@@ -311,6 +314,7 @@ impl Context {
             empty_frozenset,
             empty_str,
             empty_bytes,
+            no_default,
 
             ellipsis,
             not_implemented,
