Changeset c5cb943d in mainline for uspace/app/sbi/src/stype_expr.c

Timestamp:

2010-06-09T19:01:08Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

1113c9e

Parents:

051bc69a

Message:

Update SBI to rev. 291.

File:

• uspace/app/sbi/src/stype_expr.c (modified) (21 diffs)

uspace/app/sbi/src/stype_expr.c

@@ -97 +97 @@
 static void stype_new(stype_t *stype, stree_new_t *new,
     tdata_item_t **rtitem);
-static void stype_new_object_args(stype_t *stype, stree_new_t *new_op,
+static void stype_new_object(stype_t *stype, stree_new_t *new_op,
     tdata_item_t *obj_ti);
 
@@ -194 +194 @@
         tdata_ebase_t *tebase;
         stree_fun_t *fun;
+        bool_t static_ctx;
 
 #ifdef DEBUG_TYPE_TRACE
@@ -257 +258 @@
         }
 
+        /* Determine if current procedure is static. */
+        static_ctx = stree_symbol_is_static(stype->proc_vr->proc->outer_symbol);
+
+        /*
+         * If the symbol is not found in current CSI, then we access it
+         * in a static context. (Context of current object cannot be used.)
+         */
+        if (sym->outer_csi != stype->current_csi)
+                static_ctx = b_true;
+
+        /* Check for referencing non-static symbol in static context. */
+        if (static_ctx && !stree_symbol_is_static(sym)) {
+                cspan_print(nameref->expr->cspan);
+                printf(" Error: Referencing non-static symbol '");
+                symbol_print_fqn(sym);
+                printf("' in static context.\n");
+                stype_note_error(stype);
+                *rtitem = stype_recovery_titem(stype);
+                return;
+        }
+
+        /* Referencing static member in non-static context is allowed. */
+
+        /* Make compiler happy. */
+        titem = NULL;
+
         switch (sym->sc) {
         case sc_var:
@@ -263 +290 @@
                 break;
         case sc_prop:
-                run_texpr(stype->program, stype->current_csi,
-                    sym->u.prop->type, &titem);
+                /* Type property header if it has not been typed yet. */
+                stype_prop_header(stype, sym->u.prop);
+                titem = sym->u.prop->titem;
                 break;
         case sc_csi:
@@ -274 +302 @@
                 titem->u.tobject = tobject;
 
-                /* This is a static CSI reference. */
-                tobject->static_ref = b_true;
+                tobject->static_ref = sn_static;
                 tobject->csi = csi;
                 break;
@@ -330 +357 @@
         (void) stype;
 
+        /* Make compiler happy. */
+        tpc = 0;
+
         switch (literal->ltc) {
         case ltc_bool: tpc = tpc_bool; break;
@@ -375 +405 @@
         titem->u.tobject = tobject;
 
-        tobject->static_ref = b_false;
+        tobject->static_ref = sn_nonstatic;
         tobject->csi = cur_csi;
         list_init(&tobject->targs);
@@ -513 +543 @@
         tdata_item_t *res_ti;
 
+        /* Make compiler happy. */
+        rtpc = 0;
+
         switch (binop->bc) {
         case bo_equal:
@@ -560 +593 @@
         (void) stype;
 
+        /* Make compiler happy. */
+        rtpc = 0;
+
         switch (binop->bc) {
         case bo_equal:
@@ -604 +640 @@
         (void) stype;
 
+        /* Make compiler happy. */
+        rtpc = 0;
+
         switch (binop->bc) {
         case bo_equal:
@@ -666 +705 @@
         tdata_item_t *res_ti;
 
+        /* Make compiler happy. */
+        rtpc = 0;
+
         switch (binop->bc) {
         case bo_equal:
@@ -941 +983 @@
 
         if ((*rtitem)->tic == tic_tobject)
-                stype_new_object_args(stype, new_op, *rtitem);
+                stype_new_object(stype, new_op, *rtitem);
 }
 
@@ -949 +991 @@
  * @param new_op        @c new operation
  */
-static void stype_new_object_args(stype_t *stype, stree_new_t *new_op,
+static void stype_new_object(stype_t *stype, stree_new_t *new_op,
     tdata_item_t *obj_ti)
 {
@@ -957 +999 @@
         stree_ident_t *ctor_ident;
         tdata_fun_sig_t *tsig;
+        tdata_tvv_t *obj_tvv;
+        tdata_item_t *ctor_sti;
 
         assert(obj_ti->tic == tic_tobject);
         csi = obj_ti->u.tobject->csi;
+
+        if (csi->cc == csi_interface) {
+                cspan_print(new_op->expr->cspan);
+                printf(" Error: Cannot instantiate an interface.\n");
+                stype_note_error(stype);
+                return;
+        }
+
         ctor_ident = stree_ident_new();
         ctor_ident->sid = strtab_get_sid(CTOR_IDENT);
@@ -986 +1038 @@
                 return;
 
-        assert(ctor->titem->tic == tic_tfun);
-        tsig = ctor->titem->u.tfun->tsig;
+        /* Substitute type arguments in constructor type. */
+        stype_titem_to_tvv(stype, obj_ti, &obj_tvv);
+        tdata_item_subst(ctor->titem, obj_tvv, &ctor_sti);
+        /* XXX Free obj_tvv */
+
+        assert(ctor_sti->tic == tic_tfun);
+        tsig = ctor_sti->u.tfun->tsig;
 
         stype_call_args(stype, new_op->expr->cspan, &tsig->arg_ti,
@@ -1104 +1161 @@
         tdata_item_t *mtitem;
         tdata_tvv_t *tvv;
+        stree_csi_t *member_csi;
 
 #ifdef DEBUG_TYPE_TRACE
@@ -1131 +1189 @@
             strtab_get_str(access->member_name->sid));
 #endif
+        /* Check for accessing non-static member in static context. */
+        if (tobject->static_ref == sn_static &&
+            !stree_symbol_is_static(member_sym)) {
+                cspan_print(access->member_name->cspan);
+                printf(" Error: Accessing non-static member '");
+                symbol_print_fqn(member_sym);
+                printf("' in static context.\n");
+                stype_note_error(stype);
+                *rtitem = stype_recovery_titem(stype);
+                return;
+        }
+
+        /* Check for accessing static member in non-static context. */
+        if (tobject->static_ref != sn_static &&
+            stree_symbol_is_static(member_sym)) {
+                cspan_print(access->member_name->cspan);
+                printf(" Error: Accessing static member '");
+                symbol_print_fqn(member_sym);
+                printf("' in non-static context.\n");
+                stype_note_error(stype);
+                *rtitem = stype_recovery_titem(stype);
+                return;
+        }
+
+        /* Make compiler happy. */
+        mtitem = NULL;
 
         switch (member_sym->sc) {
         case sc_csi:
-                cspan_print(access->member_name->cspan);
-                printf(" Error: Accessing object member which is nested "
-                    "CSI.\n");
-                stype_note_error(stype);
-                *rtitem = stype_recovery_titem(stype);
-                return;
+                member_csi = symbol_to_csi(member_sym);
+                assert(member_csi != NULL);
+
+                mtitem = tdata_item_new(tic_tobject);
+                tobject = tdata_object_new();
+                mtitem->u.tobject = tobject;
+
+                tobject->static_ref = sn_static;
+                tobject->csi = member_csi;
+                break;
         case sc_ctor:
                 /* It is not possible to reference a constructor explicitly. */
@@ -1337 +1425 @@
         stree_expr_t *carg;
 
-        int cnt;
-
         /* Type and check regular arguments. */
         fargt_n = list_first(farg_tis);
         arg_n = list_first(args);
 
-        cnt = 0;
         while (fargt_n != NULL && arg_n != NULL) {
                 farg_ti = list_node_data(fargt_n, tdata_item_t *);
@@ -1656 +1741 @@
 {
         tdata_item_t *titem;
+        tdata_item_t *pred_ti;
 
 #ifdef DEBUG_TYPE_TRACE
@@ -1664 +1750 @@
         run_texpr(stype->program, stype->current_csi, as_op->dtype, &titem);
 
-        /* Check that target type is derived from argument type. */
-        if (tdata_is_ti_derived_from_ti(titem, as_op->arg->titem) != b_true) {
-                cspan_print(as_op->dtype->cspan);
-                printf(" Error: Target of 'as' operator '");
-                tdata_item_print(titem);
-                printf("' is not derived from '");
-                tdata_item_print(as_op->arg->titem);
-                printf("'.\n");
-                stype_note_error(stype);
+        pred_ti = stype_tobject_find_pred(stype, titem, as_op->arg->titem);
+        if (pred_ti == NULL) {
+                /* No CSI match. */
+                stype_convert_failure(stype, convc_as, as_op->arg, titem);
+                *rtitem = titem;
+                return;
+        }
+
+        /*
+         * Verify that type arguments match with those specified for
+         * conversion destination.
+         */
+        if (stype_targs_check_equal(stype, pred_ti, as_op->arg->titem)
+            != EOK) {
+                stype_convert_failure(stype, convc_as, as_op->arg, titem);
+                *rtitem = titem;
+                return;
         }
 
@@ -1720 +1814 @@
 
         btitem->u.tobject = tobject;
-        tobject->static_ref = b_false;
+        tobject->static_ref = sn_nonstatic;
         tobject->csi = symbol_to_csi(csi_sym);
         assert(tobject->csi != NULL);