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

Timestamp:

2012-08-08T00:52:22Z (12 years ago)

Author:

Sean Bartell <wingedtachikoma@…>

Branches:

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

Children:

d8bd2ec

Parents:

ad5c8a48

Message:

Bithenge: use expressions to make transforms

File:

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

uspace/app/bithenge/script.c

@@ -64 +64 @@
         TOKEN_FALSE,
         TOKEN_IF,
+        TOKEN_IN,
         TOKEN_REPEAT,
         TOKEN_STRUCT,
@@ -225 +226 @@
                 } else if (!str_cmp(value, "if")) {
                         state->token = TOKEN_IF;
+                        free(value);
+                } else if (!str_cmp(value, "in")) {
+                        state->token = TOKEN_IN;
                         free(value);
                 } else if (!str_cmp(value, "repeat")) {
@@ -434 +438 @@
 
                 return expr;
+        } else if (state->token == TOKEN_IN) {
+                next_token(state);
+                bithenge_expression_t *expr;
+                rc = bithenge_in_node_expression(&expr);
+                if (rc != EOK) {
+                        error_errno(state, rc);
+                        return NULL;
+                }
+                return expr;
         } else if (state->token == TOKEN_INTEGER) {
                 bithenge_int_t val = state->token_int;
@@ -621 +634 @@
 
         bithenge_transform_t *xform;
-        rc = bithenge_expression_transform(&xform, expr);
+        rc = bithenge_inputless_transform(&xform, expr);
         if (rc != EOK) {
                 error_errno(state, rc);
@@ -867 +880 @@
 static bithenge_transform_t *parse_transform_no_compose(state_t *state)
 {
-        if (state->token == TOKEN_DO) {
+        if (state->token == '(') {
+                next_token(state);
+                bithenge_expression_t *expr = parse_expression(state);
+                expect(state, ')');
+                if (state->error != EOK) {
+                        bithenge_expression_dec_ref(expr);
+                        return NULL;
+                }
+
+                bithenge_transform_t *xform;
+                int rc = bithenge_expression_transform(&xform, expr);
+                if (rc != EOK) {
+                        error_errno(state, rc);
+                        return NULL;
+                }
+                return xform;
+        } else if (state->token == TOKEN_DO) {
                 return parse_do_while(state);
         } else if (state->token == TOKEN_IDENTIFIER) {