Changeset 3bacee1 in mainline for uspace/app/sbi

Timestamp:

2018-04-12T16:27:17Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

3cf22f9

Parents:

76d0981d

git-author:

Jiri Svoboda <jiri@…> (2018-04-11 19:25:33)

git-committer:

Jiri Svoboda <jiri@…> (2018-04-12 16:27:17)

Message:

Make ccheck-fix again and commit more good files.

Location:

uspace/app/sbi/src

Files:

• run_expr.c (modified) (7 diffs)
• stype_expr.c (modified) (3 diffs)

uspace/app/sbi/src/run_expr.c

@@ -311 +311 @@
                 assert(csi != NULL);
 
-                if (symbol_search_csi(run->program, csi, nameref->name)
-                    == NULL) {
+                if (symbol_search_csi(run->program, csi, nameref->name) ==
+                    NULL) {
                         /* Function is not in the current object. */
                         printf("Error: Cannot access non-static member "
@@ -349 +349 @@
                 assert(csi != NULL);
 
-                if (symbol_search_csi(run->program, csi, nameref->name)
-                    == NULL && !stree_symbol_is_static(sym)) {
+                if (symbol_search_csi(run->program, csi, nameref->name) ==
+                    NULL && !stree_symbol_is_static(sym)) {
                         /* Symbol is not in the current object. */
                         printf("Error: Cannot access non-static member "
@@ -1271 +1271 @@
         switch (unop->uc) {
         case uo_plus:
-                bigint_clone(&val->var->u.int_v->value, &int_v->value);
+                bigint_clone(&val->var->u.int_v->value, &int_v->value);
                 break;
         case uo_minus:
@@ -1318 +1318 @@
                 c2 = &v2->var->u.char_v->value;
 
-                bigint_sub(c1, c2, &diff);
+                bigint_sub(c1, c2, &diff);
                 *res = bigint_is_zero(&diff);
                 break;
@@ -1438 +1438 @@
         }
 
-        i = 0; length = 1;
+        i = 0;
+        length = 1;
         while (node != NULL) {
                 expr = list_node_data(node, stree_expr_t *);
@@ -1567 +1568 @@
                 *res = run_recovery_item(run);
                 goto cleanup;
-        }
+        }
 
         if (rarg == NULL) {
@@ -2755 +2756 @@
 
         switch (rarg_vi->u.value->var->vc) {
-        case vc_bool: csi_sym = bi->boxed_bool; break;
-        case vc_char: csi_sym = bi->boxed_char; break;
-        case vc_int: csi_sym = bi->boxed_int; break;
-        case vc_string: csi_sym = bi->boxed_string; break;
+        case vc_bool:
+                csi_sym = bi->boxed_bool;
+                break;
+        case vc_char:
+                csi_sym = bi->boxed_char;
+                break;
+        case vc_int:
+                csi_sym = bi->boxed_int;
+                break;
+        case vc_string:
+                csi_sym = bi->boxed_string;
+                break;
 
         case vc_ref:

uspace/app/sbi/src/stype_expr.c

@@ -151 +151 @@
 
         switch (expr->ec) {
-        case ec_nameref: stype_nameref(stype, expr->u.nameref, &et); break;
-        case ec_literal: stype_literal(stype, expr->u.literal, &et); break;
-        case ec_self_ref: stype_self_ref(stype, expr->u.self_ref, &et); break;
-        case ec_binop: stype_binop(stype, expr->u.binop, &et); break;
-        case ec_unop: stype_unop(stype, expr->u.unop, &et); break;
-        case ec_new: stype_new(stype, expr->u.new_op, &et); break;
-        case ec_access: stype_access(stype, expr->u.access, &et); break;
-        case ec_call: stype_call(stype, expr->u.call, &et); break;
-        case ec_index: stype_index(stype, expr->u.index, &et); break;
-        case ec_assign: stype_assign(stype, expr->u.assign, &et); break;
-        case ec_as: stype_as(stype, expr->u.as_op, &et); break;
-        case ec_box: stype_box(stype, expr->u.box, &et); break;
+        case ec_nameref:
+                stype_nameref(stype, expr->u.nameref, &et);
+                break;
+        case ec_literal:
+                stype_literal(stype, expr->u.literal, &et);
+                break;
+        case ec_self_ref:
+                stype_self_ref(stype, expr->u.self_ref, &et);
+                break;
+        case ec_binop:
+                stype_binop(stype, expr->u.binop, &et);
+                break;
+        case ec_unop:
+                stype_unop(stype, expr->u.unop, &et);
+                break;
+        case ec_new:
+                stype_new(stype, expr->u.new_op, &et);
+                break;
+        case ec_access:
+                stype_access(stype, expr->u.access, &et);
+                break;
+        case ec_call:
+                stype_call(stype, expr->u.call, &et);
+                break;
+        case ec_index:
+                stype_index(stype, expr->u.index, &et);
+                break;
+        case ec_assign:
+                stype_assign(stype, expr->u.assign, &et);
+                break;
+        case ec_as:
+                stype_as(stype, expr->u.as_op, &et);
+                break;
+        case ec_box:
+                stype_box(stype, expr->u.box, &et);
+                break;
         }
 
@@ -362 +386 @@
 
         switch (literal->ltc) {
-        case ltc_bool: tpc = tpc_bool; break;
-        case ltc_char: tpc = tpc_char; break;
-        case ltc_int: tpc = tpc_int; break;
-        case ltc_ref: tpc = tpc_nil; break;
-        case ltc_string: tpc = tpc_string; break;
+        case ltc_bool:
+                tpc = tpc_bool;
+                break;
+        case ltc_char:
+                tpc = tpc_char;
+                break;
+        case ltc_int:
+                tpc = tpc_int;
+                break;
+        case ltc_ref:
+                tpc = tpc_nil;
+                break;
+        case ltc_string:
+                tpc = tpc_string;
+                break;
         }
 
@@ -1771 +1805 @@
          * conversion destination.
          */
-        if (stype_targs_check_equal(stype, pred_ti, as_op->arg->titem)
-            != EOK) {
+        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;