COMMON: added id field to V_MAP and V_FUNC

This helps modules to internally manage variables

Author: chrisw-s

src/common/hashmap.c

@@ -125,6 +125,7 @@ void hashmap_create(var_p_t map, int size) {
   v_free(map);
   map->type = V_MAP;
   map->v.m.count = 0;
+  map->v.m.id = -1;
   if (size == 0) {
     map->v.m.size = MAP_SIZE;
   } else {

src/common/var.c

@@ -524,6 +524,7 @@ void v_set(var_t *dest, const var_t *src) {
     break;
   case V_FUNC:
     dest->v.fn.cb = src->v.fn.cb;
+    dest->v.fn.id = src->v.fn.id;
     break;
   case V_NIL:
     dest->type = V_NIL;
@@ -563,12 +564,14 @@ void v_move(var_t *dest, const var_t *src) {
     dest->v.m.map = src->v.m.map;
     dest->v.m.count = src->v.m.count;
     dest->v.m.size = src->v.m.size;
+    dest->v.m.id = src->v.m.id;
     break;
   case V_REF:
     dest->v.ref = src->v.ref;
     break;
   case V_FUNC:
     dest->v.fn.cb = src->v.fn.cb;
+    dest->v.fn.id = src->v.fn.id;
     break;
   case V_NIL:
     dest->type = V_NIL;
@@ -795,4 +798,5 @@ void v_create_func(var_p_t map, const char *name, method cb) {
   var_p_t v_func = map_add_var(map, name, 0);
   v_func->type = V_FUNC;
   v_func->v.fn.cb = cb;
+  v_func->v.fn.id = 0;
 }

src/common/var_map.c

@@ -290,6 +290,7 @@ void map_set(var_p_t dest, const var_p_t src) {
     hashmap_create(dest, src->v.m.count);
     hashmap_foreach(src, map_set_cb, &cb);
     dest->v.m.count = src->v.m.count;
+    dest->v.m.id = src->v.m.id;
   }
 }
 

src/include/var.h

@@ -71,6 +71,7 @@ typedef struct var_s {
       void *map;
       uint32_t count;
       uint32_t size;
+      uint32_t id;
     } m;
 
     // reference variable
@@ -79,6 +80,7 @@ typedef struct var_s {
     // object method
     struct {
       method cb;
+      uint32_t id;
     } fn;
 
     // generic ptr (string)

src/platform/console/main.cpp

@@ -39,9 +39,9 @@ static struct option OPTIONS[] = {
 
 void show_help() {
   fprintf(stdout,
-          "SmallBASIC version %s - kw:%d, pc:%d, fc:%d, ae:%d I=%d N=%d\n\n",
+          "SmallBASIC version %s - kw:%d, pc:%d, fc:%d, V:%d I=%d N=%d\n\n",
           SB_STR_VER, kwNULL, (kwNULLPROC - kwCLS) + 1,
-          (kwNULLFUNC - kwASC) + 1, (int)(65536 / sizeof(var_t)),
+          (kwNULLFUNC - kwASC) + 1, (int)(sizeof(var_t)),
           (int)sizeof(var_int_t), (int)sizeof(var_num_t));
   fprintf(stdout, "usage: sbasic [options]...\n");
   int i = 0;
@@ -349,7 +349,6 @@ int main(int argc, char *argv[]) {
   opt_file_permitted = 1;
   opt_ide = 0;
   opt_loadmod = 0;
-  opt_modpath[0] = 0;
   opt_nosave = 1;
   opt_pref_height = 0;
   opt_pref_width = 0;
@@ -359,6 +358,7 @@ int main(int argc, char *argv[]) {
   os_graphics = 1;
   os_color_depth = 16;
 
+  strcpy(opt_modpath, ".");
   console_init();
 
   char *file = NULL;