Changeset 94d484a in mainline for uspace/app/sbi/src/p_expr.c

Timestamp:

2010-03-07T17:45:33Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d0febca

Parents:

fa36f29

Message:

Update SBI to rev. 90.

File:

• uspace/app/sbi/src/p_expr.c (modified) (5 diffs)

uspace/app/sbi/src/p_expr.c

@@ -48 +48 @@
 static stree_expr_t *parse_pf_access(parse_t *parse, stree_expr_t *a);
 static stree_expr_t *parse_pf_call(parse_t *parse, stree_expr_t *a);
+static stree_expr_t *parse_pf_index(parse_t *parse, stree_expr_t *a);
 static stree_expr_t *parse_primitive(parse_t *parse);
 static stree_expr_t *parse_nameref(parse_t *parse);
@@ -181 +182 @@
         lmatch(parse, lc_new);
         texpr = parse_texpr(parse);
-        lmatch(parse, lc_lparen);
-        lmatch(parse, lc_rparen);
+
+        /* Parenthesis should be present except for arrays. */
+        if (texpr->tc != tc_tindex) {
+                lmatch(parse, lc_lparen);
+                lmatch(parse, lc_rparen);
+        }
 
         new_op = stree_new_new();
@@ -200 +205 @@
         a = parse_primitive(parse);
 
-        while (lcur_lc(parse) == lc_period || lcur_lc(parse) == lc_lparen) {
+        while (lcur_lc(parse) == lc_period || lcur_lc(parse) == lc_lparen ||
+            lcur_lc(parse) == lc_lsbr) {
 
                 switch (lcur_lc(parse)) {
@@ -209 +215 @@
                         tmp = parse_pf_call(parse, a);
                         break;
+                case lc_lsbr:
+                        tmp = parse_pf_index(parse, a);
+                        break;
                 default:
                         assert(b_false);
@@ -273 +282 @@
 }
 
+/** Parse index expression. */
+static stree_expr_t *parse_pf_index(parse_t *parse, stree_expr_t *a)
+{
+        stree_expr_t *expr;
+        stree_index_t *index;
+        stree_expr_t *arg;
+
+        lmatch(parse, lc_lsbr);
+
+        index = stree_index_new();
+        index->base = a;
+        list_init(&index->args);
+
+        /* Parse indices */
+
+        if (lcur_lc(parse) != lc_rsbr) {
+                while (b_true) {
+                        arg = parse_expr(parse);
+                        list_append(&index->args, arg);
+
+                        if (lcur_lc(parse) == lc_rsbr)
+                                break;
+                        lmatch(parse, lc_comma);
+                }
+        }
+
+        lmatch(parse, lc_rsbr);
+
+        expr = stree_expr_new(ec_index);
+        expr->u.index = index;
+
+        return expr;
+}
+
 /** Parse primitive expression. */
 static stree_expr_t *parse_primitive(parse_t *parse)