Changeset f85ca3f in mainline for uspace/app/bithenge/script.c

Timestamp:

2012-07-28T21:25:49Z (12 years ago)

Author:

Sean Bartell <wingedtachikoma@…>

Branches:

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

Children:

84e8a70

Parents:

32eb01b

Message:

Bithenge: add expressions that use the current node being created

File:

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

uspace/app/bithenge/script.c

@@ -119 +119 @@
 }
 
-/** Note that an error has occurred. */
+/** Note that an error has occurred if error is not EOK. */
 static void error_errno(state_t *state, int error)
 {
         // Don't overwrite a previous error.
-        if (state->error == EOK) {
+        if (state->error == EOK && error != EOK) {
                 done_with_token(state);
                 state->token = TOKEN_ERROR;
@@ -220 +220 @@
                 int rc = bithenge_parse_int(state->buffer +
                     state->old_buffer_pos, &state->token_int);
-                if (rc != EOK)
-                        error_errno(state, rc);
+                error_errno(state, rc);
         } else if (ch == '<') {
                 state->token = ch;
@@ -368 +367 @@
 
                 next_token(state);
+
+                return expr;
+        } else if (state->token == '.') {
+                next_token(state);
+
+                const char *id = expect_identifier(state);
+                bithenge_node_t *key = NULL;
+                bithenge_expression_t *expr = NULL;
+                int rc = bithenge_current_node_expression(&expr);
+                error_errno(state, rc);
+
+                if (state->error == EOK) {
+                        rc = bithenge_new_string_node(&key, id, true);
+                        id = NULL;
+                        error_errno(state, rc);
+                }
+
+                if (state->error == EOK) {
+                        rc = bithenge_member_expression(&expr, expr, key);
+                        key = NULL;
+                        if (rc != EOK)
+                                expr = NULL;
+                        error_errno(state, rc);
+                }
+
+                if (state->error != EOK) {
+                        free((char *)id);
+                        bithenge_node_dec_ref(key);
+                        bithenge_expression_dec_ref(expr);
+                        return NULL;
+                }
 
                 return expr;
@@ -588 +618 @@
         done_with_token(state);
         state->token = TOKEN_ERROR;
-        fclose(state->file);
+        if (state->file)
+                fclose(state->file);
         transform_list_t *entry = state->transform_list;
         while (entry) {