@@ -35,0 +42,4 @@
+    def is_some(self):
+        return not self.is_none()
+    def unwrap(self):
+        return self.nac3_option

@@ -538,6 +559,33 @@ impl InnerResolver {
                 let types = types?;
                 Ok(types.map(|types| unifier.add_ty(TypeEnum::TTuple { ty: types })))
             }
+            // special handling for option type since it has special layout in nac3 python side

@@ -906,4 +993,3 @@
                     })
                     .unwrap(),
                 };
-                println!("{:?}", result);

@@ -541,0 +565,4 @@
+            {
+                let field_data = match obj.getattr("nac3_option") {
+                    Ok(d) => d,
+                    // should be None, instantiate with type vars instead

@@ -541,0 +566,4 @@
+                let field_data = match obj.getattr("nac3_option") {
+                    Ok(d) => d,
+                    // should be None, instantiate with type vars instead
+                    Err(_) => unreachable!("cannot be None")

@@ -759,0 +833,4 @@
+            }
+        } else if ty_id == self.primitive_ids.none {
+            // for option type, just a null ptr, whose type needs to be casted in codegen
+            // according to the type info acttached in the ast

@@ -183,0 +265,4 @@
+                |ctx, obj, _, _, generator| {
+                    let obj_val = obj.unwrap().1.clone().to_basic_value_enum(ctx, generator)?;
+                    if let BasicValueEnum::PointerValue(ptr) = obj_val {
+                        Ok(Some(ctx.builder.build_load(ptr, "unwrap_some")))

@@ -1123,6 +1238,7 @@ pub fn get_builtins(primitives: &mut (PrimitiveStore, Unifier)) -> BuiltinInfo {
             "min",
             "max",
             "abs",
+            "Some",

@@ -54,6 +54,16 @@ pub enum RecordKey {
     Int(i32),
 }
 
+impl Type {

@@ -35,0 +52,4 @@
+        if self.is_none():
+            return "<Option: None>"
+        elif self.nac3_option is self:
+                return "<Option: Error(self recursion)>"

@@ -35,0 +50,4 @@
+
+    def __repr__(self) -> str:
+        if self.is_none():
+            return "Option(none)"

@@ -35,0 +46,4 @@
+        return not self.is_none()
+    
+    def unwrap(self):
+        return self._nac3_option

@@ -541,0 +549,4 @@
+            {
+                let field_data = match obj.getattr("_nac3_option") {
+                    Ok(d) => d,
+                    // we use `none = Option(None)` now, so the obj should always have

@@ -909,3 +993,3 @@
                         }
                         if let Ok(t) = sym_ty {
-                            self.0.pyid_to_type.write().insert(*id, t);
+                            // do not cache for option type since None can have same pyid but different type

@@ -105,6 +105,19 @@ pub fn get_builtins(primitives: &mut (PrimitiveStore, Unifier)) -> BuiltinInfo {
         ("__param2__".into(), int64, true),
     ];
 
+    // for Option, is_some and is_none share the same type