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

Timestamp:

2012-08-07T04:30:04Z (13 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/transform.c (modified) (5 diffs)

uspace/app/bithenge/transform.c

@@ -166 +166 @@
 
 /** Create a transform scope. It must be dereferenced with @a
- * bithenge_scope_dec_ref after it is used.
+ * bithenge_scope_dec_ref after it is used. Takes ownership of nothing.
  * @param[out] out Holds the new scope.
+ * @param outer The outer scope, or NULL.
  * @return EOK on success or an error code from errno.h. */
-int bithenge_scope_new(bithenge_scope_t **out)
+int bithenge_scope_new(bithenge_scope_t **out, bithenge_scope_t *outer)
 {
         bithenge_scope_t *self = malloc(sizeof(*self));
@@ -175 +176 @@
                 return ENOMEM;
         self->refs = 1;
+        if (outer)
+                bithenge_scope_inc_ref(outer);
+        self->outer = outer;
         self->num_params = 0;
         self->params = NULL;
@@ -186 +190 @@
 void bithenge_scope_dec_ref(bithenge_scope_t *self)
 {
-        if (!--self->refs) {
-                bithenge_node_dec_ref(self->current_node);
-                for (int i = 0; i < self->num_params; i++)
-                        bithenge_node_dec_ref(self->params[i]);
-                free(self->params);
-                free(self);
-        }
+        if (!self)
+                return;
+        if (--self->refs)
+                return;
+        bithenge_node_dec_ref(self->current_node);
+        for (int i = 0; i < self->num_params; i++)
+                bithenge_node_dec_ref(self->params[i]);
+        bithenge_scope_dec_ref(self->outer);
+        free(self->params);
+        free(self);
 }
 
@@ -279 +286 @@
 {
         assert(scope);
-        assert(i >= 0 && i < scope->num_params);
-        *out = scope->params[i];
-        bithenge_node_inc_ref(*out);
-        return EOK;
+        if (scope->num_params) {
+                assert(i >= 0 && i < scope->num_params);
+                *out = scope->params[i];
+                bithenge_node_inc_ref(*out);
+                return EOK;
+        } else {
+                return bithenge_scope_get_param(scope->outer, i, out);
+        }
 }
 
@@ -307 +318 @@
         scope_transform_t *self = transform_as_param(base);
         bithenge_scope_t *inner_scope;
-        int rc = bithenge_scope_new(&inner_scope);
-        if (rc != EOK)
-                return rc;
-        rc = bithenge_scope_copy(inner_scope, scope);
-        if (rc != EOK)
-                goto error;
-        bithenge_scope_set_current_node(inner_scope, NULL);
+        int rc = bithenge_scope_new(&inner_scope, scope);
+        if (rc != EOK)
+                return rc;
         rc = bithenge_transform_apply(self->transform, scope, in, out);
-error:
         bithenge_scope_dec_ref(inner_scope);
         return rc;