Changeset 051bc69a in mainline for uspace/app/sbi/src/tdata.c

Timestamp:

2010-05-08T08:10:44Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

640ffe6, c5cb943d

Parents:

25a76ab8

Message:

Update SBI to rev. 244.

File:

• uspace/app/sbi/src/tdata.c (modified) (9 diffs)

uspace/app/sbi/src/tdata.c

@@ -48 +48 @@
 static void tdata_item_subst_tdeleg(tdata_deleg_t *torig,
     tdata_tvv_t *tvv, tdata_item_t **res);
+static void tdata_item_subst_tebase(tdata_ebase_t *tebase,
+    tdata_tvv_t *tvv, tdata_item_t **res);
+static void tdata_item_subst_tenum(tdata_enum_t *tenum,
+    tdata_tvv_t *tvv, tdata_item_t **res);
 static void tdata_item_subst_tfun(tdata_fun_t *torig,
     tdata_tvv_t *tvv, tdata_item_t **res);
@@ -60 +64 @@
 static void tdata_tarray_print(tdata_array_t *tarray);
 static void tdata_tdeleg_print(tdata_deleg_t *tdeleg);
+static void tdata_tebase_print(tdata_ebase_t *tebase);
+static void tdata_tenum_print(tdata_enum_t *tenum);
 static void tdata_tfun_print(tdata_fun_t *tfun);
 static void tdata_tvref_print(tdata_vref_t *tvref);
@@ -157 +163 @@
                 return tdata_item_equal(a->u.tarray->base_ti,
                     b->u.tarray->base_ti);
+        case tic_tenum:
+                /* Check if both use the same enum definition. */
+                return (a->u.tenum->enum_d == b->u.tenum->enum_d);
         case tic_tvref:
                 /* Check if both refer to the same type argument. */
@@ -196 +205 @@
                 tdata_item_subst_tdeleg(ti->u.tdeleg, tvv, res);
                 break;
+        case tic_tebase:
+                tdata_item_subst_tebase(ti->u.tebase, tvv, res);
+                break;
+        case tic_tenum:
+                tdata_item_subst_tenum(ti->u.tenum, tvv, res);
+                break;
         case tic_tfun:
                 tdata_item_subst_tfun(ti->u.tfun, tvv, res);
@@ -313 +328 @@
 }
 
+/** Substitute type variables in a enum-base type item.
+ *
+ * @param torig Type item to substitute into.
+ * @param tvv   Type variable valuation (values of type variables).
+ * @param res   Place to store pointer to new type item.
+ */
+static void tdata_item_subst_tebase(tdata_ebase_t *tebase,
+    tdata_tvv_t *tvv, tdata_item_t **res)
+{
+        tdata_ebase_t *tnew;
+
+        (void) tvv;
+
+        /* Plain copy */
+        tnew = tdata_ebase_new();
+        *res = tdata_item_new(tic_tebase);
+        (*res)->u.tebase = tebase;
+}
+
+/** Substitute type variables in a enum type item.
+ *
+ * @param torig Type item to substitute into.
+ * @param tvv   Type variable valuation (values of type variables).
+ * @param res   Place to store pointer to new type item.
+ */
+static void tdata_item_subst_tenum(tdata_enum_t *tenum,
+    tdata_tvv_t *tvv, tdata_item_t **res)
+{
+        tdata_enum_t *tnew;
+
+        (void) tvv;
+
+        /* Plain copy */
+        tnew = tdata_enum_new();
+        *res = tdata_item_new(tic_tenum);
+        (*res)->u.tenum = tenum;
+}
+
 /** Substitute type variables in a functional type item.
  *
@@ -417 +470 @@
         case tic_tdeleg:
                 tdata_tdeleg_print(titem->u.tdeleg);
+                break;
+        case tic_tebase:
+                tdata_tebase_print(titem->u.tebase);
+                break;
+        case tic_tenum:
+                tdata_tenum_print(titem->u.tenum);
                 break;
         case tic_tfun:
@@ -497 +556 @@
 }
 
+/** Print enum-base type item.
+ *
+ * @param tebase                Enum-base type item
+ */
+static void tdata_tebase_print(tdata_ebase_t *tebase)
+{
+        stree_symbol_t *enum_sym;
+
+        enum_sym = enum_to_symbol(tebase->enum_d);
+
+        printf("typeref(");
+        symbol_print_fqn(enum_sym);
+        printf(")");
+}
+
+/** Print enum type item.
+ *
+ * @param tenum         Enum type item
+ */
+static void tdata_tenum_print(tdata_enum_t *tenum)
+{
+        stree_symbol_t *enum_sym;
+
+        enum_sym = enum_to_symbol(tenum->enum_d);
+        symbol_print_fqn(enum_sym);
+}
+
 /** Print function type item.
  *
@@ -624 +710 @@
 }
 
+/** Allocate new enum-base type item.
+ *
+ * @return      New enum type item
+ */
+tdata_ebase_t *tdata_ebase_new(void)
+{
+        tdata_ebase_t *tebase;
+
+        tebase = calloc(1, sizeof(tdata_ebase_t));
+        if (tebase == NULL) {
+                printf("Memory allocation failed.\n");
+                exit(1);
+        }
+
+        return tebase;
+}
+
+/** Allocate new enum type item.
+ *
+ * @return      New enum type item
+ */
+tdata_enum_t *tdata_enum_new(void)
+{
+        tdata_enum_t *tenum;
+
+        tenum = calloc(1, sizeof(tdata_enum_t));
+        if (tenum == NULL) {
+                printf("Memory allocation failed.\n");
+                exit(1);
+        }
+
+        return tenum;
+}
+
 /** Allocate new functional type item.
  *
@@ -707 +827 @@
 }
 
-/** Set tyoe variable value.
+/** Set type variable value.
  *
  * Sets the value of variable with name SID @a name in type variable