Changeset 074444f in mainline for uspace/app/sbi/src/p_type.c

Timestamp:

2010-04-10T11:15:33Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

1ef0fc3, 38aaacc2

Parents:

23de644

Message:

Update SBI to rev. 184.

File:

• uspace/app/sbi/src/p_type.c (modified) (4 diffs)

uspace/app/sbi/src/p_type.c

@@ -78 +78 @@
 static stree_texpr_t *parse_tapply(parse_t *parse)
 {
-        stree_texpr_t *a, *b, *tmp;
+        stree_texpr_t *gtype;
+        stree_texpr_t *aexpr;
+        stree_texpr_t *targ;
         stree_tapply_t *tapply;
 
-        a = parse_tpostfix(parse);
+        gtype = parse_tpostfix(parse);
+        if (lcur_lc(parse) != lc_slash)
+                return gtype;
+
+        tapply = stree_tapply_new();
+        tapply->gtype = gtype;
+        list_init(&tapply->targs);
+
         while (lcur_lc(parse) == lc_slash) {
 
@@ -88 +97 @@
 
                 lskip(parse);
-                b = parse_tpostfix(parse);
-
-                tapply = stree_tapply_new();
-                tapply->gtype = a;
-                tapply->targ = b;
-
-                tmp = stree_texpr_new(tc_tapply);
-                tmp->u.tapply = tapply;
-                a = tmp;
-        }
-
-        return a;
+                targ = parse_tpostfix(parse);
+
+                list_append(&tapply->targs, targ);
+        }
+
+        aexpr = stree_texpr_new(tc_tapply);
+        aexpr->u.tapply = tapply;
+        return aexpr;
 }
 
@@ -224 +229 @@
                 texpr->u.tnameref = parse_tnameref(parse);
                 break;
+        case lc_bool:
+        case lc_char:
         case lc_int:
         case lc_string:
@@ -249 +256 @@
 
         switch (lcur_lc(parse)) {
+        case lc_bool:
+                tlc = tlc_bool;
+                break;
+        case lc_char:
+                tlc = tlc_char;
+                break;
         case lc_int:
                 tlc = tlc_int;