Changeset 0caaaa00 in mainline

Timestamp:

2012-08-03T21:03:27Z (12 years ago)

Author:

Sean Bartell <wingedtachikoma@…>

Branches:

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

Children:

e3f2765

Parents:

ee7cc3c

Message:

Bithenge: add repeat(count) syntax

Location:

uspace

Files:

• app/bithenge/script.c (modified) (4 diffs)
• app/bithenge/sequence.c (modified) (1 diff)
• dist/src/bithenge/test-repeat.bh (added)
• dist/src/bithenge/test-repeat.dat (added)

uspace/app/bithenge/script.c

@@ -62 +62 @@
         TOKEN_FALSE,
         TOKEN_IF,
+        TOKEN_REPEAT,
         TOKEN_STRUCT,
         TOKEN_SWITCH,
@@ -218 +219 @@
                 } else if (!str_cmp(value, "if")) {
                         state->token = TOKEN_IF;
+                        free(value);
+                } else if (!str_cmp(value, "repeat")) {
+                        state->token = TOKEN_REPEAT;
                         free(value);
                 } else if (!str_cmp(value, "struct")) {
@@ -654 +658 @@
 }
 
+static bithenge_transform_t *parse_repeat(state_t *state)
+{
+        expect(state, TOKEN_REPEAT);
+        expect(state, '(');
+        bithenge_expression_t *expr = parse_expression(state);
+        expect(state, ')');
+        expect(state, '{');
+        bithenge_transform_t *xform = parse_transform(state);
+        expect(state, '}');
+
+        if (state->error != EOK) {
+                bithenge_expression_dec_ref(expr);
+                bithenge_transform_dec_ref(xform);
+                return NULL;
+        }
+
+        bithenge_transform_t *repeat_xform;
+        int rc = bithenge_repeat_transform(&repeat_xform, xform, expr);
+        if (rc != EOK) {
+                error_errno(state, rc);
+                return NULL;
+        }
+        return repeat_xform;
+}
+
 /* The TOKEN_STRUCT and '{' must already have been skipped. */
 static bithenge_transform_t *parse_struct(state_t *state)
@@ -712 +741 @@
         } else if (state->token == TOKEN_IF) {
                 return parse_if(state, false);
+        } else if (state->token == TOKEN_REPEAT) {
+                return parse_repeat(state);
         } else if (state->token == TOKEN_STRUCT) {
                 next_token(state);

uspace/app/bithenge/sequence.c

@@ -695 +695 @@
         node->xform = self->xform;
         node->count = count;
+        node->prefix = prefix;
         *out = repeat_as_node(node);
         return EOK;