Changeset d8bd2ec in mainline

Timestamp:

2012-08-08T04:13:53Z (12 years ago)

Author:

Sean Bartell <wingedtachikoma@…>

Branches:

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

Children:

0b60d2d, 20e95be

Parents:

a66ea217

Message:

Bithenge: add syntax for inputless transforms

Location:

uspace

Files:

• app/bithenge/script.c (modified) (4 diffs)
• dist/src/bithenge/test.bh (modified) (3 diffs)

uspace/app/bithenge/script.c

@@ -119 +119 @@
         /** The number of parameters. */
         int num_params;
+        /** @a parse_expression sets this when TOKEN_IN is used. */
+        bool in_node_used;
 } state_t;
 
@@ -440 +442 @@
         } else if (state->token == TOKEN_IN) {
                 next_token(state);
+                state->in_node_used = true;
                 bithenge_expression_t *expr;
                 rc = bithenge_in_node_expression(&expr);
@@ -882 +885 @@
         if (state->token == '(') {
                 next_token(state);
+                state->in_node_used = false;
                 bithenge_expression_t *expr = parse_expression(state);
                 expect(state, ')');
@@ -890 +894 @@
 
                 bithenge_transform_t *xform;
-                int rc = bithenge_expression_transform(&xform, expr);
+                int rc;
+                if (state->in_node_used)
+                        rc = bithenge_expression_transform(&xform, expr);
+                else
+                        rc = bithenge_inputless_transform(&xform, expr);
                 if (rc != EOK) {
                         error_errno(state, rc);

uspace/dist/src/bithenge/test.bh

@@ -1 @@
-transform length = struct {
-        .len <- uint8;
-};
-
 transform pascal_string = struct {
-        <- length;
+        <- struct { # An inner struct for testing purposes
+                .len <- uint8;
+        };
         .string <- ascii <- known_length(.len);
 };
@@ -16 +14 @@
 
 transform item(little_endian, len) = struct {
-        .type <- (3*in+1) <- u32(little_endian);
+        .type <- (3 * in + 1) <- u32(little_endian);
         .name <- pascal_string;
         switch (.type) {
@@ -32 +30 @@
 
 transform main() = struct {
-        .first_item <- item(true, 3);
-        .second_item <- item(false, 4);
+        .first_len <- (3);
+        .second_len <- (6 - 2);
+        .first_item <- item(true, .first_len);
+        .second_item <- item(false, .second_len);
 };