Changeset 1ebc1a62 in mainline for uspace/app/sbi/src/run_expr.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/run_expr.c (modified) (4 diffs)

uspace/app/sbi/src/run_expr.c

@@ -210 +210 @@
         sym = symbol_lookup_in_csi(run->program, csi, nameref->name);
 
+        /* Existence should have been verified in type checking phase. */
+        assert(sym != NULL);
+
         switch (sym->sc) {
         case sc_csi:
@@ -857 +860 @@
         run_dereference(run, arg, &darg);
 
+        if (run->thread_ar->bo_mode != bm_none) {
+                *res = run_recovery_item(run);
+                return;
+        }
+
         /* Try again. */
         run_access_item(run, access, darg, res);
@@ -1021 +1029 @@
         run_expr(run, call->fun, &rfun);
 
+        if (run->thread_ar->bo_mode != bm_none) {
+                *res = run_recovery_item(run);
+                return;
+        }
+
         if (rfun->ic != ic_value || rfun->u.value->var->vc != vc_deleg) {
                 printf("Unimplemented: Call expression of this type.\n");
-                *res = NULL;
-                return;
+                exit(1);
         }
 
@@ -1182 +1194 @@
                         printf("Error: Array index (value: %d) is out of range.\n",
                             arg_val);
-                        exit(1);
+                        run_raise_error(run);
+                        *res = run_recovery_item(run);
+                        return;
                 }