COMMON: revert 6d array support

Author: chrisws

samples/distro-examples/tests/array.bas

@@ -294,3 +294,10 @@ camera = {
 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
+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

src/common/blib_func.c

@@ -1857,8 +1857,7 @@ void cmd_intN(long funcCode, var_t *r) {
     //
     if (code_peek() == kwTYPE_VAR) {
       var_p = code_getvarptr();
-      if (var_p->type == V_ARRAY) {
-
+      if (!prog_error && var_p->type == V_ARRAY) {
         l = 1;
         if (code_peek() == kwTYPE_SEP) {
           par_getcomma();
@@ -1892,9 +1891,8 @@ void cmd_intN(long funcCode, var_t *r) {
     // int <- UBOUND(array [, dim])
     //
     if (code_peek() == kwTYPE_VAR) {
-      code_skipnext();
-      var_p = tvar[code_getaddr()];
-      if (var_p->type == V_ARRAY) {
+      var_p = code_getvarptr();
+      if (!prog_error && var_p->type == V_ARRAY) {
         l = 1;
         if (code_peek() == kwTYPE_SEP) {
           par_getcomma();
@@ -2556,7 +2554,7 @@ void cmd_genfunc(long funcCode, var_t *r) {
         ofs = prog_ip;
         if (code_isvar()) {
           var_t *basevar_p = code_getvarptr();
-          if (basevar_p->type == V_ARRAY) {
+          if (!prog_error && basevar_p->type == V_ARRAY) {
             count = v_asize(basevar_p);
             for (int i = 0; i < count; i++) {
               var_t *elem_p = v_getelemptr(basevar_p, i);
@@ -2626,7 +2624,7 @@ void cmd_genfunc(long funcCode, var_t *r) {
         ofs = prog_ip;
         if (code_isvar()) {
           var_t *basevar_p = code_getvarptr();
-          if (basevar_p->type == V_ARRAY) {
+          if (!prog_error && basevar_p->type == V_ARRAY) {
             count = v_asize(basevar_p);
             for (int i = 0; i < count; i++) {
               var_t *elem_p = v_getelemptr(basevar_p, i);