Merge print and println into Printable trait (#158)

Author: gavrilikhin-d

README.md

@@ -29,12 +29,15 @@
 * [x] Fix memory leak due to pointers to builtin types
 * [x] Destructors for parameters
 * [x] No tmps for literals inside of constructors
+* [x] Fix recursive trait (AsString with prints)
 ---
 ### Current task
-* [ ] Sum of series benchmark
+* [ ] Benchmark for linear algebra
 ---
+* [ ] Sum of series benchmark
+* [ ] Find test that is taking infinite time
+* [ ] Use traits to check for `clone` and `destructoy` functions
 * [ ] Forbid recursion without `@recursive` annotation
-* [ ] Fix recursive trait (AsString with prints)
 * [ ] Generate clone for types with clonable members
 * [ ] Generate destructors for types with destructible members
 * [ ] Add type aliases

ppl/src/array.ppl

@@ -2,7 +2,7 @@ use core.*
 
 use math.*
 use memory.*
-use as_string.*
+use printable.*
 
 /// Array of values
 type Array<T>:
@@ -48,7 +48,7 @@ fn<T> push <x: T> to <array: &mut Array<T>>:
 fn<T> <array: &Array<T>> is empty => array.size == 0
 fn<T> <array: &Array<T>> is not empty => array.size > 0
 
-fn<U: AsString> String from <array: &Array<U>> -> String:
+fn<U: Printable> String from <array: &Array<U>> -> String:
 	let mut str = "["
 	if array is not empty:
 		str += (String from array[0])

ppl/src/as_string.ppl

@@ -6,4 +6,4 @@ use f64.*
 use memory.*
 use threads.*
 use math.*
-use as_string.*
+use printable.*

ppl/src/lib.ppl

@@ -0,0 +1,9 @@
+use core.*
+
+/// Trait for things that may be printed
+trait Printable:
+	fn String from <:Self> -> String
+
+	fn print <x: Self> => print (String from x)
+
+	fn println <x: Self> => println (String from x)

ppl/src/printable.ppl

@@ -289,11 +289,12 @@ impl<'llvm> DeclareGlobal<'llvm> for FunctionData {
         context.module.add_function(
             &self.mangled_name(),
             ty,
-            // Private linkage for monomorphized generic functions
-            if self.generic_types.is_empty() || self.mangled_name.is_some() {
-                None
-            } else {
+            // Private linkage for monomorphized generic functions or functions from traits
+            if self.mangled_name.is_none() && (!self.generic_types.is_empty() || self.tr.is_some())
+            {
                 Some(Linkage::Private)
+            } else {
+                None
             },
         )
     }

src/ir/to_ir.rs

@@ -59,6 +59,21 @@ impl FindDeclaration for FunctionContext<'_> {
     fn parent(&self) -> Option<&dyn FindDeclaration> {
         Some(self.parent as _)
     }
+
+    fn functions_with_n_name_parts(&self, n: usize) -> Vec<Function> {
+        let mut functions: Vec<_> = self
+            .functions_with_n_name_parts_here(n)
+            .into_iter()
+            .chain(
+                FindDeclaration::parent(self)
+                    .and_then(|p| Some(p.functions_with_n_name_parts(n)))
+                    .unwrap_or_default(),
+            )
+            .collect();
+        // TODO: allow recursion, if has @recursive
+        functions.retain(|f| *f != self.function);
+        functions
+    }
 }
 
 impl AddDeclaration for FunctionContext<'_> {

src/semantics/contexts/function.rs

@@ -20,16 +20,17 @@ fn<Integer> address of <ref: Reference<Integer>> -> MemoryAddress
 fn<Integer> <ty: Type<Integer>> at <address: MemoryAddress> -> ReferenceMut<Integer>
 
 @mangle_as("integer_as_string")
-fn String from <:Integer> -> String
+fn String from <$arg0: Integer> -> String
+
+fn println <x: Integer> -> None:
+	let $tmp@176: None = println String from (x:Integer)
+	return ($tmp@176:None)
 
-fn<Integer> println <x: Integer> -> None:
-	let $tmp@314: None = println String from (x:Integer)
-	return ($tmp@314:None)
 
 
 @mangle_as("integer_as_string")
-fn String from <:Integer> -> String
+fn String from <$arg0: Integer> -> String
 
-fn<Integer> println <x: Integer> -> None:
-	let $tmp@314: None = println String from (x:Integer)
-	return ($tmp@314:None)
+fn println <x: Integer> -> None:
+	let $tmp@176: None = println String from (x:Integer)
+	return ($tmp@176:None)

src/tests/snapshots/ppl__tests__address_of.hir.snap

@@ -42,8 +42,8 @@ fn<Integer> <$arg0: Type<Integer>> [ ] -> Array<Integer>:
 
 
 fn<Integer> iterator for <array: Reference<Array<Integer>>> -> Iterator<Integer>:
-	let $tmp@1686: Iterator<Integer> = Iterator<Integer> { array: (array:Reference<Array<Integer>>), index: 0 }
-	return ($tmp@1686:Iterator<Integer>)
+	let $tmp@1687: Iterator<Integer> = Iterator<Integer> { array: (array:Reference<Array<Integer>>), index: 0 }
+	return ($tmp@1687:Iterator<Integer>)
 
 
 fn<Integer> String from <array: Reference<Array<Integer>>> -> String:
@@ -59,14 +59,15 @@ fn<Integer> String from <array: Reference<Array<Integer>>> -> String:
 		destroy (i:Integer)
 
 	(&str:ReferenceMut<String>) += "]"
-	let $tmp@1461: String = clone (str:String)
+	let $tmp@1462: String = clone (str:String)
 	destroy (str:String)
-	return ($tmp@1461:String)
+	return ($tmp@1462:String)
 
 
-fn<Array<Integer>> println <x: Array<Integer>> -> None:
-	let $tmp@314: None = println String from (x:Array<Integer>)
-	return ($tmp@314:None)
+fn println <x: Array<Integer>> -> None:
+	let $tmp@176: None = println String from (x:Array<Integer>)
+	return ($tmp@176:None)
+
 
 
 fn<Integer> <array: Reference<Array<Integer>>> is empty -> Bool:
@@ -147,14 +148,15 @@ fn<Integer> String from <array: Reference<Array<Integer>>> -> String:
 		destroy (i:Integer)
 
 	(&str:ReferenceMut<String>) += "]"
-	let $tmp@1461: String = clone (str:String)
+	let $tmp@1462: String = clone (str:String)
 	destroy (str:String)
-	return ($tmp@1461:String)
+	return ($tmp@1462:String)
+
 
+fn println <x: Array<Integer>> -> None:
+	let $tmp@176: None = println String from (x:Array<Integer>)
+	return ($tmp@176:None)
 
-fn<Array<Integer>> println <x: Array<Integer>> -> None:
-	let $tmp@314: None = println String from (x:Array<Integer>)
-	return ($tmp@314:None)
 
 
 fn<Integer> <array: Reference<Array<Integer>>> is not empty -> Bool:
@@ -181,16 +183,17 @@ fn<Integer> <array: Reference<Array<Integer>>> [ <i: Integer> ] -> Reference<Int
 
 
 @mangle_as("integer_as_string")
-fn String from <:Integer> -> String
+fn String from <$arg0: Integer> -> String
+
+fn println <x: Integer> -> None:
+	let $tmp@176: None = println String from (x:Integer)
+	return ($tmp@176:None)
 
-fn<Integer> println <x: Integer> -> None:
-	let $tmp@314: None = println String from (x:Integer)
-	return ($tmp@314:None)
 
 
 fn<Integer> <it: Reference<Iterator<Integer>>> exists -> Bool:
-	let $tmp@1754: Bool = clone (*it:Iterator<Integer>).index < clone (*(*it:Iterator<Integer>).array:Array<Integer>).size
-	return ($tmp@1754:Bool)
+	let $tmp@1755: Bool = clone (*it:Iterator<Integer>).index < clone (*(*it:Iterator<Integer>).array:Array<Integer>).size
+	return ($tmp@1755:Bool)
 
 
 fn<Integer> size of <ty: Type<Integer>> -> Integer:
@@ -220,16 +223,17 @@ fn<Integer> <array: Reference<Array<Integer>>> [ <i: Integer> ] -> Reference<Int
 
 
 fn<Integer> value from <it: Reference<Iterator<Integer>>> -> Reference<Integer>:
-	let $tmp@1885: Reference<Integer> = (*it:Iterator<Integer>).array [ clone (*it:Iterator<Integer>).index ]
-	return ($tmp@1885:Reference<Integer>)
+	let $tmp@1886: Reference<Integer> = (*it:Iterator<Integer>).array [ clone (*it:Iterator<Integer>).index ]
+	return ($tmp@1886:Reference<Integer>)
 
 
 @mangle_as("integer_as_string")
-fn String from <:Integer> -> String
+fn String from <$arg0: Integer> -> String
+
+fn println <x: Integer> -> None:
+	let $tmp@176: None = println String from (x:Integer)
+	return ($tmp@176:None)
 
-fn<Integer> println <x: Integer> -> None:
-	let $tmp@314: None = println String from (x:Integer)
-	return ($tmp@314:None)
 
 
 fn<Integer> advance <it: ReferenceMut<Iterator<Integer>>> -> None: