Small improvements (#180)

Cargo.toml

@@ -27,7 +27,7 @@ indexmap = "2.2.6"
 gimli = { version = "0.29.0", default-features = false }
 insta = "1.38.0"
 cmd_lib = "1.9.3"
-derive-visitor = "0.3.0"
+derive-visitor = { version = "0.3.0", git = "https://github.com/andylokandy/derive-visitor", branch = "fix" }
 
 [build-dependencies]
 clap = { version = "4.5.4", features = ["derive"] }

README.md

@@ -36,6 +36,7 @@
 ### Current task
 * [ ] Printable trait should take references
 ---
+* [ ] migrate to pass-by-ref (branch `arc`)
 * [ ] Prefer candidates with mutable references, when possible
 * [ ] Fix problems with to_ir and loading references (especially globals). This causes issues in iterator
 * [ ] Benchmark for linear algebra

ppl/src/array.ppl

@@ -11,6 +11,12 @@ type Array<T>:
 	capacity: Integer
 	data: MemoryAddress
 
+fn<T> default <:Type<Array<T>>> -> Array<T>:
+	let size = 0
+	let capacity = 0
+	let data = default MemoryAddress
+	return Array<T> { size, capacity, data }
+
 /// Create an empty array
 fn<T> <:Type<T>>[] -> Array<T>:
 	let capacity = 8

ppl/src/core.ppl

@@ -29,6 +29,8 @@ type None
 
 /// Convert `None` to `String`
 fn String from <:None> => "none"
+
+fn default <:Type<None>> => none
 //---------------------------------
 
 
@@ -38,6 +40,8 @@ fn String from <:None> => "none"
 @builtin
 type Bool
 
+fn default <:Type<Bool>> => false
+
 /// Negate boolean value
 fn not <x:Bool> -> Bool:
 	if x:
@@ -73,6 +77,9 @@ type IntegerImpl
 type Integer:
 	impl: Reference<IntegerImpl>
 
+@builtin
+fn default <:Type<Integer>> => 0
+
 @mangle_as("integer_eq_integer")
 fn <:Integer> == <:Integer> -> Bool
 
@@ -128,6 +135,8 @@ type RationalImpl
 type Rational:
 	impl: Reference<RationalImpl>
 
+fn default <:Type<Rational>> => 0.0
+
 @mangle_as("rational_eq_rational")
 fn <:Rational> == <:Rational> -> Bool
 
@@ -171,6 +180,8 @@ type StringImpl
 type String:
 	impl: Reference<StringImpl>
 
+fn default <:Type<String>> => ""
+
 /// Concatenate 2 strings
 @mangle_as("string_plus_string")
 fn <:String> + <:String> -> String
@@ -241,3 +252,11 @@ trait Clonnable:
 	fn clone <:&Self> -> Self
 //=================================
 
+//=================================
+//             Default
+//=================================
+/// Trait for things that have default value
+trait Default:
+	fn default <:Type<Self>> -> Self
+//=================================
+

ppl/src/f64.ppl

@@ -3,6 +3,8 @@ use core.*
 @builtin
 type F64
 
+fn default <:Type<F64>> => F64 from 0.0
+
 fn + <x: F64> => x
 
 @mangle_as("minus_f64")

ppl/src/i32.ppl

@@ -3,6 +3,8 @@ use core.*
 @builtin
 type I32
 
+fn default <:Type<I32>> => 0 as I32
+
 fn + <x: I32> => x
 
 @mangle_as("minus_i32")

ppl/src/memory.ppl

@@ -6,6 +6,8 @@ use math.*
 type MemoryAddress:
 	value: Integer
 
+fn default <:Type<MemoryAddress>> => MemoryAddress { value: 0 }
+
 /// Interpret and integer as memory address
 fn <value: Integer> as MemoryAddress => MemoryAddress { value }
 

src/hir/declarations/trait.rs

@@ -6,7 +6,7 @@ use std::{
     sync::{Arc, RwLock},
 };
 
-use derive_visitor::DriveMut;
+use derive_visitor::{DriveMut, VisitorMut};
 use indexmap::IndexMap;
 
 use crate::{
@@ -99,12 +99,17 @@ pub struct TraitData {
     #[drive(skip)]
     pub supertraits: Vec<Trait>,
     /// Associated functions
+    #[drive(with = "drive_functions")]
     pub functions: IndexMap<String, Function>,
     /// Module this trait is located in
     #[drive(skip)]
     pub module: Module,
 }
 
+fn drive_functions<V: VisitorMut>(funcs: &mut IndexMap<String, Function>, visitor: &mut V) {
+    funcs.values_mut().for_each(|f| f.drive_mut(visitor));
+}
+
 impl TraitData {
     /// Iterate over all functions
     pub fn all_functions(&self) -> impl Iterator<Item = Function> + '_ {

src/hir/expressions/member.rs

@@ -15,7 +15,6 @@ pub struct MemberReference {
     #[drive(skip)]
     pub span: std::ops::Range<usize>,
     /// Base expression
-    #[drive(skip)]
     pub base: Box<Expression>,
     /// Referenced variable name
     #[drive(skip)]

src/ir/types.rs

@@ -84,7 +84,7 @@ impl<'llvm> Types<'llvm> {
     /// LLVM IR for [`Class`](Type::Class) type
     pub fn opaque(&self, name: &str) -> PointerType<'llvm> {
         self.get_or_add_opaque_struct(name);
-        self.llvm.ptr_type(AddressSpace::default())
+        self.pointer()
     }
 
     /// LLVM IR for [`None`](Type::None) type
@@ -109,6 +109,11 @@ impl<'llvm> Types<'llvm> {
 
     /// LLVM IR for C string type
     pub fn c_string(&self) -> PointerType<'llvm> {
+        self.pointer()
+    }
+
+    /// LLVM IR for pointer type
+    pub fn pointer(&self) -> PointerType<'llvm> {
         self.llvm.ptr_type(AddressSpace::default())
     }
 }

src/runtime/src/f64.rs

@@ -13,10 +13,7 @@ type F64 = f64;
 /// ```
 #[no_mangle]
 pub extern "C" fn f64_as_string(d: F64) -> String {
-    let boxed = Box::new(d.to_string());
-    String {
-        data: Box::into_raw(boxed),
-    }
+    d.to_string().into()
 }
 
 /// Negates f64
@@ -65,9 +62,7 @@ pub extern "C" fn f64_star_f64(x: F64, y: F64) -> F64 {
 /// ```
 #[no_mangle]
 pub extern "C" fn f64_from_rational(r: Rational) -> F64 {
-    let r = unsafe { r.data.as_ref() }.unwrap();
-    let res = r.to_f64();
-    res
+    r.as_ref().to_f64()
 }
 
 /// Create rational from f64
@@ -80,8 +75,5 @@ pub extern "C" fn f64_from_rational(r: Rational) -> F64 {
 /// ```
 #[no_mangle]
 pub extern "C" fn rational_from_f64(d: F64) -> Rational {
-    let r = Box::new(rug::Rational::from_f64(d).unwrap());
-    Rational {
-        data: Box::into_raw(r),
-    }
+    rug::Rational::from_f64(d).unwrap().into()
 }