Normalize function call printing (#164)

src/hir/expressions/call.rs

@@ -1,7 +1,8 @@
 use derive_visitor::DriveMut;
 
-use crate::hir::{Expression, Function, FunctionNamePart, Generic, Type, Typed};
+use crate::hir::{Expression, Function, Generic, Type, Typed};
 use crate::mutability::Mutable;
+use crate::named::Named;
 use crate::syntax::Ranged;
 use std::fmt::Display;
 use std::ops::Range;
@@ -31,22 +32,15 @@ impl Display for Call {
         let indent = "\t".repeat(f.width().unwrap_or(0));
         write!(f, "{indent}")?;
 
-        let mut arg = self.args.iter();
-
         write!(
             f,
-            "{}",
-            self.function
-                .read()
-                .unwrap()
-                .name_parts()
+            "`{}`({})",
+            self.function.name(),
+            self.args
                 .iter()
-                .map(|part| match part {
-                    FunctionNamePart::Text(text) => text.to_string(),
-                    FunctionNamePart::Parameter(_) => arg.next().unwrap().to_string(),
-                })
+                .map(|arg| arg.to_string())
                 .collect::<Vec<_>>()
-                .join(" ")
+                .join(", ")
         )
     }
 }

src/tests/snapshots/ppl__tests__address_of.hir.snap

@@ -3,12 +3,12 @@ source: src/tests/mod.rs
 expression: hir
 ---
 let x: Integer = 0
-let address: MemoryAddress = address of (&x:Reference<Integer>)
-let x_mut_ref: ReferenceMut<Integer> = (Type<Integer>:Type<Integer>) at (address:MemoryAddress)
-println clone (x:Integer)
+let address: MemoryAddress = `address of <:Reference<Integer>>`((&x:Reference<Integer>))
+let x_mut_ref: ReferenceMut<Integer> = `<:Type<Integer>> at <:MemoryAddress>`((Type<Integer>:Type<Integer>), (address:MemoryAddress))
+`println <:Integer>`(`clone <:Reference<Integer>>`((x:Integer)))
 (x_mut_ref:ReferenceMut<Integer>) = 1
-println clone (x:Integer)
-destroy (x:Integer)
+`println <:Integer>`(`clone <:Reference<Integer>>`((x:Integer)))
+`destroy <:ReferenceMut<Integer>>`((x:Integer))
 
 ==MONOMORPHIZED==
 
@@ -23,7 +23,7 @@ fn<Integer> <ty: Type<Integer>> at <address: MemoryAddress> -> ReferenceMut<Inte
 fn String from <$arg0: Integer> -> String
 
 fn println <x: Integer> -> None:
-	let $tmp@176: None = println String from (x:Integer)
+	let $tmp@176: None = `println <:String>`(`String from <:Integer>`((x:Integer)))
 	return ($tmp@176:None)
 
 
@@ -32,5 +32,5 @@ fn println <x: Integer> -> None:
 fn String from <$arg0: Integer> -> String
 
 fn println <x: Integer> -> None:
-	let $tmp@176: None = println String from (x:Integer)
+	let $tmp@176: None = `println <:String>`(`String from <:Integer>`((x:Integer)))
 	return ($tmp@176:None)

src/tests/snapshots/ppl__tests__clone.hir.snap

@@ -3,15 +3,15 @@ source: src/tests/mod.rs
 expression: hir
 ---
 let mut x: Integer = 1
-let mut y: Integer = clone (x:Integer)
-println clone (x:Integer)
-println clone (y:Integer)
-destroy (y:Integer)
+let mut y: Integer = `clone <:Reference<Integer>>`((x:Integer))
+`println <:Integer>`(`clone <:Reference<Integer>>`((x:Integer)))
+`println <:Integer>`(`clone <:Reference<Integer>>`((y:Integer)))
+`destroy <:ReferenceMut<Integer>>`((y:Integer))
 (y:Integer) = 2
-println clone (x:Integer)
-println clone (y:Integer)
-destroy (x:Integer)
-destroy (y:Integer)
+`println <:Integer>`(`clone <:Reference<Integer>>`((x:Integer)))
+`println <:Integer>`(`clone <:Reference<Integer>>`((y:Integer)))
+`destroy <:ReferenceMut<Integer>>`((x:Integer))
+`destroy <:ReferenceMut<Integer>>`((y:Integer))
 
 ==MONOMORPHIZED==
 
@@ -20,7 +20,7 @@ destroy (y:Integer)
 fn String from <$arg0: Integer> -> String
 
 fn println <x: Integer> -> None:
-	let $tmp@176: None = println String from (x:Integer)
+	let $tmp@176: None = `println <:String>`(`String from <:Integer>`((x:Integer)))
 	return ($tmp@176:None)
 
 
@@ -29,7 +29,7 @@ fn println <x: Integer> -> None:
 fn String from <$arg0: Integer> -> String
 
 fn println <x: Integer> -> None:
-	let $tmp@176: None = println String from (x:Integer)
+	let $tmp@176: None = `println <:String>`(`String from <:Integer>`((x:Integer)))
 	return ($tmp@176:None)
 
 
@@ -38,7 +38,7 @@ fn println <x: Integer> -> None:
 fn String from <$arg0: Integer> -> String
 
 fn println <x: Integer> -> None:
-	let $tmp@176: None = println String from (x:Integer)
+	let $tmp@176: None = `println <:String>`(`String from <:Integer>`((x:Integer)))
 	return ($tmp@176:None)
 
 
@@ -47,5 +47,5 @@ fn println <x: Integer> -> None:
 fn String from <$arg0: Integer> -> String
 
 fn println <x: Integer> -> None:
-	let $tmp@176: None = println String from (x:Integer)
+	let $tmp@176: None = `println <:String>`(`String from <:Integer>`((x:Integer)))
 	return ($tmp@176:None)

src/tests/snapshots/ppl__tests__common_functions.hir.snap

@@ -3,7 +3,7 @@ source: src/tests/mod.rs
 expression: hir
 ---
 fn foo -> None:
-	let $tmp@10: None = println "foo"
+	let $tmp@10: None = `println <:String>`("foo")
 	return ($tmp@10:None)
 
-foo
+`foo`()

src/tests/snapshots/ppl__tests__deps.hir.snap

@@ -3,4 +3,4 @@ source: src/tests/mod.rs
 expression: hir
 ---
 use helper.*
-say hello
+`say hello`()

src/tests/snapshots/ppl__tests__deref_member_ref.hir.snap

@@ -8,11 +8,11 @@ type Point:
 
 
 fn x of <p: Reference<Point>> -> Integer:
-	let $tmp@61: Integer = clone (*p:Point).x
+	let $tmp@61: Integer = `clone <:Reference<Integer>>`((*p:Point).x)
 	return ($tmp@61:Integer)
 
 let $tmp@80: Point = Point { x: 1, y: 2 }
-println x of (&$tmp@80:Reference<Point>)
+`println <:Integer>`(`x of <:Reference<Point>>`((&$tmp@80:Reference<Point>)))
 
 ==MONOMORPHIZED==
 
@@ -21,5 +21,5 @@ println x of (&$tmp@80:Reference<Point>)
 fn String from <$arg0: Integer> -> String
 
 fn println <x: Integer> -> None:
-	let $tmp@176: None = println String from (x:Integer)
+	let $tmp@176: None = `println <:String>`(`String from <:Integer>`((x:Integer)))
 	return ($tmp@176:None)

src/tests/snapshots/ppl__tests__destructor.hir.snap

@@ -5,11 +5,11 @@ expression: hir
 type DestructibleClass
 
 fn destroy <$arg0: ReferenceMut<DestructibleClass>> -> None:
-	let $tmp@64: None = println "destructor"
+	let $tmp@64: None = `println <:String>`("destructor")
 	return ($tmp@64:None)
 
 let mut x: DestructibleClass = DestructibleClass {  }
-destroy (x:DestructibleClass)
+`destroy <:ReferenceMut<DestructibleClass>>`((x:DestructibleClass))
 (x:DestructibleClass) = DestructibleClass {  }
-println "done"
-destroy (x:DestructibleClass)
+`println <:String>`("done")
+`destroy <:ReferenceMut<DestructibleClass>>`((x:DestructibleClass))

src/tests/snapshots/ppl__tests__empty_constructor.hir.snap

@@ -4,7 +4,7 @@ expression: hir
 ---
 type A
 let a: A = A {  }
-println type of (a:A)
+`println <:Type<A>>`(`type of <:A>`((a:A)))
 
 ==MONOMORPHIZED==
 
@@ -15,10 +15,10 @@ fn<A> type of <$arg0: A> -> Type<A>:
 
 
 fn<A> String from <ty: Type<A>> -> String:
-	let $tmp@4331: String = clone (ty:Type<A>).name
+	let $tmp@4331: String = `clone <:Reference<String>>`((ty:Type<A>).name)
 	return ($tmp@4331:String)
 
 
 fn println <x: Type<A>> -> None:
-	let $tmp@176: None = println String from (x:Type<A>)
+	let $tmp@176: None = `println <:String>`(`String from <:Type<A>>`((x:Type<A>)))
 	return ($tmp@176:None)

src/tests/snapshots/ppl__tests__escaped_id.hir.snap

@@ -3,6 +3,6 @@ source: src/tests/mod.rs
 expression: hir
 ---
 let mut if: Integer = 1
-destroy (if:Integer)
+`destroy <:ReferenceMut<Integer>>`((if:Integer))
 (if:Integer) = 2
-destroy (if:Integer)
+`destroy <:ReferenceMut<Integer>>`((if:Integer))

src/tests/snapshots/ppl__tests__generics.hir.snap

@@ -11,17 +11,17 @@ fn<T> x of <p: Point<T>> -> T:
 	let $tmp@53: T = (p:Point<T>).x
 	return ($tmp@53:T)
 
-let x: Integer = x of Point<Integer> { x: 0, y: 0 }
+let x: Integer = `x of <:Point<Integer>>`(Point<Integer> { x: 0, y: 0 })
 
 fn<T> id <x: T> -> T:
 	let $tmp@127: T = (x:T)
 	return ($tmp@127:T)
 
-println clone (x:Integer) == 0
-println id 1 == 1
-println id "hello"
-id Point<Integer> { x: 0, y: 0 }
-destroy (x:Integer)
+`println <:Bool>`(`<:Integer> == <:Integer>`(`clone <:Reference<Integer>>`((x:Integer)), 0))
+`println <:Bool>`(`<:Integer> == <:Integer>`(`id <:Integer>`(1), 1))
+`println <:String>`(`id <:String>`("hello"))
+`id <:Point<Integer>>`(Point<Integer> { x: 0, y: 0 })
+`destroy <:ReferenceMut<Integer>>`((x:Integer))
 
 ==MONOMORPHIZED==
 
@@ -40,7 +40,7 @@ fn String from <x: Bool> -> String:
 
 
 fn println <x: Bool> -> None:
-	let $tmp@176: None = println String from (x:Bool)
+	let $tmp@176: None = `println <:String>`(`String from <:Bool>`((x:Bool)))
 	return ($tmp@176:None)
 
 
@@ -59,7 +59,7 @@ fn String from <x: Bool> -> String:
 
 
 fn println <x: Bool> -> None:
-	let $tmp@176: None = println String from (x:Bool)
+	let $tmp@176: None = `println <:String>`(`String from <:Bool>`((x:Bool)))
 	return ($tmp@176:None)
 
 

src/tests/snapshots/ppl__tests__import_all.hir.snap

@@ -3,8 +3,8 @@ source: src/tests/mod.rs
 expression: hir
 ---
 use utils.*
-println do nothing
-println do something
+`println <:None>`(`do nothing`())
+`println <:Integer>`(`do something`())
 
 ==MONOMORPHIZED==
 
@@ -15,7 +15,7 @@ fn String from <$arg0: None> -> String:
 
 
 fn println <x: None> -> None:
-	let $tmp@176: None = println String from (x:None)
+	let $tmp@176: None = `println <:String>`(`String from <:None>`((x:None)))
 	return ($tmp@176:None)
 
 
@@ -24,5 +24,5 @@ fn println <x: None> -> None:
 fn String from <$arg0: Integer> -> String
 
 fn println <x: Integer> -> None:
-	let $tmp@176: None = println String from (x:Integer)
+	let $tmp@176: None = `println <:String>`(`String from <:Integer>`((x:Integer)))
 	return ($tmp@176:None)

src/tests/snapshots/ppl__tests__integer.hir.snap

@@ -2,14 +2,14 @@
 source: src/tests/mod.rs
 expression: hir
 ---
-println 0
-println + 1
-println - 2
-println 2 + 1
-println 2 ^ 2
-println 5 - 0
-println 2 * 3
-println 14 / 2
+`println <:Integer>`(0)
+`println <:Integer>`(`+ <:Integer>`(1))
+`println <:Integer>`(`- <:Integer>`(2))
+`println <:Integer>`(`<:Integer> + <:Integer>`(2, 1))
+`println <:Integer>`(`<:Integer> ^ <:Integer>`(2, 2))
+`println <:Integer>`(`<:Integer> - <:Integer>`(5, 0))
+`println <:Integer>`(`<:Integer> * <:Integer>`(2, 3))
+`println <:Rational>`(`<:Integer> / <:Integer>`(14, 2))
 
 ==MONOMORPHIZED==
 
@@ -18,7 +18,7 @@ println 14 / 2
 fn String from <$arg0: Integer> -> String
 
 fn println <x: Integer> -> None:
-	let $tmp@176: None = println String from (x:Integer)
+	let $tmp@176: None = `println <:String>`(`String from <:Integer>`((x:Integer)))
 	return ($tmp@176:None)
 
 
@@ -27,7 +27,7 @@ fn println <x: Integer> -> None:
 fn String from <$arg0: Integer> -> String
 
 fn println <x: Integer> -> None:
-	let $tmp@176: None = println String from (x:Integer)
+	let $tmp@176: None = `println <:String>`(`String from <:Integer>`((x:Integer)))
 	return ($tmp@176:None)
 
 
@@ -36,7 +36,7 @@ fn println <x: Integer> -> None:
 fn String from <$arg0: Integer> -> String
 
 fn println <x: Integer> -> None:
-	let $tmp@176: None = println String from (x:Integer)
+	let $tmp@176: None = `println <:String>`(`String from <:Integer>`((x:Integer)))
 	return ($tmp@176:None)
 
 
@@ -45,7 +45,7 @@ fn println <x: Integer> -> None:
 fn String from <$arg0: Integer> -> String
 
 fn println <x: Integer> -> None:
-	let $tmp@176: None = println String from (x:Integer)
+	let $tmp@176: None = `println <:String>`(`String from <:Integer>`((x:Integer)))
 	return ($tmp@176:None)
 
 
@@ -54,7 +54,7 @@ fn println <x: Integer> -> None:
 fn String from <$arg0: Integer> -> String
 
 fn println <x: Integer> -> None:
-	let $tmp@176: None = println String from (x:Integer)
+	let $tmp@176: None = `println <:String>`(`String from <:Integer>`((x:Integer)))
 	return ($tmp@176:None)
 
 
@@ -63,7 +63,7 @@ fn println <x: Integer> -> None:
 fn String from <$arg0: Integer> -> String
 
 fn println <x: Integer> -> None:
-	let $tmp@176: None = println String from (x:Integer)
+	let $tmp@176: None = `println <:String>`(`String from <:Integer>`((x:Integer)))
 	return ($tmp@176:None)
 
 
@@ -72,7 +72,7 @@ fn println <x: Integer> -> None:
 fn String from <$arg0: Integer> -> String
 
 fn println <x: Integer> -> None:
-	let $tmp@176: None = println String from (x:Integer)
+	let $tmp@176: None = `println <:String>`(`String from <:Integer>`((x:Integer)))
 	return ($tmp@176:None)
 
 
@@ -81,5 +81,5 @@ fn println <x: Integer> -> None:
 fn String from <$arg0: Rational> -> String
 
 fn println <x: Rational> -> None:
-	let $tmp@176: None = println String from (x:Rational)
+	let $tmp@176: None = `println <:String>`(`String from <:Rational>`((x:Rational)))
 	return ($tmp@176:None)