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

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/stype.c (modified) (8 diffs)

uspace/app/sbi/src/stype.c

@@ -64 +64 @@
 static void stype_wef(stype_t *stype, stree_wef_t *wef_s);
 
-static tdata_item_t *stype_boolean_titem(stype_t *stype);
-
 /** Type module */
 void stype_module(stype_t *stype, stree_module_t *module)
@@ -189 +187 @@
 static void stype_var(stype_t *stype, stree_var_t *var)
 {
+        tdata_item_t *titem;
+
         (void) stype;
         (void) var;
+
+        run_texpr(stype->program, stype->current_csi, var->type,
+            &titem);
+        if (titem->tic == tic_ignore) {
+                /* An error occured. */
+                stype_note_error(stype);
+                return;
+        }
 }
 
@@ -283 +291 @@
         stype_block_vr_t *block_vr;
         stree_vdecl_t *old_vdecl;
+        tdata_item_t *titem;
 
 #ifdef DEBUG_TYPE_TRACE
@@ -297 +306 @@
         }
 
+        run_texpr(stype->program, stype->current_csi, vdecl_s->type,
+            &titem);
+        if (titem->tic == tic_ignore) {
+                /* An error occured. */
+                stype_note_error(stype);
+                return;
+        }
+
         intmap_set(&block_vr->vdecls, vdecl_s->name->sid, vdecl_s);
-
 }
 
@@ -524 +540 @@
                         goto failure;
                 break;
-        default:
+        case tic_tfun:
                 printf("Error: Unimplemented: Converting '");
                 tdata_item_print(src);
@@ -531 +547 @@
                 printf("'.\n");
                 stype_note_error(stype);
+                break;
+        case tic_ignore:
+                assert(b_false);
         }
 
@@ -547 +566 @@
 
 /** Return a boolean type item */
-static tdata_item_t *stype_boolean_titem(stype_t *stype)
+tdata_item_t *stype_boolean_titem(stype_t *stype)
 {
         tdata_item_t *titem;
@@ -554 +573 @@
         (void) stype;
 
-        /* XXX Use a true boolean type */
         titem = tdata_item_new(tic_tprimitive);
-        tprimitive = tdata_primitive_new(tpc_int);
+        tprimitive = tdata_primitive_new(tpc_bool);
         titem->u.tprimitive = tprimitive;