Changeset 1ef0fc3 in mainline for uspace/app/sbi/src/tdata_t.h

Timestamp:

2010-04-10T11:19:18Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d7e45c8

Parents:

2721a75 (diff), 074444f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from lp:~jsvoboda/helenos/sysel.

File:

• uspace/app/sbi/src/tdata_t.h (modified) (5 diffs)

uspace/app/sbi/src/tdata_t.h

@@ -34 +34 @@
 /** Class of primitive type. */
 typedef enum {
+        /** Boolean type */
+        tpc_bool,
+        /** Character type */
+        tpc_char,
         /** Integer type */
         tpc_int,
@@ -57 +61 @@
         /** CSI definition */
         struct stree_csi *csi;
+
+        /** (Real) type arguments */
+        list_t targs; /* of tdata_item_t */
 } tdata_object_t;
 
@@ -70 +77 @@
         list_t extents; /* of stree_expr_t */
 } tdata_array_t;
-
-/** Generic type. */
-typedef struct {
-} tdata_generic_t;
 
 /** Functional type. */
@@ -90 +93 @@
         /** Array type item */
         tic_tarray,
-        /** Generic type item */
-        tic_tgeneric,
         /** Function type item */
         tic_tfun,
@@ -106 +107 @@
                 tdata_object_t *tobject;
                 tdata_array_t *tarray;
-                tdata_generic_t *tgeneric;
                 tdata_fun_t *tfun;
         } u;