move Map to prelude

cognate-lang · Aug 7, 2024 · 1320b06 · 1320b06
1 parent 008ccae
commit 1320b06
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 68 deletions.
diff --git a/src/builtins.c b/src/builtins.c
@@ -66,7 +66,6 @@
 {.name="error",               .calltype=call, .argc=1, .args={string}},
 {.name="list",                .calltype=call, .argc=1, .args={block},       .returns=true, .rettype=list},
 {.name="number",              .calltype=call, .argc=1, .args={string},      .returns=true, .rettype=number},
-{.name="map",                 .calltype=call, .argc=2, .args={block, list}, .returns=true, .rettype=list, .stack=true},
 {.name="range",               .calltype=call, .argc=2, .args={number, number},  .returns=true, .rettype=list},
 {.name="index",               .calltype=call, .argc=2, .args={number, list},            .returns=true, .rettype=any},
 {.name="precompute",          .calltype=call, .argc=1, .args={block},   .returns=true, .rettype=block},

diff --git a/src/cognac.c b/src/cognac.c
@@ -2416,7 +2416,6 @@ void _inline_functions(func_t* f, func_list_t** funcs)
 
 void inline_functions(module_t* m)
 {
-	compute_sources(m);
 	_inline_functions(m->entry, &m->funcs);
 }
 
@@ -2820,6 +2819,7 @@ void static_branches(module_t* m)
 						reg_t* i1 = pop_register_front(regs);
 						reg_t* i2 = pop_register_front(regs);
 						push_register_front(make_register(any, a), regs);
+						//printf("%p %p\n", i1, i2);
 						if (!i1 || !i2) break;
 						ast_list_t* s1 = i1->source;
 						ast_list_t* s2 = i2->source;
@@ -3158,6 +3158,7 @@ int main(int argc, char** argv)
 		merge_symbols,
 		assign_sequence_numbers,
 		inline_functions,
+		compute_sources,
 		static_branches,
 		static_calls,
 		determine_arguments,

diff --git a/src/prelude.cog b/src/prelude.cog
@@ -161,4 +161,15 @@ Def Sort
 		Append
 	);
 
+Def Map (
+	Def Pred;
+	Let L be a List!;
+
+	Do If Empty? L ( L )
+	else (
+		Let X be First of L;
+		Let Res be Pred X;
 
+		return Push Res to Map (Pred) over Rest of L;
+	);
+);
diff --git a/src/runtime.c b/src/runtime.c
@@ -296,7 +296,6 @@ static NUMBER ___round(NUMBER);
 static NUMBER ___ceiling(NUMBER);
 static void ___assert(STRING, BOOLEAN);
 static void ___error(STRING);
-static LIST ___map(BLOCK, LIST);
 static LIST ___filter(BLOCK, LIST);
 static LIST ___range(NUMBER, NUMBER);
 static ANY ___index(NUMBER, LIST);
@@ -1487,71 +1486,6 @@ static void ___error(STRING str)
 	throw_error(str);
 }
 
-/*
-static LIST ___map(BLOCK blk, LIST lst)
-{
-	flush_stack_cache();
-	ANYPTR tmp_stack_start = stack.start;
-	stack.start = stack.top;
-	cognate_list start = {0};
-	cognate_list* ptr = &start;
-	for (; lst ; lst = lst->next)
-	{
-		push(lst->object);
-		call_block(blk);
-		flush_stack_cache();
-		while (stack.top != stack.start)
-		{
-			cognate_list* new = gc_malloc(sizeof *new);
-			new->object = pop();
-			new->next = NULL;
-			ptr->next = new;
-			ptr = new;
-		}
-	}
-	stack.top = stack.start;
-	stack.start = tmp_stack_start;
-	return start.next;
-}
-*/
-
-static LIST ___map(BLOCK blk, LIST lst)
-{
-	cognate_list start = {0};
-	cognate_list* ptr = &start;
-	for (; lst ; lst = lst->next)
-	{
-		push(lst->object);
-		call_block(blk);
-		cognate_list* new = gc_malloc(sizeof *new);
-		new->object = pop();
-		new->next = NULL;
-		ptr->next = new;
-		ptr = new;
-	}
-	return start.next;
-}
-
-static LIST ___filter(BLOCK blk, LIST lst)
-{
-	cognate_list start = {0};
-	cognate_list* ptr = &start;
-	for (; lst ; lst = lst->next)
-	{
-		push(lst->object);
-		call_block(blk);
-		if (unbox_BOOLEAN(pop()))
-		{
-			cognate_list* new = gc_malloc(sizeof *new);
-			new->object = lst->object;
-			new->next = NULL;
-			ptr->next = new;
-			ptr = new;
-		}
-	}
-	return start.next;
-}
-
 static LIST ___range(NUMBER start, NUMBER end)
 {
 	if (end < start)