some more intrinsic, refactor map example

crates/codegen/src/ts.rs

@@ -73,9 +73,11 @@ impl Codegen {
 
                     "get" => { format!("{}[{}]", self.gen_ir(&args[0], false), self.gen_ir(&args[1], false)) },
                     "len" => { format!("{}.length", self.gen_ir(&args[0], false)) },
+                    "insert" => { format!("{}.push({})", self.gen_ir(&args[0], false), self.gen_ir(&args[1], false)) },
+                    "concat" => { format!("{}.concat({})", self.gen_ir(&args[0], false), self.gen_ir(&args[1], false)) },
 
                     "throw" => { format!("throw new Error({}){}", self.gen_ir(&args[0], false), semicolon!()) },
-                    _ => unreachable!(format!("Unknown intrinsic: {}", name)) // Shoul be handled by lowering
+                    _ => unreachable!("{}", format!("Unknown intrinsic: {}", name)) // Shoul be handled by lowering
                 }
             },
 
@@ -86,7 +88,7 @@ impl Codegen {
                     .collect::<Vec<_>>().
                     join(", ");
                 format!(
-                    "{} const _{} = ({}): {} => {};\n",
+                    "{} const _{} = ({}): {} => {{{}}};\n",
                     if *public { "export" } else { "" },
                     name,
                     args,
@@ -156,6 +158,16 @@ impl Codegen {
                 }
             },
 
+            IRKind::Tuple { values } => {
+                format!(
+                    "[{}]",
+                    values
+                        .iter()
+                        .map(|value| self.gen_ir(value, false))
+                        .collect::<Vec<_>>()
+                        .join(", ")
+                )
+            },
             IRKind::Vector { values } => {
                 format!(
                     "[{}]",

crates/hir/src/lib.rs

@@ -1,7 +1,7 @@
 use std::ops::Range;
 use parser::types::{Expr, Typehint};
 
-const INTRINSICS: [&str; 8] = [
+const INTRINSICS: [&str; 10] = [
     "write",
     "read",
     "write_file",
@@ -9,6 +9,8 @@ const INTRINSICS: [&str; 8] = [
     "emit",
     "get",
     "len",
+    "insert",
+    "concat",
     "throw",
 ];
 
@@ -450,6 +452,7 @@ pub fn expr_to_ir(expr: &Expr) -> (Option<IRKind>, Option<LoweringError>) {
 fn gen_type_hint(type_hint: &Typehint) -> String {
     match type_hint {
         Typehint::Single(t) => match t.as_str() {
+            "any" => "any".to_string(),
             "int" => "number".to_string(),
             "bool" => "boolean".to_string(),
             _ => t.to_string()

example/map.hz

@@ -1,23 +1,23 @@
-fun map_ (vec: [int]) (fn: |int| -> int) (current: int): void = do
+fun map_ (vec: [int]) (fn: |int| -> int) (current: int): [int] = do
     if current == @len(vec) then
-        do end
+        return []
     else
         do
-            @get(vec, current)
+            let new : [int] = []
-            |> fn(_)
+            let x : int = @get(vec, current) |> fn(_)
-            |> @write(_)
+            @insert(new, x)
-            @write("\n")
 
-            map_(vec, fn, current + 1)
+            let y : [int] = map_(vec, fn, current + 1)
+            return @concat(new, y)
         end
     end
 end
 
-fun map (vec: [int]) (fn: |int| -> int): void = map_(vec, fn, 0)
+fun map (vec: [int]) (fn: |int| -> int): [int] = return map_(vec, fn, 0)
 
-fun mul10 (x: int): int = x * 10
+fun mul10 (x: int): int = return x * 10
 
 fun main: void = do
     let foo: [int] = [69, 420, 727, 1337, 42069, 69420]
-    map(foo, mul10)
+    map(foo, mul10) |> @write(_)
 end

example/tuples.hz

@@ -0,0 +1,33 @@
+-- This is a rewrite of runtime/tuples.ts in itself
+fun every_ (a : [any]) (b : [any]) (current : int) : bool = do
+    if @len(a) == current
+    then return true
+    else
+        do
+            let aa : any = @get(a, current)
+            let bb : any = @get(b, current)
+            if aa == bb
+            then return every_(a, b, current + 1)
+            else return false end
+        end
+    end
+end
+
+fun every (a : [any]) (b : [any]): bool = return every_(a, b, 0)
+
+fun eqTuples (a : [any]) (b : [any]) : bool =
+    match @len(a) == @len(b) with
+        | true -> return every(a, b)
+        | else return false
+    end
+
+fun main : void = do
+    let foo : (int, int) = (1, 3)
+    let bar : (int, int) = (2, 1)
+    let baz : (int, int, int) = (1, 3, 1)
+    eqT(foo, bar) |> @write(_)
+    @write("\n")
+    eqT(foo, baz) |> @write(_)
+    @write("\n")
+    eqT(foo, (1, 3)) |> @write(_)
+end

runtime/tuples.ts

@@ -0,0 +1,4 @@
+export function eqTuples(a: any[], b: any[]) {
+    if (a.length !== b.length) return false;
+    return a.every((elem, i) => b[i] === elem);
+}