Merge pull request #318 from Pivot-Studio/Chronostasys/issue317

feat: trait type generic

Author: Chronostasys

.github/workflows/test.yml

@@ -142,12 +142,12 @@ jobs:
           args: nextest --workspace --all-features --lcov --output-path lcov.info --profile ci -vv
 
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v3.1.4
         with:
           token: ${{ secrets.CODE_COV }}
           files: lcov.info
           name: ${{ matrix.os }}
-          fail_ci_if_error: true
+          fail_ci_if_error: false
           verbose: true
   style:
     name: Check Style

planglib/std/__private.pi

@@ -1,2 +1,3 @@
 use std::io;
-use std::stdbuiltin;
+use std::stdbuiltin;
+use std::iter;

planglib/std/iter.pi

@@ -0,0 +1,16 @@
+use core::builtin::*;
+
+pub trait Iterator<T> {
+    fn next() Option<T>;
+}
+
+struct name<T> {
+    t:T;
+}
+
+impl <T> Iterator<T> for name<T> {
+    fn next() Option<T> {
+        return self.t;
+    }
+}
+

src/ast/ctx.rs

@@ -372,55 +372,60 @@ impl<'a, 'ctx> Ctx<'a> {
         if let (PLType::Trait(t), PLType::Struct(st)) =
             (&*target_pltype.borrow(), &*st_pltype.borrow())
         {
-            if !st.implements_trait(t, &self.get_root_ctx().plmod) {
-                return Err(mismatch_err!(
-                    self,
-                    ori_range,
-                    target_range,
-                    target_pltype.borrow(),
-                    st_pltype.borrow()
-                ));
-            }
-            let trait_handle = builder.alloc("tmp_traitv", &target_pltype.borrow(), self, None);
-            for f in t.list_trait_fields().iter() {
-                let mthd = find_mthd(st, f, t).unwrap_or_else(|| {
-                    for t in &t.derives {
-                        match &*t.borrow() {
-                            PLType::Trait(t) => {
-                                if let Some(mthd) = find_mthd(st, f, t) {
-                                    return mthd;
+            return self.run_in_type_mod(t, |ctx, t| {
+                ctx.protect_generic_context(&t.generic_map, |ctx| {
+                    if !st.implements_trait(t, &ctx.get_root_ctx().plmod) {
+                        return Err(mismatch_err!(
+                            ctx,
+                            ori_range,
+                            target_range,
+                            target_pltype.borrow(),
+                            st_pltype.borrow()
+                        ));
+                    }
+                    let trait_handle =
+                        builder.alloc("tmp_traitv", &target_pltype.borrow(), ctx, None);
+                    for f in t.list_trait_fields().iter() {
+                        let mthd = find_mthd(st, f, t).unwrap_or_else(|| {
+                            for t in &t.derives {
+                                match &*t.borrow() {
+                                    PLType::Trait(t) => {
+                                        if let Some(mthd) = find_mthd(st, f, t) {
+                                            return mthd;
+                                        }
+                                    }
+                                    _ => unreachable!(),
                                 }
                             }
-                            _ => unreachable!(),
-                        }
-                    }
-                    unreachable!()
-                });
+                            unreachable!()
+                        });
 
-                // TODO: let a:trait = B<i64>{} panic
-                let fnhandle = builder.get_or_insert_fn_handle(&mthd.borrow(), self);
-                let targetftp = f.typenode.get_type(self, builder, true).unwrap();
-                let casted = builder.bitcast(self, fnhandle, &targetftp.borrow(), "fncast_tmp");
-                let f_ptr = builder
-                    .build_struct_gep(trait_handle, f.index, "field_tmp")
-                    .unwrap();
-                builder.build_store(f_ptr, casted);
-            }
-            let st_value = builder.bitcast(
-                self,
-                st_value,
-                &PLType::Pointer(Arc::new(RefCell::new(PLType::Primitive(PriType::I64)))),
-                "traitcast_tmp",
-            );
-            let v_ptr = builder.build_struct_gep(trait_handle, 1, "v_tmp").unwrap();
-            builder.build_store(v_ptr, st_value);
-            let type_hash = builder
-                .build_struct_gep(trait_handle, 0, "tp_hash")
-                .unwrap();
-            let hash = st.get_type_code();
-            let hash = builder.int_value(&PriType::U64, hash, false);
-            builder.build_store(type_hash, hash);
-            return Ok(trait_handle);
+                        let fnhandle = builder.get_or_insert_fn_handle(&mthd.borrow(), ctx);
+                        let targetftp = f.typenode.get_type(ctx, builder, true).unwrap();
+                        let casted =
+                            builder.bitcast(ctx, fnhandle, &targetftp.borrow(), "fncast_tmp");
+                        let f_ptr = builder
+                            .build_struct_gep(trait_handle, f.index, "field_tmp")
+                            .unwrap();
+                        builder.build_store(f_ptr, casted);
+                    }
+                    let st_value = builder.bitcast(
+                        ctx,
+                        st_value,
+                        &PLType::Pointer(Arc::new(RefCell::new(PLType::Primitive(PriType::I64)))),
+                        "traitcast_tmp",
+                    );
+                    let v_ptr = builder.build_struct_gep(trait_handle, 1, "v_tmp").unwrap();
+                    builder.build_store(v_ptr, st_value);
+                    let type_hash = builder
+                        .build_struct_gep(trait_handle, 0, "tp_hash")
+                        .unwrap();
+                    let hash = st.get_type_code();
+                    let hash = builder.int_value(&PriType::U64, hash, false);
+                    builder.build_store(type_hash, hash);
+                    Ok(trait_handle)
+                })
+            });
         }
         #[allow(clippy::needless_return)]
         return Err(mismatch_err!(

src/ast/diag.rs

@@ -213,7 +213,7 @@ pub struct PLLabel {
 pub struct PLDiagRaw {
     code: DiagCode,
     help: Option<String>,
-    labels: Vec<PLLabel>,
+    pub labels: Vec<PLLabel>,
     pub source: Option<String>,
 }
 /// # PLDiag

src/ast/expects/builtin.pi.expect

@@ -0,0 +1 @@
+[]

src/ast/expects/gc.pi.expect

@@ -0,0 +1 @@
+[]

src/ast/expects/io.pi.expect

@@ -0,0 +1 @@
+[]

src/ast/expects/panic.pi.expect

@@ -0,0 +1 @@
+[]

src/ast/expects/stdbuiltin.pi.expect

@@ -0,0 +1 @@
+[]