Converting void vectors to typed, starting with functions

Author: rswinkle

src/interpreter.c

@@ -11,7 +11,7 @@ var_value run(program_state* prog, char* start_func)
 fprintf(stderr, "Error: function '%s' not found.\n", func_name);
 exit(0);
 }
-function* func = GET_FUNCTION(&prog->functions, var->v.func_loc);
+function* func = &prog->functions.a[var->v.func_loc];
 prog->func = func;
 prog->stmt_list = &func->stmt_list;
 func->pc = 0;
@@ -24,7 +24,7 @@ var_value run(program_state* prog, char* start_func)
 
 var_value ret = prog->func->ret_val;
 
-cvec_free_void(&prog->functions);
+cvec_free_function(&prog->functions);
 cvec_free_str(&prog->global_variables);
 cvec_free_void(&prog->global_values);
 cvec_free_void(&prog->expressions);
@@ -421,7 +421,7 @@ var_value execute_expr(program_state* prog, expression* e)
 old_func = prog->func;
 
 //look_up_value should never return NULL here, parsing should catch all errors like that
-func = GET_FUNCTION(&prog->functions, look_up_value(prog, e->left->tok.v.id, ONLY_GLOBAL)->v.func_loc);
+func = &prog->functions.a[look_up_value(prog, e->left->tok.v.id, ONLY_GLOBAL)->v.func_loc];
 
 if (func->n_params) //could also check e->right->tok.type = VOID
 execute_expr_list(prog, func, e->right);

src/parser.c

@@ -11,6 +11,7 @@
 #include <stdio.h>
 
 
+CVEC_NEW_DEFS2(function, RESIZE)
 
 
 expression* make_expression(program_state* prog)
@@ -208,7 +209,7 @@ void parse_program_string(program_state* prog, char* string)
 prog->pc = NULL;
 prog->stmt_list = NULL;
 prog->bindings = NULL;
-cvec_void(&prog->functions, 0, 10, sizeof(function), free_function, init_function);
+cvec_function(&prog->functions, 0, 10, free_function, init_function);
 cvec_str(&prog->global_variables, 0, 20);
 cvec_void(&prog->global_values, 0, 20, sizeof(var_value), free_var_value, NULL);
 
@@ -268,7 +269,7 @@ void parse_program_file(program_state* prog, FILE* file)
 prog->pc = NULL;
 prog->stmt_list = NULL;
 prog->bindings = NULL;
-cvec_void(&prog->functions, 0, 10, sizeof(function), free_function, init_function);
+cvec_function(&prog->functions, 0, 10, free_function, init_function);
 cvec_str(&prog->global_variables, 0, 20);
 cvec_void(&prog->global_values, 0, 20, sizeof(var_value), free_var_value, NULL);
 
@@ -359,7 +360,7 @@ void function_declarator(parsing_state* p, program_state* prog, var_type vtype)
 //TODO make sure it's not already defined and make sure it matches previous declarations
 
 function* func_ptr;
-cvec_push_void(&prog->functions, NULL); //initialization is done automatically in init_function
+cvec_push_function(&prog->functions, NULL); //initialization is done automatically in init_function
 assert(prog->functions.size <= 10); //for now prevent possibility of bug TODO what was this for?
 
 var_value var;
@@ -369,7 +370,7 @@ void function_declarator(parsing_state* p, program_state* prog, var_type vtype)
 cvec_push_str(&prog->global_variables, tok->v.id);
 cvec_push_void(&prog->global_values, &var);
 
-func_ptr = cvec_back_void(&prog->functions);
+func_ptr = cvec_back_function(&prog->functions);
 
 func_ptr->n_params = 0;
 func_ptr->ret_val.type = vtype;

src/parser.h

@@ -15,7 +15,6 @@
 
 
 #define GET_STMT(VEC, I) CVEC_GET_VOID(VEC, statement, I)
-#define GET_FUNCTION(VEC, I) CVEC_GET_VOID(VEC, function, I)
 #define GET_SYMBOL(VEC, I) CVEC_GET_VOID(VEC, symbol, I)
 #define GET_BINDING(VEC, I) CVEC_GET_VOID(VEC, binding, I)
 
@@ -165,12 +164,14 @@ typedef struct function
 cvector_i label_locs;
 } function;
 
+CVEC_NEW_DECLS2(function)
 
 
+#define RESIZE(x) ((x+1)*2)
 
 typedef struct program_state
 {
-cvector_void functions;
+cvector_function functions;
 cvector_void* stmt_list;
 size_t* pc;
 function* func;