Changeset 0191bd3 in mainline for uspace/app/bithenge/expression.c

Timestamp:

2012-08-07T04:30:04Z (12 years ago)

Author:

Sean Bartell <wingedtachikoma@…>

Branches:

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

Children:

a8be91a

Parents:

f9c314a5

Message:

Bithenge: keep track of outer scopes and find parameters there

File:

• uspace/app/bithenge/expression.c (modified) (4 diffs)

uspace/app/bithenge/expression.c

@@ -425 +425 @@
         param_wrapper_t *self = transform_as_param_wrapper(base);
         bithenge_scope_t *inner;
-        int rc = bithenge_scope_new(&inner);
+        int rc = bithenge_scope_new(&inner, outer);
         if (rc != EOK)
                 return rc;
@@ -445 +445 @@
         param_wrapper_t *self = transform_as_param_wrapper(base);
         bithenge_scope_t *inner;
-        int rc = bithenge_scope_new(&inner);
+        int rc = bithenge_scope_new(&inner, outer);
         if (rc != EOK)
                 return rc;
@@ -454 +454 @@
         rc = bithenge_transform_prefix_length(self->transform, inner, in, out);
         in = NULL;
+
+error:
+        bithenge_scope_dec_ref(inner);
+        return rc;
+}
+
+static int param_wrapper_prefix_apply(bithenge_transform_t *base,
+    bithenge_scope_t *outer, bithenge_blob_t *in, bithenge_node_t **out_node,
+    aoff64_t *out_length)
+{
+        param_wrapper_t *self = transform_as_param_wrapper(base);
+        bithenge_scope_t *inner;
+        int rc = bithenge_scope_new(&inner, outer);
+        if (rc != EOK)
+                return rc;
+        rc = param_wrapper_fill_scope(self, inner, outer);
+        if (rc != EOK)
+                goto error;
+
+        rc = bithenge_transform_prefix_apply(self->transform, inner, in,
+            out_node, out_length);
 
 error:
@@ -474 +495 @@
         .apply = param_wrapper_apply,
         .prefix_length = param_wrapper_prefix_length,
+        .prefix_apply = param_wrapper_prefix_apply,
         .destroy = param_wrapper_destroy,
 };