Changeset c54f5d0 in mainline

Timestamp:

2012-08-09T05:23:54Z (12 years ago)

Author:

Sean Bartell <wingedtachikoma@…>

Branches:

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

Children:

71450c8

Parents:

3c70376

Message:

Bithenge: partial transforms

Location:

uspace/app/bithenge

Files:

• compound.c (modified) (1 diff)
• compound.h (modified) (1 diff)
• script.c (modified) (4 diffs)

uspace/app/bithenge/compound.c

@@ -260 +260 @@
 }
 
+
+
+/***************** partial_transform                         *****************/
+
+typedef struct {
+        bithenge_transform_t base;
+        bithenge_transform_t *xform;
+} partial_transform_t;
+
+static inline bithenge_transform_t *partial_as_transform(
+    partial_transform_t *self)
+{
+        return &self->base;
+}
+
+static inline partial_transform_t *transform_as_partial(
+    bithenge_transform_t *base)
+{
+        return (partial_transform_t *)base;
+}
+
+static int partial_transform_apply(bithenge_transform_t *base,
+    bithenge_scope_t *scope, bithenge_node_t *in, bithenge_node_t **out)
+{
+        partial_transform_t *self = transform_as_partial(base);
+        if (bithenge_node_type(in) != BITHENGE_NODE_BLOB)
+                return EINVAL;
+        uint64_t size;
+        return bithenge_transform_prefix_apply(self->xform, scope,
+            bithenge_node_as_blob(in), out, &size);
+}
+
+static void partial_transform_destroy(bithenge_transform_t *base)
+{
+        partial_transform_t *self = transform_as_partial(base);
+        bithenge_transform_dec_ref(self->xform);
+        free(self);
+}
+
+static const bithenge_transform_ops_t partial_transform_ops = {
+        .apply = partial_transform_apply,
+        .destroy = partial_transform_destroy,
+};
+
+/** Create a transform that doesn't require its subtransform to use the whole
+ * input. Takes a reference to @a xform.
+ * @param[out] out Holds the new transform.
+ * @param xform The subtransform to apply.
+ * @return EOK on success or an error code from errno.h. */
+int bithenge_partial_transform(bithenge_transform_t **out,
+    bithenge_transform_t *xform)
+{
+        int rc;
+        partial_transform_t *self = malloc(sizeof(*self));
+        if (!self) {
+                rc = ENOMEM;
+                goto error;
+        }
+
+        rc = bithenge_init_transform(partial_as_transform(self),
+            &partial_transform_ops, 0);
+        if (rc != EOK)
+                goto error;
+
+        self->xform = xform;
+        *out = partial_as_transform(self);
+        return EOK;
+
+error:
+        free(self);
+        bithenge_transform_dec_ref(xform);
+        return rc;
+}
+
 /** @}
  */

uspace/app/bithenge/compound.h

@@ -45 +45 @@
 int bithenge_if_transform(bithenge_transform_t **, bithenge_expression_t *,
     bithenge_transform_t *, bithenge_transform_t *);
+int bithenge_partial_transform(bithenge_transform_t **,
+    bithenge_transform_t *);
 
 #endif

uspace/app/bithenge/script.c

@@ -66 +66 @@
         TOKEN_IF,
         TOKEN_IN,
+        TOKEN_PARTIAL,
         TOKEN_REPEAT,
         TOKEN_STRUCT,
@@ -232 +233 @@
                 } else if (!str_cmp(value, "in")) {
                         state->token = TOKEN_IN;
+                        free(value);
+                } else if (!str_cmp(value, "partial")) {
+                        state->token = TOKEN_PARTIAL;
                         free(value);
                 } else if (!str_cmp(value, "repeat")) {
@@ -871 +875 @@
 }
 
+static bithenge_transform_t *parse_partial(state_t *state)
+{
+        expect(state, TOKEN_PARTIAL);
+        bithenge_transform_t *offset_xform = NULL;
+        if (state->token == '(') {
+                next_token(state);
+                bithenge_expression_t *offset = parse_expression(state);
+                expect(state, ')');
+
+                bithenge_expression_t *in_expr;
+                int rc = bithenge_in_node_expression(&in_expr);
+                if (rc != EOK)
+                        error_errno(state, rc);
+                if (state->error != EOK) {
+                        bithenge_expression_dec_ref(offset);
+                        return NULL;
+                }
+
+                rc = bithenge_subblob_expression(&offset, in_expr, offset,
+                    NULL, true);
+                if (rc != EOK) {
+                        error_errno(state, rc);
+                        return NULL;
+                }
+
+                rc = bithenge_expression_transform(&offset_xform, offset);
+                if (rc != EOK) {
+                        error_errno(state, rc);
+                        return NULL;
+                }
+        }
+        expect(state, '{');
+        bithenge_transform_t *xform = parse_transform(state);
+        expect(state, '}');
+        if (state->error != EOK) {
+                bithenge_transform_dec_ref(offset_xform);
+                bithenge_transform_dec_ref(xform);
+                return NULL;
+        }
+
+        int rc = bithenge_partial_transform(&xform, xform);
+        if (rc != EOK) {
+                error_errno(state, rc);
+                bithenge_transform_dec_ref(offset_xform);
+                return NULL;
+        }
+
+        if (offset_xform) {
+                bithenge_transform_t **xforms = malloc(2 * sizeof(*xforms));
+                if (!xforms) {
+                        error_errno(state, ENOMEM);
+                        bithenge_transform_dec_ref(xform);
+                        bithenge_transform_dec_ref(offset_xform);
+                        return NULL;
+                }
+                xforms[0] = xform;
+                xforms[1] = offset_xform;
+                rc = bithenge_new_composed_transform(&xform, xforms, 2);
+                if (rc != EOK) {
+                        error_errno(state, rc);
+                        return NULL;
+                }
+        }
+
+        return xform;
+}
+
 /* The TOKEN_STRUCT and '{' must already have been skipped. */
 static bithenge_transform_t *parse_struct(state_t *state)
@@ -952 +1023 @@
         } else if (state->token == TOKEN_IF) {
                 return parse_if(state, false);
+        } else if (state->token == TOKEN_PARTIAL) {
+                return parse_partial(state);
         } else if (state->token == TOKEN_REPEAT) {
                 return parse_repeat(state);