WIP

src/byte_defs.h

@@ -155,7 +155,7 @@ typedef struct {
 #ifndef win
 _Static_assert(sizeof(Value) == 8, "Value isn't the right size");
 #endif
-_Static_assert(sizeof(Tag) <= sizeof(i32), "Tag is too large for tomfoolery");
+_Static_assert(sizeof(Tag) <= 2, "Tag is too large for tomfoolery");
 
 static inline FnSig *get_fnsig(Value *x){
   u64 rval = *((u64*)x);

src/code_defs.h

@@ -69,13 +69,13 @@ enum BuiltinStatements {
 };
 
 
-struct Statement {
+struct PACKED Statement {
 
-  i32 type;
-  i16 is_const; // Statement is constant, != is a constant - TODO : implem
+  u8 type;
+  u8 is_const; // Statement is constant, != is a constant - TODO : implem
   i16 scope;
-  void **children;
   i32 child_n;
+  void **children;
   void *parent;
   union {
     Value cons;
@@ -91,6 +91,14 @@ struct Statement {
 
 typedef struct Statement Statement;
 
+// Function signature for the tree walk interpreter
+typedef struct {
+
+  i32 param_id[8]; // Ids to fill for parameters
+  Statement *stat; // Statement to jump to
+
+} InterprSig;
+
 // In practice, this is allocated in parse.c
 typedef struct {
 
@@ -106,6 +114,9 @@ typedef struct {
 
   i32 fn_n;
   FnSig *funcs;
+#ifdef INTERPR
+  InterprSig *interpr_sigs;
+#endif
 
   i32 stack_size;
   i32 curr_statement; 

src/config.h

@@ -23,7 +23,7 @@
 // 0 : None (still features runtime debug)
 // 1 : Some checks
 // 2 : All checks
-#define DEBUG 0
+#define DEBUG 2
 
 // Debug logs
 // 0 : None

src/hash.h

@@ -24,20 +24,22 @@
 
 #pragma once
 
-#define HASH_NULL 0xFFFFFF
+#define HASH_NULL 0x7FFFFF
 
 #define RELOCATE_TRY_MAX 32
 
 typedef struct {
 
-  i32 hash;
+  union {
+    i32 id;
+    void *fnsig;
+  };
+  uint hash     : 23;
+  uint is_const :  1;
+  u16 type;
   char str[36];
-  i32 id;
-  void *fnsig;
-  i16 type;
-  i16 is_const;
 
-} MapItem;
+} PACKED NOPOS MapItem;
 
 typedef struct {
 
@@ -69,3 +71,4 @@ MapItem *hashmap_get(HashMap *map, char *str);
 void hashmap_remove(HashMap *map, char *str);
 
 void hashmap_remove_id(HashMap *map, i32 id);
+

src/parse_utils.c

@@ -86,6 +86,10 @@ Statement *get_statement(){
   return &stack->statements[stack->curr_statement++];
 }
 
+i32 curr_scope(){
+  return stack->scope_stack[stack->curr_scope];
+}
+
 char *bi_type_names[6] = {
   "",
   "int",
@@ -144,18 +148,22 @@ void mangle_name(char *dst, i32 scope, char *name){
 }
 
 Statement *declare(i32 type, Tag vtype, char *name, Statement *assign){
-#if LOG
-  printf("declare : %d\n", vtype.type);
-#endif
+  char tmpbuf[36];
+
   clean_name(name);
   Statement *stat = get_statement();
   stat->type = type;
+  if(type == BI_let){
+    mangle_name(tmpbuf, curr_scope(), name);
+    name = tmpbuf;
+  }
+
   if(hashmap_get(&stack->symbol_map, name))
     yyerror("Redeclaring existing identifier");
   MapItem *ret = hashmap_insert(&stack->symbol_map, name);
   ret->type = *((i16*)&vtype);
 #if LOG
-  printf("id : %d\n", ret->id);
+  printf("declare : id : %d\n", ret->id);
 #endif
   stat->var_id = ret->id;
   stat->var_type = vtype;
@@ -176,8 +184,13 @@ Statement *variable_get(char *name){
   clean_name(name);
   Statement *stat = get_statement();
   MapItem *ret = hashmap_get(&stack->symbol_map, name);
-  if(!ret)
-   yyerror("Undefined identifier");
+  if(!ret){
+    char tmpbuf[36];
+    mangle_name(tmpbuf, curr_scope(), name);
+    ret = hashmap_get(&stack->symbol_map, tmpbuf);
+    if(!ret)
+      yyerror("Undefined identifier");
+  }
   stat->type = ST_Var;
   stat->var_id = ret->id; 
   stat->var_type = *((Tag*)&ret->type);
@@ -274,7 +287,9 @@ Statement *make_operation(i32 type, Tag vtype, char *name, i32 nparam, ...){
 }
 
 void push_scope(){
+#if LOG
   printf("push_scope %d\n", stack->scope_id);
+#endif
   if(stack->curr_scope >= 256)
     yyerror("Scopes are too deep");
   stack->scope_stack[stack->curr_scope++] = stack->scope_id++; 
@@ -282,27 +297,36 @@ void push_scope(){
 
 void pop_scope(){
   stack->curr_scope--;
+#if LOG
   printf("pop_scope %d\n", stack->scope_stack[stack->curr_scope]);
+#endif
   if(stack->curr_scope < 0)
     yyerror("Weird scope error");
 }
 
 FnArgs *make_fnargs(char *name, Tag type){
+#if LOG
   printf("fnargs : %s\n", name);
+#endif
   FnArgs *args = malloc(sizeof(FnArgs));
   if(!args)
     yyerror("alloc error");
   args->n_args = 1;
-  args->names[0] = name;
+  // TODO
+  args->param_decl[0] = NULL;
   args->types[0] = type;
   return args;
 }
 
 FnArgs *add_fnargs(FnArgs *args, char *name, Tag type){
+#if LOG
   printf("fnargs : %s\n", name);
+#endif
   if(args->n_args >= 9)
     yyerror("Too many args to func");
-  args->names[args->n_args] = name;
+
+  Statement *decl = declare(BI_let, type, name, NULL);
+  args->param_decl[args->n_args] = decl; 
   args->types[args->n_args++] = type;
   return args;
 }
@@ -311,6 +335,9 @@ Statement *make_function(FnArgs *fn_args, Statement *statements){
   printf("make_function : %s\n", fn_args->names[0]);
   Statement *stat = get_statement();
   stat->type = BI_fn;
+
+
+
   free(fn_args);
   return stat;
 }

src/parser.h

@@ -26,7 +26,7 @@
 typedef struct {
 
   // 0 is function name/output type
-  char *names[9];
+  Statement *param_decl[9];
   Tag types[9];
   i32 n_args;