Changeset 1c79996 in mainline for uspace/lib/bithenge/sequence.c

Timestamp:

2012-08-18T23:20:48Z (13 years ago)

Author:

Sean Bartell <wingedtachikoma@…>

Branches:

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

Children:

a42d7d8

Parents:

1f9c9a4

Message:

Bithenge: fix issues and expand coverage for test.sh

File:

• uspace/lib/bithenge/sequence.c (modified) (6 diffs)

uspace/lib/bithenge/sequence.c

@@ -915 +915 @@
 typedef struct {
         seq_node_t base;
-        bool prefix;
         bithenge_expression_t *expr;
         bithenge_transform_t *xform;
@@ -995 +994 @@
         }
 
-        if (!self->prefix) {
-                bool complete;
-                rc = seq_node_complete(do_while_as_seq(self), &complete);
-                if (rc != EOK)
-                        return rc;
-                if (!complete)
-                        return EINVAL;
-        }
-
         return rc;
 }
@@ -1035 +1025 @@
 
 static int do_while_transform_make_node(do_while_transform_t *self,
-    bithenge_node_t **out, bithenge_scope_t *scope, bithenge_blob_t *blob,
-    bool prefix)
+    bithenge_node_t **out, bithenge_scope_t *scope, bithenge_blob_t *blob)
 {
         do_while_node_t *node = malloc(sizeof(*node));
@@ -1060 +1049 @@
         bithenge_expression_inc_ref(self->expr);
         node->expr = self->expr;
-        node->prefix = prefix;
         node->count = -1;
         *out = do_while_as_node(node);
         return EOK;
-}
-
-static int do_while_transform_apply(bithenge_transform_t *base,
-    bithenge_scope_t *scope, bithenge_node_t *in, bithenge_node_t **out)
-{
-        do_while_transform_t *self = transform_as_do_while(base);
-        if (bithenge_node_type(in) != BITHENGE_NODE_BLOB)
-                return EINVAL;
-        return do_while_transform_make_node(self, out, scope,
-            bithenge_node_as_blob(in), false);
 }
 
@@ -1089 +1067 @@
 {
         do_while_transform_t *self = transform_as_do_while(base);
-        int rc = do_while_transform_make_node(self, out_node, scope, blob,
-            true);
+        int rc = do_while_transform_make_node(self, out_node, scope, blob);
         if (rc != EOK)
                 return rc;
@@ -1121 +1098 @@
 
 static const bithenge_transform_ops_t do_while_transform_ops = {
-        .apply = do_while_transform_apply,
         .prefix_apply = do_while_transform_prefix_apply,
         .destroy = do_while_transform_destroy,