Support named lists.

CE-Programming · Sep 19, 2017 · 6f52694 · 6f52694
1 parent 38ed4aa
commit 6f52694
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/core/vat.c b/core/vat.c
@@ -76,18 +76,23 @@ const char *calc_var_type_names[0x40] = {
 const char *calc_var_name_to_utf8(uint8_t name[8]) {
     static char buffer[17];
     char *dest = buffer;
-    uint8_t i;
-    for (i = 0; i < 8 && ((name[i] >= 'A' && name[i] <= 'Z' + 1)  ||
-                          (i && name[i] >= 'a' && name[i] <= 'z') ||
-                          (i && name[i] >= '0' && name[i] <= '9')); i++) {
+    uint8_t i = 0;
+    if (name[0] == 0x5D) {
+        *dest++ = '\xCA';
+        *dest++ = '\x9F';
+        i++;
+    }
+    for (; i < 8 && ((name[i] >= 'A' && name[i] <= 'Z' + 1)  ||
+                     (i && name[i] >= 'a' && name[i] <= 'z') ||
+                     (i && name[i] >= '0' && name[i] <= '9')); i++) {
         if (name[i] == 'Z' + 1) {
             *dest++ = '\xCE';
             *dest++ = '\xB8';
         } else {
             *dest++ = name[i];
         }
     }
-    if (!i) {
+    if (!(i - (name[0] == 0x5D))) {
         switch (name[0]) {
             case '!':
             case '#':
@@ -109,6 +114,7 @@ const char *calc_var_name_to_utf8(uint8_t name[8]) {
                 *dest++ = ']';
                 break;
             case 0x5D:
+                dest -= 2;
                 *dest++ = 'L';
                 *dest++ = '\xE2';
                 *dest++ = '\x82';