Merge branch 'master' of jackywulf.com:Fcalva/flisp

Makefile

@@ -3,7 +3,7 @@
 
 OUTNAME = flisp
 
-CFLAGS = -std=c99 -O0 -Wall -Wextra -g -pipe -Wno-cast-function-type 
+CFLAGS = -std=c99 -O0 -flto -Wall -Wextra -g -pipe -Wno-cast-function-type 
 
 CC = gcc
 
@@ -36,7 +36,7 @@ builddir:
 	@- mv $(wildcard $(BUILD_DIR)/*.o) build-tmp/
 
 yacc: src/parser.y src/parser.l
-	cd src && yacc -d -g parser.y && lex parser.l 
+	cd src && bison -y -d parser.y && lex parser.l 
 	$(CC) -c src/y.tab.c -o build-tmp/y.tab.o $(CFLAGS)
 	$(CC) -c src/lex.yy.c -o build-tmp/lex.yy.o $(CFLAGS)
 

README.md

@@ -14,10 +14,10 @@ Pre-requisites:
 - GNU Make
 
 ### Unix
-Running `make` twice should work on most Unix systems.
+Running `make` (or `gmake` for BSDs) should work on most Unix systems.
 It produces an executable called `flisp.amd64`
 
 ### Windows
 To meet the previously mentionned pre-requisites, you need to use mingw.
 I recommend installing w64devkit, then compiling Bison and Flex from source.
-Run `make win`, twice.
+Run `make win`

src/exec_common.c

@@ -183,7 +183,7 @@ void *get_addr(u32 pos){
   return internal_buf + pos;
 }
 
-Value write(Value a);
+Value fl_write(Value a);
 
 void print_ast1(Statement *base, i32 indent){
   i32 close_parent = 1;
@@ -198,7 +198,7 @@ void print_ast1(Statement *base, i32 indent){
       printf("(call<%lx>\n", (u64)base->func);
       break;
     case ST_Const:
-      write(base->cons);
+      fl_write(base->cons);
       printf("\n");
       close_parent = 0;
       break;
@@ -612,7 +612,8 @@ Value pop(Value a, Value b){
 
 }
 
-Value write(Value a){
+Value fl_write(Value a){
+  char *nstr;
   switch(a.tag.type){
     case T_null:
     case T_any:
@@ -628,7 +629,6 @@ Value write(Value a){
       printf("%f",a.v4B.vfl);
       break;
     case T_str:
-      char *nstr;
       nstr = malloc(a.vstr.len+1);
       if(a.vstr.len > 4){
         char *str = get_addr(a.vstr.pos);
@@ -682,7 +682,7 @@ FnSig builtins[] = {
   {{tvec}     ,1,1,{.bi = BICAST(len)}},
   {{tvec,tany},2,1,{.bi = BICAST(push)}},
   {{tvec,tint},2,1,{.bi = BICAST(pop)}},
-  {{tany}     ,1,1,{.bi = BICAST(write)}},
+  {{tany}     ,1,1,{.bi = BICAST(fl_write)}},
   {{0}        ,0,1,{.bi = BICAST(nwline)}}
 };
 

src/interpreter.c

@@ -57,14 +57,16 @@ Value fncall(FnSig *fn, Statement **params){
       case 0:
         returnv = fn->bi();
         break;
-      case 1:
+      case 1:{
         Value (*fn1)(Value) = (void*)fn->bi;
         returnv = fn1(execute(params[0]));
         break;
-      case 2:
+      }
+      case 2:{
         Value (*fn2)(Value,Value) = (void*)fn->bi;
         returnv = fn2(execute(params[0]),execute(params[1]));
         break;
+      }
       default:
         runtime_err("Call to builtin with >2 params");
         break;
@@ -149,13 +151,14 @@ Value execute(Statement *stat){
     case BI_cast:
       returnv = cast(stat->var_type, execute(stat->children[0]));
       break;
-    case ST_Call:
+    case ST_Call:{
       FnSig *fn = stat->func;
       Statement **params = NULL;
       if(fn->n_param)
         params = (Statement**)((Statement*)stat->children[0])->children;
       returnv = fncall(fn, params);
       break;
+    }
   }
   return returnv;
 }

src/main.c

@@ -20,6 +20,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
+#include <unistd.h>
 
 #include "types.h"
 #include "tests.h"
@@ -34,7 +35,7 @@ extern FILE *yyin;
 
 int main(int argc, char *argv[]){
   i32 fpos = 1;
- 
+
   if(argc > 1){ 
     if(!strcmp(argv[1], "--tests")){
       fpos++;