Putting the entire runtime into the C file is inelegant, so instead we put it into a temporary header file. This means no hassle with environment variables for the compiler. Also compiling the runtime seperately would prevent a load of optimization

Author: StavromulaBeta

Makefile

@@ -4,7 +4,7 @@ PREFIX=`echo ~`/.local
 BINDIR=$(PREFIX)/bin
 TESTS=$(basename $(wildcard tests/*.cog))
 
-cognac: src/cognac.h src/cognac.c src/parser.c src/parser.h src/lexer.c src/runtime.h src/prelude.h src/builtins.c
+cognac: src/cognac.h src/cognac.c src/parser.c src/parser.h src/lexer.c src/runtime_bytes.h src/prelude.h src/builtins.c
 	$(CC) $(CFLAGS) src/lexer.c src/parser.c src/cognac.c -o cognac -DCC=$(CC)
 
 install: cognac
@@ -14,8 +14,8 @@ install: cognac
 uninstall:
 	rm -rf $(BINDIR)/cognac
 
-src/runtime.h: src/runtime.c
-	xxd -i src/runtime.c > src/runtime.h
+src/runtime_bytes.h: src/runtime.h
+	xxd -i src/runtime.h > src/runtime_bytes.h
 
 src/prelude.h: src/prelude.cog
 	xxd -i src/prelude.cog src/prelude.h
@@ -27,7 +27,7 @@ src/parser.c src/parser.h: src/parser.y
 	bison src/parser.y --defines=src/parser.h -o src/parser.c
 
 clean:
-	rm src/lexer.c src/parser.c src/parser.h cognac src/runtime.h
+	rm src/lexer.c src/parser.c src/parser.h cognac src/runtime_bytes.h
 
 test: $(TESTS)
 

src/cognac.c

@@ -1,6 +1,6 @@
 #include "cognac.h"
 #include "parser.h"
-#include "runtime.h"
+#include "runtime_bytes.h"
 #include "prelude.h"
 #include <limits.h>
 #include <assert.h>
@@ -26,6 +26,8 @@ module_t prelude1 = { .prefix = "prelude" }; // written in C
 module_t prelude2 = { .prefix = "prelude" }; // written in Cognate
 module_list_t preludes = { .mod=&prelude2, .next = &(module_list_t){.mod=&prelude1, .next=NULL} };
 
+char runtime_filename[] = "/tmp/cognac-runtime-XXXXXX.h";
+
 int usleep (unsigned int);
 char* strdup (const char*);
 
@@ -770,12 +772,14 @@ void to_exe(module_t* mod)
 	char* c_source_path = strdup(mod->path);
 	c_source_path[strlen(c_source_path) - 2] = '\0';
 
+	printf("source path %s exe_path %s\n", c_source_path, exe_path);
+
 	char* args[] =
 	{
 		STR(CC), c_source_path, "-o", exe_path,
 		"-Ofast", "-flto", "-s", "-w",
 		//"-O0", "-ggdb3", "-g", "-rdynamic",
-		"-lm", "-Wall", "-Wpedantic", NULL
+		"-lm", "-Wall", "-Wpedantic", "-Wno-unused", NULL
 	};
 	pid_t p = fork();
 	if (!p) execvp(args[0], args);
@@ -793,6 +797,7 @@ void to_exe(module_t* mod)
 		fflush(stdout);
 	}
 	fputc('\n', stdout);
+	remove(runtime_filename);
 	if (status != EXIT_SUCCESS) exit(status);
 }
 
@@ -818,17 +823,21 @@ void c_emit_funcall(func_t* fn, FILE* c_source, reg_dequeue_t* registers)
 
 void to_c(module_t* mod)
 {
+	mkstemps(runtime_filename, 2);
+	FILE* runtime_file = fopen(runtime_filename, "w");
+	fprintf(runtime_file, "%.*s", src_runtime_h_len, (char*)src_runtime_h);
+	fclose(runtime_file);
+
 	char* c_source_path = strdup(mod->path);
 	c_source_path[strlen(c_source_path) - 2] = '\0';
 	FILE* c_source = fopen(c_source_path, "w");
-	fprintf(c_source, "%.*s", src_runtime_c_len, (char*)src_runtime_c);
-	fputc('\n', c_source);
+	fprintf(c_source, "#include \"%s\"\n\n", runtime_filename);
 	for (symbol_list_t* syms = mod->symbols ; syms ; syms = syms->next)
 		fprintf(c_source, "SYMBOL SYM%s = \"%s\";\n", syms->text, syms->text);
 	if (mod->symbols) fputc('\n', c_source);
 	for (func_list_t* func = mod->funcs ; func ; func = func->next)
 	{
-		fprintf(c_source, "%s %s(",
+		fprintf(c_source, "static %s %s(",
 				func->func->returns ? c_val_type(func->func->rettype) : "void",
 				func->func->name);
 		if (!func->func->generic) for (word_list_t* w = func->func->captures ; w ; w = w->next)
@@ -858,7 +867,7 @@ void to_c(module_t* mod)
 	for (func_list_t* func = mod->funcs ; func ; func = func->next)
 	{
 		//size_t num_words = 0;
-		fprintf(c_source, "%s %s(",
+		fprintf(c_source, "static %s %s(",
 		func->func->returns ? c_val_type(func->func->rettype) : "void",
 		func->func->name);
 		if (!func->func->generic)

src/runtime.c renamed to src/runtime.h

@@ -182,7 +182,6 @@ static const char* restrict function_stack_start;
 
 // Variables and	needed by functions.c defined in runtime.c
 static void init_stack(void);
-static void expand_stack(void);
 static STRING show_object(const ANY object, const _Bool);
 static void _Noreturn __attribute__((format(printf, 1, 2))) throw_error_fmt(const char* restrict const, ...);
 static void _Noreturn throw_error(const char* restrict const);
@@ -223,7 +222,6 @@ static ANY box_DICT(DICT);
 static NUMBER radians_to_degrees(NUMBER);
 static NUMBER degrees_to_radians(NUMBER);
 
-static void init(int, char **);
 static void cleanup(void);
 static void push(ANY);
 static ANY pop(void);
@@ -233,7 +231,6 @@ static int stack_length(void);
 
 // Builtin functions needed by compiled source file defined in functions.c
 static DICT ___insert(STRING, ANY, DICT);
-static DICT ___emptyDdict(void);
 static LIST ___empty(void);
 static ANY ___if(BOOLEAN, ANY, ANY);
 static void ___put(ANY);
@@ -281,7 +278,6 @@ static NUMBER ___stringDlength(STRING);
 static STRING ___substring(NUMBER, NUMBER, STRING);
 static STRING ___input(void);
 static IO ___open(STRING, STRING);
-static void ___with(STRING, STRING, BLOCK);
 static void ___close(IO);
 static NUMBER ___number(STRING);
 static STRING ___path(void);
@@ -296,8 +292,6 @@ static NUMBER ___floor(NUMBER);
 static NUMBER ___round(NUMBER);
 static NUMBER ___ceiling(NUMBER);
 static void ___error(STRING);
-static LIST ___filter(BLOCK, LIST);
-static ANY ___index(NUMBER, LIST);
 //static BLOCK ___precompute(BLOCK);
 static void ___wait(NUMBER);
 static LIST ___split(STRING, STRING);
@@ -343,7 +337,7 @@ static size_t debug_lineno = 0;
 static int _argc;
 static char** _argv;
 
-void fn0();
+static void fn0();
 
 int main(int argc, char** argv)
 {
@@ -622,6 +616,7 @@ static STRING show_object (const ANY object, const _Bool raw_strings)
 	{
 		case NIL: throw_error("This shouldn't happen");
 					 break;
+		case dict: // TODO
 		case number: sprintf(buffer, "%.14g", object.number);
 						 buffer += strlen(buffer);
 						 break;
@@ -1174,7 +1169,6 @@ static NUMBER ___modulo(NUMBER a, NUMBER b) { return b - a * floor(b / a); }
 static NUMBER ___sqrt(NUMBER a) { return sqrt(a); }
 static NUMBER ___random(NUMBER low, NUMBER high)
 {
-	NUMBER step = 1;
 	if unlikely((high - low) < 0) goto invalid_range;
 	else if (high - low < 1) return low;
 	// This is not cryptographically secure btw.
@@ -1818,7 +1812,6 @@ static void invalid_jump(void* env)
 
 static void oh_no(void* env)
 {
-	char a;
 	longjmp(*(jmp_buf*)env, 1);
 }
 
@@ -1918,7 +1911,7 @@ static ANY ___get(STRING key, DICT d)
 
 	if (diff == 0) return d->value;
 	else if (diff > 0) return ___get(key, d->child1);
-	else if (diff < 0) return ___get(key, d->child2);
+	else return ___get(key, d->child2);
 }
 
 // ---------- ACTUAL PROGRAM ----------