Changeset 71450c8 in mainline for uspace/app/bithenge/script.c

Timestamp:

2012-08-09T05:41:00Z (12 years ago)

Author:

Sean Bartell <wingedtachikoma@…>

Branches:

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

Children:

05f5fbf

Parents:

c54f5d0

Message:

Bithenge: add member expressions and improve USB example

File:

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

uspace/app/bithenge/script.c

@@ -537 +537 @@
 static bithenge_expression_t *parse_postfix_expression(state_t *state)
 {
+        int rc;
         bithenge_expression_t *expr = parse_term(state);
         while (state->error == EOK) {
-                if (state->token == '[') {
+                if (state->token == '.') {
+                        next_token(state);
+
+                        const char *id = expect_identifier(state);
+
+                        if (state->error != EOK) {
+                                free((char *)id);
+                                bithenge_expression_dec_ref(expr);
+                                return NULL;
+                        }
+
+                        bithenge_node_t *key = NULL;
+                        rc = bithenge_new_string_node(&key, id, true);
+                        if (rc != EOK) {
+                                error_errno(state, rc);
+                                bithenge_expression_dec_ref(expr);
+                                return NULL;
+                        }
+
+                        rc = bithenge_member_expression(&expr, expr, key);
+                        if (rc != EOK) {
+                                error_errno(state, rc);
+                                return NULL;
+                        }
+                } else if (state->token == '[') {
                         next_token(state);
                         bithenge_expression_t *start = parse_expression(state);
@@ -563 +588 @@
                                 return NULL;
                         }
-                        int rc = bithenge_subblob_expression(&expr, expr,
-                            start, limit, absolute_limit);
+                        rc = bithenge_subblob_expression(&expr, expr, start,
+                            limit, absolute_limit);
                         if (rc != EOK) {
                                 error_errno(state, rc);