core/typedef: Add Type::obj_id to replace get_obj_id

nac3artiq/src/codegen.rs

@@ -624,7 +624,7 @@ pub fn attributes_writeback(
             let ty = ty.unwrap();
             match &*ctx.unifier.get_ty(ty) {
                 TypeEnum::TObj { fields, obj_id, .. }
-                    if *obj_id != ctx.primitives.option.get_obj_id(&ctx.unifier) =>
+                    if *obj_id != ctx.primitives.option.obj_id(&ctx.unifier).unwrap() =>
                 {
                     // we only care about primitive attributes
                     // for non-primitive attributes, they should be in another global

nac3artiq/src/symbol_resolver.rs

@@ -710,7 +710,7 @@ impl InnerResolver {
             // special handling for option type since its class member layout in python side
             // is special and cannot be mapped directly to a nac3 type as below
             (TypeEnum::TObj { obj_id, params, .. }, false)
-                if *obj_id == primitives.option.get_obj_id(unifier) =>
+                if *obj_id == primitives.option.obj_id(unifier).unwrap() =>
             {
                 let Ok(field_data) = obj.getattr("_nac3_option") else {
                     unreachable!("cannot be None")
@@ -993,7 +993,7 @@ impl InnerResolver {
         } else if ty_id == self.primitive_ids.option {
             let option_val_ty = match ctx.unifier.get_ty_immutable(expected_ty).as_ref() {
                 TypeEnum::TObj { obj_id, params, .. }
-                    if *obj_id == ctx.primitives.option.get_obj_id(&ctx.unifier) =>
+                    if *obj_id == ctx.primitives.option.obj_id(&ctx.unifier).unwrap() =>
                 {
                     *params.iter().next().unwrap().1
                 }

nac3core/src/codegen/expr.rs

@@ -154,7 +154,7 @@ impl<'ctx, 'a> CodeGenContext<'ctx, 'a> {
             SymbolValue::OptionSome(v) => {
                 let ty = match self.unifier.get_ty_immutable(ty).as_ref() {
                     TypeEnum::TObj { obj_id, params, .. }
-                        if *obj_id == self.primitives.option.get_obj_id(&self.unifier) =>
+                        if *obj_id == self.primitives.option.obj_id(&self.unifier).unwrap() =>
                     {
                         *params.iter().next().unwrap().1
                     }
@@ -168,7 +168,7 @@ impl<'ctx, 'a> CodeGenContext<'ctx, 'a> {
             SymbolValue::OptionNone => {
                 let ty = match self.unifier.get_ty_immutable(ty).as_ref() {
                     TypeEnum::TObj { obj_id, params, .. }
-                        if *obj_id == self.primitives.option.get_obj_id(&self.unifier) =>
+                        if *obj_id == self.primitives.option.obj_id(&self.unifier).unwrap() =>
                     {
                         *params.iter().next().unwrap().1
                     }
@@ -1924,7 +1924,7 @@ pub fn gen_expr<'ctx, G: CodeGenerator>(
                     // directly generate code for option.unwrap
                     // since it needs to return static value to optimize for kernel invariant
                     if attr == &"unwrap".into()
-                        && id == ctx.primitives.option.get_obj_id(&ctx.unifier)
+                        && id == ctx.primitives.option.obj_id(&ctx.unifier).unwrap()
                     {
                         match val {
                             ValueEnum::Static(v) => return match v.get_field("_nac3_option".into(), ctx) {

nac3core/src/symbol_resolver.rs

@@ -185,13 +185,13 @@ impl SymbolValue {
                 TypeAnnotation::Tuple(vs_tys)
             }
             SymbolValue::OptionNone => TypeAnnotation::CustomClass {
-                id: primitives.option.get_obj_id(unifier),
+                id: primitives.option.obj_id(unifier).unwrap(),
                 params: Vec::default(),
             },
             SymbolValue::OptionSome(v) => {
                 let ty = v.get_type_annotation(primitives, unifier);
                 TypeAnnotation::CustomClass {
-                    id: primitives.option.get_obj_id(unifier),
+                    id: primitives.option.obj_id(unifier).unwrap(),
                     params: vec![ty],
                 }
             }

nac3core/src/toplevel/helper.rs

@@ -549,7 +549,7 @@ impl TopLevelComposer {
                     TypeAnnotation::CustomClass { id: e_id, params: e_param },
                 ) => {
                     *f_id == *e_id
-                        && *f_id == primitive.option.get_obj_id(unifier)
+                        && *f_id == primitive.option.obj_id(unifier).unwrap()
                         && (f_param.is_empty()
                             || (f_param.len() == 1
                                 && e_param.len() == 1

nac3core/src/typecheck/typedef/mod.rs

@@ -61,13 +61,14 @@ pub enum RecordKey {
 }
 
 impl Type {
-    // a wrapper function for cleaner code so that we don't need to
+    /// Wrapper function for cleaner code so that we don't need to write this long pattern matching 
-    // write this long pattern matching just to get the field `obj_id`
+    /// just to get the field `obj_id`.
-    pub fn get_obj_id(self, unifier: &Unifier) -> DefinitionId {
+    #[must_use]
-        if let TypeEnum::TObj { obj_id, .. } = unifier.get_ty_immutable(self).as_ref() {
+    pub fn obj_id(self, unifier: &Unifier) -> Option<DefinitionId> {
-            *obj_id
+        if let TypeEnum::TObj { obj_id, .. } = &*unifier.get_ty_immutable(self) {
+            Some(*obj_id)
         } else {
-            unreachable!("expect a object type")
+            None
         }
     }
 }