wip

lib/skc_rustlib/src/builtin/array.rs

@@ -1,6 +1,12 @@
-use crate::builtin::{SkInt, SkObj};
-use crate::sk_methods::meta_array_new;
-use shiika_ffi_macro::shiika_method;
+use crate::builtin::{SkInt, SkObj, SkClass, SkStr};
+use shiika_ffi_macro::{shiika_const_ref, shiika_method_ref, shiika_method};
+
+shiika_const_ref!("::Array", SkClass, "sk_Array");
+shiika_method_ref!(
+    "Meta:Array#new",
+    fn(receiver: SkClass) -> SkAry<SkObj>,
+    "meta_array_new"
+);
 
 #[repr(C)]
 #[derive(Debug)]
@@ -14,10 +20,21 @@ struct ShiikaArray<T> {
     vec: *mut Vec<T>,
 }
 
+pub trait SkCls {
+    fn get_class_object() -> SkClass;
+}
+shiika_const_ref!("::String", SkClass, "sk_String");
+impl SkCls for SkStr {
+    fn get_class_object() -> SkClass {
+        sk_String()
+    }
+}
+
 impl<T> SkAry<T> {
     /// Call `Array.new`.
-    pub fn new<U>() -> SkAry<U> {
-        let sk_ary = meta_array_new(std::ptr::null());
+    pub fn new<U: SkCls>() -> SkAry<U> {
+        let spe_cls = sk_Array().specialize(vec![U::get_class_object()]);
+        let sk_ary = meta_array_new(spe_cls);
         // Force cast because external function (Meta_Array_new)
         // cannot have type a parameter.
         SkAry(sk_ary.0 as *mut ShiikaArray<U>)

lib/skc_rustlib/src/builtin/class.rs

@@ -31,6 +31,10 @@ impl SkClass {
         unsafe { &(*self.0).name }
     }
 
+    pub fn specialize(self, tyargs: Vec<SkClass>) -> SkClass {
+        class_specialize(self, tyargs)
+    }
+
     fn specialized_classes(&mut self) -> &mut HashMap<String, *mut ShiikaClass> {
         unsafe { (*self.0).specialized_classes.as_mut().unwrap() }
     }