Changes in uspace/app/sbi/src/rdata.c [051bc69a:38aaacc2] in mainline

File:

• uspace/app/sbi/src/rdata.c (modified) (11 diffs)

uspace/app/sbi/src/rdata.c

@@ -52 +52 @@
 #include "stree.h"
 #include "symbol.h"
-#include "strtab.h"
 
 #include "rdata.h"
@@ -62 +61 @@
 static void rdata_ref_copy(rdata_ref_t *src, rdata_ref_t **dest);
 static void rdata_deleg_copy(rdata_deleg_t *src, rdata_deleg_t **dest);
-static void rdata_enum_copy(rdata_enum_t *src, rdata_enum_t **dest);
 static void rdata_array_copy(rdata_array_t *src, rdata_array_t **dest);
 static void rdata_object_copy(rdata_object_t *src, rdata_object_t **dest);
 static void rdata_resource_copy(rdata_resource_t *src,
     rdata_resource_t **dest);
-static void rdata_symbol_copy(rdata_symbol_t *src, rdata_symbol_t **dest);
 
 static int rdata_array_get_dim(rdata_array_t *array);
@@ -250 +247 @@
 
         return deleg;
-}
-
-/** Allocate new enum value.
- *
- * @return      New enum value.
- */
-rdata_enum_t *rdata_enum_new(void)
-{
-        rdata_enum_t *enum_v;
-
-        enum_v = calloc(1, sizeof(rdata_enum_t));
-        if (enum_v == NULL) {
-                printf("Memory allocation failed.\n");
-                exit(1);
-        }
-
-        return enum_v;
 }
 
@@ -393 +373 @@
 
         return resource_v;
-}
-
-/** Allocate new symbol reference.
- *
- * @return      New symbol reference.
- */
-rdata_symbol_t *rdata_symbol_new(void)
-{
-        rdata_symbol_t *symbol_v;
-
-        symbol_v = calloc(1, sizeof(rdata_symbol_t));
-        if (symbol_v == NULL) {
-                printf("Memory allocation failed.\n");
-                exit(1);
-        }
-
-        return symbol_v;
 }
 
@@ -490 +453 @@
                 rdata_deleg_copy(src->u.deleg_v, &nvar->u.deleg_v);
                 break;
-        case vc_enum:
-                rdata_enum_copy(src->u.enum_v, &nvar->u.enum_v);
-                break;
         case vc_array:
                 rdata_array_copy(src->u.array_v, &nvar->u.array_v);
@@ -501 +461 @@
         case vc_resource:
                 rdata_resource_copy(src->u.resource_v, &nvar->u.resource_v);
-                break;
-        case vc_symbol:
-                rdata_symbol_copy(src->u.symbol_v, &nvar->u.symbol_v);
                 break;
         }
@@ -577 +534 @@
 }
 
-/** Copy enum value.
- *
- * @param src           Source enum value.
- * @param dest          Place to store pointer to new enum value.
- */
-static void rdata_enum_copy(rdata_enum_t *src, rdata_enum_t **dest)
-{
-        *dest = rdata_enum_new();
-        (*dest)->value = src->value;
-}
-
 /** Copy array.
  *
@@ -621 +567 @@
         *dest = rdata_resource_new();
         (*dest)->data = src->data;
-}
-
-/** Copy symbol.
- *
- * @param src           Source symbol.
- * @param dest          Place to store pointer to new symbol.
- */
-static void rdata_symbol_copy(rdata_symbol_t *src, rdata_symbol_t **dest)
-{
-        *dest = rdata_symbol_new();
-        (*dest)->sym = src->sym;
 }
 
@@ -686 +621 @@
         case vc_ref: var->u.ref_v = nvar->u.ref_v; break;
         case vc_deleg: var->u.deleg_v = nvar->u.deleg_v; break;
-        case vc_enum: var->u.enum_v = nvar->u.enum_v; break;
         case vc_array: var->u.array_v = nvar->u.array_v; break;
         case vc_object: var->u.object_v = nvar->u.object_v; break;
         case vc_resource: var->u.resource_v = nvar->u.resource_v; break;
-        case vc_symbol: var->u.symbol_v = nvar->u.symbol_v; break;
         }
 
@@ -799 +732 @@
                 printf(")");
                 break;
-        case vc_enum:
-                symbol_print_fqn(
-                    enum_to_symbol(var->u.enum_v->value->outer_enum));
-                printf(".%s",
-                    strtab_get_str(var->u.enum_v->value->name->sid));
-                break;
         case vc_array:
                 printf("array");
@@ -814 +741 @@
                 printf("resource(%p)", var->u.resource_v->data);
                 break;
-        case vc_symbol:
-                printf("symbol(");
-                if (var->u.symbol_v->sym != NULL) {
-                        symbol_print_fqn(var->u.symbol_v->sym);
-                } else {
-                        printf("nil");
-                }
-                printf(")");
-                break;
-        }
-}
+        }
+}