Changeset 1ebc1a62 in mainline for uspace/app/sbi/src/stype.c

Timestamp:

2010-03-29T20:30:29Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

a95310e

Parents:

5da468e

Message:

Update SBI to rev. 157.

File:

• uspace/app/sbi/src/stype.c (modified) (13 diffs)

uspace/app/sbi/src/stype.c

@@ -61 +61 @@
 static void stype_raise(stype_t *stype, stree_raise_t *raise_s);
 static void stype_return(stype_t *stype, stree_return_t *return_s);
-static void stype_exps(stype_t *stype, stree_exps_t *exp_s);
+static void stype_exps(stype_t *stype, stree_exps_t *exp_s, bool_t want_value);
 static void stype_wef(stype_t *stype, stree_wef_t *wef_s);
 
@@ -164 +164 @@
                 if (titem->tic != tic_tarray) {
                         printf("Error: Packed argument is not an array.\n");
-                        exit(1);
+                        stype_note_error(stype);
                 }
         }
@@ -240 +240 @@
         while (stat_n != NULL) {
                 stat = list_node_data(stat_n, stree_stat_t *);
-                stype_stat(stype, stat);
+                stype_stat(stype, stat, b_false);
 
                 stat_n = list_next(&block->stats, stat_n);
@@ -251 +251 @@
 }
 
-/** Type statement */
-void stype_stat(stype_t *stype, stree_stat_t *stat)
+/** Type statement
+ *
+ * Types a statement. If @a want_value is @c b_true, then warning about
+ * ignored expression value will be supressed for this statement (but not
+ * for nested statemens). This is used in interactive mode.
+ *
+ * @param stype         Static typer object.
+ * @param stat          Statement to type.
+ * @param want_value    @c b_true to allow ignoring expression value.
+ */
+void stype_stat(stype_t *stype, stree_stat_t *stat, bool_t want_value)
 {
 #ifdef DEBUG_TYPE_TRACE
@@ -264 +273 @@
         case st_raise: stype_raise(stype, stat->u.raise_s); break;
         case st_return: stype_return(stype, stat->u.return_s); break;
-        case st_exps: stype_exps(stype, stat->u.exp_s); break;
+        case st_exps: stype_exps(stype, stat->u.exp_s, want_value); break;
         case st_wef: stype_wef(stype, stat->u.wef_s); break;
         }
@@ -285 +294 @@
                 printf("Error: Duplicate variable declaration '%s'.\n",
                     strtab_get_str(vdecl_s->name->sid));
-                exit(1);
+                stype_note_error(stype);
         }
 
@@ -387 +396 @@
                         printf("Error: Return statement in "
                             "setter.\n");
-                        exit(1);
+                        stype_note_error(stype);
                 }
 
@@ -406 +415 @@
 
 /** Type expression statement */
-static void stype_exps(stype_t *stype, stree_exps_t *exp_s)
+static void stype_exps(stype_t *stype, stree_exps_t *exp_s, bool_t want_value)
 {
 #ifdef DEBUG_TYPE_TRACE
@@ -413 +422 @@
         stype_expr(stype, exp_s->expr);
 
-        if (exp_s->expr->titem != NULL)
+        if (want_value == b_false && exp_s->expr->titem != NULL)
                 printf("Warning: Expression value ignored.\n");
 }
@@ -468 +477 @@
         if (dest == NULL) {
                 printf("Error: Conversion destination is not valid.\n");
-                exit(1);
+                stype_note_error(stype);
+                return expr;
         }
 
         if (src == NULL) {
                 printf("Error: Conversion source is not valid.\n");
-                exit(1);
+                stype_note_error(stype);
+                return expr;
         }
 
@@ -519 +530 @@
                 tdata_item_print(dest);
                 printf("'.\n");
-                exit(1);
+                stype_note_error(stype);
         }
 
@@ -531 +542 @@
         printf(".\n");
 
-        /* XXX We should rather return a bogus expression of type @a dest */
-        exit(1);
+        stype_note_error(stype);
+        return expr;
 }
 
@@ -659 +670 @@
 }
 
+/** Note a static typing error that has been immediately recovered. */
+void stype_note_error(stype_t *stype)
+{
+        stype->error = b_true;
+}
+
+/** Construct a special type item for recovery. */
+tdata_item_t *stype_recovery_titem(stype_t *stype)
+{
+        tdata_item_t *titem;
+        tdata_primitive_t *tprimitive;
+
+        (void) stype;
+
+        titem = tdata_item_new(tic_tprimitive);
+        tprimitive = tdata_primitive_new(tpc_int);
+
+        titem->u.tprimitive = tprimitive;
+
+        return titem;
+}
+
 /** Get current block visit record. */
 stype_block_vr_t *stype_get_current_block_vr(stype_t *stype)