COMMON: revert 6d array support

Author: chrisws

samples/distro-examples/tests/array.bas

@@ -295,9 +295,22 @@ if (camera.x != 512) then throw "invalid x"
 if (camera.height != 78) then throw "invalid height"
 if (camera.distance != 800) then throw "invalid distance"
 
-rem - 6d array
+rem --- 6d arrays
 dim a6d(0 to 5, 0 to 5, 0 to 5, 0 to 5, 0 to 5, 4 to 5)
 a6d(0,1,2,3,4,5)=99
 if (a6d(0,1,2,3,4,5) <> 99) then
   throw "a6d error 1"
 endif
+dim m(1 to 11, 2 to 12, 3 to 13, 4 to 14, 5 to 15, 6 to 16)
+for i = 1 to 6
+  if (lbound(m,i) != i) then
+    throw "lbound error"
+  endif
+  if (ubound(m,i) != 10+i) then
+    throw "ubound error"
+  endif
+next i
+m[1,2,3,4,5,6]=999
+if (999 <> m[1,2,3,4,5,6]) then
+  throw "e"
+endif

src/common/blib.c

@@ -213,7 +213,7 @@ void cmd_dim(int preserve) {
         v_toarray1(var_p, 0);
         continue;
       }
-      int size = 1;
+      uint32_t size = 1;
       for (int i = 0; i < dimensions; i++) {
         size = size * (ABS(ubound[i] - lbound[i]) + 1);
       }

src/common/sberr.c

@@ -318,6 +318,10 @@ void err_form_input() {
   err_throw(ERR_FORM_INPUT);
 }
 
+void err_memory() {
+  rt_raise(ERR_MEMORY);
+}
+
 /**
  * the DONE message
  */

src/common/sberr.h

@@ -78,6 +78,7 @@ void err_ref_var();
 void err_ref_circ_var();
 void err_array();
 void err_form_input();
+void err_memory();
 void err_throw(const char *fmt, ...);
 int  err_handle_error(const char *err, var_p_t var);
 void inf_done(void);

src/common/var.c

@@ -66,10 +66,14 @@ void v_alloc_capacity(var_t *var, uint32_t size) {
   v_capacity(var) = capacity;
   v_asize(var) = size;
   v_data(var) = (var_t *)malloc(sizeof(var_t) * capacity);
-  for (uint32_t i = 0; i < capacity; i++) {
-    var_t *e = v_elem(var, i);
-    e->pooled = 0;
-    v_init(e);
+  if (!v_data(var)) {
+    err_memory();
+  } else {
+    for (uint32_t i = 0; i < capacity; i++) {
+      var_t *e = v_elem(var, i);
+      e->pooled = 0;
+      v_init(e);
+    }
   }
 }
 

src/languages/messages.en.h

@@ -219,3 +219,4 @@
 #define ERR_PARAM_NUM           "Incorrect number of parameters: %d. Expected %d."
 #define ERR_PACK_TOO_MANY       "Too many values to unpack"
 #define ERR_PACK_TOO_FEW        "Need more than %d values to unpack"
+#define ERR_MEMORY              "Out of memory error"