Changeset 0b60d2d in mainline for uspace/app/bithenge/script.c

Timestamp:

2012-08-09T04:46:44Z (12 years ago)

Author:

Sean Bartell <wingedtachikoma@…>

Branches:

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

Children:

3c70376

Parents:

d8bd2ec

Message:

Bithenge: add subblob expressions

File:

• uspace/app/bithenge/script.c (modified) (2 diffs)

uspace/app/bithenge/script.c

@@ -530 +530 @@
 }
 
+static bithenge_expression_t *parse_postfix_expression(state_t *state)
+{
+        bithenge_expression_t *expr = parse_term(state);
+        while (state->error == EOK) {
+                if (state->token == '[') {
+                        next_token(state);
+                        bithenge_expression_t *start = parse_expression(state);
+                        bool absolute_limit;
+                        if (state->token == ',') {
+                                absolute_limit = false;
+                                next_token(state);
+                        } else if (state->token == ':') {
+                                absolute_limit = true;
+                                next_token(state);
+                        } else {
+                                syntax_error(state, "expected ',' or ':'");
+                        }
+                        bithenge_expression_t *limit = NULL;
+                        if (!(state->token == ']' && absolute_limit))
+                                limit = parse_expression(state);
+                        expect(state, ']');
+
+                        if (state->error != EOK) {
+                                bithenge_expression_dec_ref(expr);
+                                bithenge_expression_dec_ref(start);
+                                bithenge_expression_dec_ref(limit);
+                                return NULL;
+                        }
+                        int rc = bithenge_subblob_expression(&expr, expr,
+                            start, limit, absolute_limit);
+                        if (rc != EOK) {
+                                error_errno(state, rc);
+                                return NULL;
+                        }
+                } else {
+                        break;
+                }
+        }
+        return expr;
+}
+
 static bithenge_expression_t *parse_expression_precedence(state_t *state,
     precedence_t prev_precedence)
 {
-        bithenge_expression_t *expr = parse_term(state);
+        bithenge_expression_t *expr = parse_postfix_expression(state);
         while (state->error == EOK) {
                 bithenge_binary_op_t op =
@@ -544 +585 @@
                 next_token(state);
 
-                bithenge_expression_t *expr2 = parse_term(state);
+                bithenge_expression_t *expr2 = parse_postfix_expression(state);
                 if (state->error != EOK) {
                         bithenge_expression_dec_ref(expr2);