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

uspace/app/sbi/src/stype_expr.c

@@ -182 +182 @@
             nameref->name);
 
+        if (sym == NULL) {
+                /* Not found. */
+                if (stype->current_csi != NULL) {
+                        printf("Error: Symbol '%s' not found in '",
+                            strtab_get_str(nameref->name->sid));
+                        symbol_print_fqn(csi_to_symbol(stype->current_csi));
+                        printf("'.\n");
+                } else {
+                        printf("Error: Symbol '%s' not found.\n",
+                            strtab_get_str(nameref->name->sid));
+                }
+                stype_note_error(stype);
+                *rtitem = stype_recovery_titem(stype);
+                return;
+        }
+
         switch (sym->sc) {
         case sc_var:
@@ -273 +289 @@
 
         if (binop->arg1->titem == NULL) {
-                /* XXX Make this an error when ready. */
                 printf("Error First binary operand has no value.\n");
-                exit(1);
+                stype_note_error(stype);
+                if (binop->arg2->titem != NULL)
+                        *rtitem = binop->arg2->titem;
+                else
+                        *rtitem = stype_recovery_titem(stype);
+                return;
         }
 
         if (binop->arg2->titem == NULL) {
-                /* XXX Make this an error when ready. */
                 printf("Error: Second binary operand has no value.\n");
-                exit(1);
+                stype_note_error(stype);
+                *rtitem = binop->arg1->titem;
+                return;
         }
 
@@ -292 +313 @@
                 tdata_item_print(binop->arg2->titem);
                 printf("').\n");
-                exit(1);
+                stype_note_error(stype);
+                *rtitem = binop->arg1->titem;
+                return;
         }
 
@@ -311 +334 @@
                 tdata_item_print(titem);
                 printf("').\n");
-                exit(1);
+                stype_note_error(stype);
+                *rtitem = titem;
+                break;
         }
 
@@ -334 +359 @@
         case tpc_nil:
                 printf("Unimplemented; Binary operation on nil.\n");
-                exit(1);
+                stype_note_error(stype);
+                rtpc = tpc_nil;
+                break;
         case tpc_string:
                 if (binop->bc != bo_plus) {
                         printf("Unimplemented: Binary operation(%d) "
                             "on strings.\n", binop->bc);
-                        exit(1);
+                        stype_note_error(stype);
                 }
                 rtpc = tpc_string;
@@ -345 +372 @@
         case tpc_resource:
                 printf("Error: Cannot apply operator to resource type.\n");
-                exit(1);
+                stype_note_error(stype);
+                rtpc = tpc_resource;
         }
 
@@ -425 +453 @@
         if (arg_ti == NULL) {
                 printf("Error: Argument of access has no value.\n");
-                exit(1);
+                stype_note_error(stype);
+                *rtitem = stype_recovery_titem(stype);
+                return;
         }
 
@@ -443 +473 @@
         case tic_tfun:
                 printf("Error: Using '.' operator on a function.\n");
-                exit(1);
+                stype_note_error(stype);
+                *rtitem = stype_recovery_titem(stype);
                 break;
         }
@@ -459 +490 @@
         tdata_item_print(arg_ti);
         printf("'.\n");
-        exit(1);
+        stype_note_error(stype);
+        *rtitem = stype_recovery_titem(stype);
 }
 
@@ -488 +520 @@
                 printf("' has no member named '%s'.\n",
                     strtab_get_str(access->member_name->sid));
-                exit(1);
+                *rtitem = stype_recovery_titem(stype);
+                return;
         }
 
@@ -500 +533 @@
                 printf("Error: Accessing object member which is nested "
                     "CSI.\n");
-                exit(1);
+                stype_note_error(stype);
+                *rtitem = stype_recovery_titem(stype);
+                break;
         case sc_fun:
                 fun = symbol_to_fun(member_sym);
@@ -536 +571 @@
         tdata_item_print(arg_ti);
         printf("'.\n");
-        exit(1);
+        stype_note_error(stype);
+        *rtitem = stype_recovery_titem(stype);
 }
 
@@ -550 +586 @@
         tdata_item_print(arg_ti);
         printf("'.\n");
-        exit(1);
+        stype_note_error(stype);
+        *rtitem = stype_recovery_titem(stype);
 }
 
@@ -639 +676 @@
                 symbol_print_fqn(fun_to_symbol(fun));
                 printf("'.\n");
-                exit(1);
+                stype_note_error(stype);
         }
 
@@ -646 +683 @@
                 symbol_print_fqn(fun_to_symbol(fun));
                 printf("'.\n");
-                exit(1);
+                stype_note_error(stype);
         }
 
@@ -696 +733 @@
         case tic_tfun:
                 printf("Error: Indexing a function.\n");
-                exit(1);
+                stype_note_error(stype);
+                *rtitem = stype_recovery_titem(stype);
                 break;
         }
@@ -724 +762 @@
         tdata_item_print(base_ti);
         printf("'.\n");
-        exit(1);
+        stype_note_error(stype);
+        *rtitem = stype_recovery_titem(stype);
 }
 
@@ -756 +795 @@
                 tdata_item_print(base_ti);
                 printf("' which does not have an indexer.\n");
-                exit(1);
+                stype_note_error(stype);
+                *rtitem = stype_recovery_titem(stype);
+                return;
         }
 
@@ -791 +832 @@
 
                         printf("Error: Array index is not an integer.\n");
-                        exit(1);
+                        stype_note_error(stype);
                 }
 
@@ -800 +841 @@
                 printf("Error: Using %d indices with array of rank %d.\n",
                     arg_count, base_ti->u.tarray->rank);
-                exit(1);
+                stype_note_error(stype);
         }
 
@@ -817 +858 @@
         tdata_item_print(base_ti);
         printf("'.\n");
-        exit(1);
+        stype_note_error(stype);
+        *rtitem = stype_recovery_titem(stype);
 }
 
@@ -857 +899 @@
                 tdata_item_print(as_op->arg->titem);
                 printf("'.\n");
-                exit(1);
+                stype_note_error(stype);
         }