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

Timestamp:

2012-08-04T03:51:15Z (13 years ago)

Author:

Sean Bartell <wingedtachikoma@…>

Branches:

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

Children:

0ce0103

Parents:

e3f2765

Message:

Bithenge: add do{}while() transforms

File:

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

uspace/app/bithenge/script.c

@@ -59 +59 @@
 
         /* Keywords */
+        TOKEN_DO,
         TOKEN_ELSE,
         TOKEN_FALSE,
@@ -67 +68 @@
         TOKEN_TRANSFORM,
         TOKEN_TRUE,
+        TOKEN_WHILE,
 } token_type_t;
 
@@ -211 +213 @@
                 if (!value) {
                         error_errno(state, ENOMEM);
+                } else if (!str_cmp(value, "do")) {
+                        state->token = TOKEN_DO;
+                        free(value);
                 } else if (!str_cmp(value, "else")) {
                         state->token = TOKEN_ELSE;
@@ -234 +239 @@
                 } else if (!str_cmp(value, "true")) {
                         state->token = TOKEN_TRUE;
+                        free(value);
+                } else if (!str_cmp(value, "while")) {
+                        state->token = TOKEN_WHILE;
                         free(value);
                 } else {
@@ -686 +694 @@
 }
 
+static bithenge_transform_t *parse_do_while(state_t *state)
+{
+        expect(state, TOKEN_DO);
+        expect(state, '{');
+        bithenge_transform_t *xform = parse_transform(state);
+        expect(state, '}');
+        expect(state, TOKEN_WHILE);
+        expect(state, '(');
+        bithenge_expression_t *expr = parse_expression(state);
+        expect(state, ')');
+
+        if (state->error != EOK) {
+                bithenge_expression_dec_ref(expr);
+                bithenge_transform_dec_ref(xform);
+                return NULL;
+        }
+
+        bithenge_transform_t *do_while_xform;
+        int rc = bithenge_do_while_transform(&do_while_xform, xform, expr);
+        if (rc != EOK) {
+                error_errno(state, rc);
+                return NULL;
+        }
+        return do_while_xform;
+}
+
 /* The TOKEN_STRUCT and '{' must already have been skipped. */
 static bithenge_transform_t *parse_struct(state_t *state)
@@ -740 +774 @@
 static bithenge_transform_t *parse_transform_no_compose(state_t *state)
 {
-        if (state->token == TOKEN_IDENTIFIER) {
+        if (state->token == TOKEN_DO) {
+                return parse_do_while(state);
+        } else if (state->token == TOKEN_IDENTIFIER) {
                 return parse_invocation(state);
         } else if (state->token == TOKEN_IF) {