small tweaks

Author: StavromulaBeta

examples/fib.cog

@@ -2,8 +2,6 @@ Def Fib
 	Case (< 3) then (1 Drop)
 	else (Let N ; Fib of - 1 N ; + Fib of - 2 N);
 
-~~For each in Range 1 to 40 ( Print Fib );
-
 Put "The 50th fibonacci number is... ";
 Print the Fib of 50;
 

src/cognac.c

@@ -4,6 +4,7 @@
 #include "prelude.h"
 #include <limits.h>
 #include <assert.h>
+#include <time.h>
 #include <string.h>
 #include <unistd.h>
 #include <ctype.h>
@@ -14,22 +15,22 @@
 #include <sys/wait.h>
 #include <execinfo.h>
 
-#define STRING_(x) #x
-#define STRING(x) STRING_(x)
-
 ast_list_t* full_ast = NULL;
 module_t* pmod = NULL;
 char* heap = NULL;
 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} };
 
+int usleep (__useconds_t);
+char* strdup (const char*);
+
 static bool is_prelude(module_t* mod)
 {
 	return mod == &prelude1 || mod == &prelude2;
 }
 
-static void print_banner()
+static void print_banner(void)
 {
 	char* banner =
 	"\t   ______                        ______\n"
@@ -38,11 +39,11 @@ static void print_banner()
 	"\t/ /___/ /_/ / /_/ / / / / /_/ / /___\n"
 	"\t\\____/\\____/\\__, /_/ /_/\\__,_/\\____/\n"
 	"\t           /____/\n"
-	"\t                  Cognate Compiler";
+	"\t                  Cognate Compiler\n";
 	puts(banner);
 }
 
-_Noreturn static void unreachable()
+_Noreturn static void unreachable(void)
 {
 	char msg[] = "\n\n\033[31;1m"
 	"\t  ___  _\n"
@@ -73,7 +74,7 @@ static void* alloc(size_t n)
 	return (heap += n) - n;
 }
 
-where_t* parse_pos()
+where_t* parse_pos(void)
 {
 	where_t* p = alloc(sizeof *p);
 	p->mod = pmod;
@@ -92,8 +93,6 @@ _Noreturn void type_error(val_type_t expected, val_type_t got, where_t* pos)
 
 _Noreturn void throw_error(char* message, where_t* where)
 {
-	// TODO this segfaults if the error is in prelude
-
 	/*
 	puts(message);
 	puts(where->mod->prefix);
@@ -116,9 +115,10 @@ _Noreturn void throw_error(char* message, where_t* where)
 		char c;
 		do { c = fgetc(where->mod->file); } while (c != '\n'); // read one line. TODO this is bad
 	}
-	size_t n = SIZE_MAX;
-	char* line = NULL;
-	getline(&line, &n, where->mod->file);
+
+	char line_start[MAX_ERROR_LINE_LENGTH];
+	char* line = line_start;
+	fgets(line, MAX_ERROR_LINE_LENGTH, where->mod->file);
 
 	// Now we strip leading whitespace
 	while (isspace(*line)) line++, offset--;
@@ -231,7 +231,7 @@ func_list_t* push_func(func_t* f, func_list_t* next)
 	return n;
 }
 
-char* make_func_name()
+char* make_func_name(void)
 {
 	static size_t fid = 0;
 	char* str = alloc(20);
@@ -371,7 +371,7 @@ reg_t* pop_register_rear(reg_dequeue_t* registers)
 	return reg;
 }
 
-reg_dequeue_t* make_register_dequeue()
+reg_dequeue_t* make_register_dequeue(void)
 {
 	reg_dequeue_t* r = alloc(sizeof *r);
 	r->front = r->rear = NULL;
@@ -775,10 +775,20 @@ void to_exe(module_t* mod)
 	};
 	pid_t p = fork();
 	if (!p) execvp(args[0], args);
-	printf("\n%s ", mod->path);
 	int status;
-	while (!waitpid(p, &status, WNOHANG)) usleep(10000), fputc('>', stdout), fflush(stdout);
-	printf(" %s\n", exe_path);
+	int i = 0;
+	while (!waitpid(p, &status, WNOHANG))
+	{
+		usleep(50000);
+		fputc('\r', stdout);
+		printf("%s ", mod->path);
+		char* bar[3] = { "> >> >> >> >> >> >> >> >> >> ", ">> >> >> >> >> >> >> >> >> >>", " >> >> >> >> >> >> >> >> >> >" };
+		fputs(bar[i], stdout);
+		if (++i == 3) i = 0;
+		printf(" %s", exe_path);
+		fflush(stdout);
+	}
+	fputc('\n', stdout);
 	if (status != EXIT_SUCCESS) exit(status);
 }
 
@@ -2767,7 +2777,7 @@ void static_calls(module_t* m)
 	}
 }
 
-ast_list_t* make_astlist()
+ast_list_t* make_astlist(void)
 {
 	ast_list_t* a = alloc(sizeof *a);
 	ast_list_t* b = alloc(sizeof *b);
@@ -2856,8 +2866,8 @@ void static_branches(module_t* m)
 						if (f->stack) clear_registers(regs);
 						if (f->returns)
 						push_register_front(make_register(f->rettype, a), regs);
-						break;
 					}
+					break;
 				case bind:
 					{
 						reg_t* r = pop_register_front(regs);
@@ -3217,7 +3227,7 @@ lit_t* mk_lit(val_type_t t, const char* str)
 	return l;
 }
 
-word_list_t* builtins()
+word_list_t* builtins(void)
 {
 	static builtin_t b[] =
 	{

src/cognac.h

@@ -3,6 +3,10 @@
 #include <stdio.h>
 #include <stdbool.h>
 
+#define STRING_(x) #x
+#define STRING(x) STRING_(x)
+#define MAX_ERROR_LINE_LENGTH 256
+
 typedef struct _ptr_assoc_t ptr_assoc_t;
 typedef struct _func_t func_t;
 typedef struct _module_t module_t;
@@ -256,15 +260,15 @@ void module_parse(module_t*);
 module_t* create_module(char*);
 void fold_defs(module_t*);
 lit_t* mk_lit(val_type_t, const char*);
-word_list_t* builtins();
+word_list_t* builtins(void);
 const char* c_val_type(val_type_t);
 const char* print_val_type(val_type_t);
 _Noreturn void throw_error(char*, where_t*);
 void load_preludes(void);
 
 extern FILE* yyin;
 extern ast_list_t* full_ast;
-extern where_t* parse_pos();
+extern where_t* parse_pos(void);
 int yylex(void);
 int yyparse (void);
 void yyerror(char*);

src/prelude.cog

@@ -8,7 +8,6 @@ Def Any? ( True Drop );
 Def Twin as (Let X ; X X);
 Def Triplet as (Twin ; Twin);
 
-
 Def When as (
 	Let Cond;
 	Let Block;
@@ -83,7 +82,7 @@ Def Prints ( Print Fold ( Join Show ) from "" over Reverse List);
 Def Filter (
 	Def Predicate;
 	Let L;
-	Empty;
+    Empty;
 	For each in L (
 		Let I;
 		Let R be Predicate I;