Changeset 94d484a in mainline for uspace/app/sbi/src/stree_t.h

Timestamp:

2010-03-07T17:45:33Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d0febca

Parents:

fa36f29

Message:

Update SBI to rev. 90.

File:

• uspace/app/sbi/src/stree_t.h (modified) (13 diffs)

uspace/app/sbi/src/stree_t.h

@@ -151 +151 @@
 } stree_assign_t;
 
+/** Indexing operation */
+typedef struct {
+        /** Base */
+        struct stree_expr *base;
+
+        /** Arguments (indices) */
+        list_t args; /* of stree_expr_t */
+} stree_index_t;
+
 /** Arithmetic expression class */
 typedef enum {
@@ -161 +170 @@
         ec_access,
         ec_call,
-        ec_assign
+        ec_assign,
+        ec_index
 } expr_class_t;
 
@@ -177 +187 @@
                 stree_access_t *access;
                 stree_call_t *call;
+                stree_index_t *index;
                 stree_assign_t *assign;
         } u;
@@ -217 +228 @@
 } stree_tapply_t;
 
+/** Type index operation */
+typedef struct {
+        /** Base type */
+        struct stree_texpr *base_type;
+
+        /**
+         * Number of arguments (rank). Needed when only rank is specified
+         * and @c args are not used.
+         */
+        int n_args;
+
+        /** Arguments (extents) */
+        list_t args; /* of stree_expr_t */
+} stree_tindex_t;
+
 /** Type expression class */
 typedef enum {
@@ -222 +248 @@
         tc_tnameref,
         tc_taccess,
-        tc_tapply
+        tc_tapply,
+        tc_tindex
 } texpr_class_t;
 
@@ -234 +261 @@
                 stree_taccess_t *taccess;
                 stree_tapply_t *tapply;
+                stree_tindex_t *tindex;
         } u;
 } stree_texpr_t;
@@ -252 +280 @@
         stree_texpr_t *type;
 } stree_vdecl_t;
+
+/** @c except clause */
+typedef struct {
+        stree_ident_t *evar;
+        stree_texpr_t *etype;
+        stree_block_t *block;
+} stree_except_t;
 
 /** If statement */
@@ -273 +308 @@
 /** Raise statement */
 typedef struct {
+        stree_expr_t *expr;
 } stree_raise_t;
 
@@ -288 +324 @@
 typedef struct {
         stree_block_t *with_block;
-        list_t except_blocks; /* of stree_block_t */
+        list_t except_clauses; /* of stree_except_t */
         stree_block_t *finally_block;
 } stree_wef_t;
+
 
 /** Statement class */
@@ -320 +357 @@
 } stree_stat_t;
 
+/** Argument attribute class */
+typedef enum {
+        /** Packed argument (for variadic functions) */
+        aac_packed
+} arg_attr_class_t;
+
+/** Argument atribute */
+typedef struct {
+        arg_attr_class_t aac;
+} stree_arg_attr_t;
+
 /** Formal function parameter */
 typedef struct {
@@ -327 +375 @@
         /* Argument type */
         stree_texpr_t *type;
+
+        /* Attributes */
+        list_t attr; /* of stree_arg_attr_t */
 } stree_fun_arg_t;
 
@@ -339 +390 @@
         /** Formal parameters */
         list_t args; /* of stree_fun_arg_t */
+
+        /** Variadic argument or @c NULL if none. */
+        stree_fun_arg_t *varg;
 
         /** Return type */
@@ -400 +454 @@
         stree_texpr_t *base_csi_ref;
 
+        /** Base CSI. Only available when ancr_state == ws_visited. */
+        struct stree_csi *base_csi;
+
         /** Node state for ancr walks. */
         walk_state_t ancr_state;