Changeset c9797067 in mainline

Timestamp:

2012-08-09T21:18:40Z (13 years ago)

Author:

Sean Bartell <wingedtachikoma@…>

Branches:

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

Children:

0153c87

Parents:

05f5fbf

Message:

Bithenge: initial FAT script, "in" outside expression transforms, and bugfixes

Location:

uspace

Files:

• app/bithenge/expression.c (modified) (2 diffs)
• app/bithenge/script.c (modified) (2 diffs)
• app/bithenge/transform.c (modified) (6 diffs)
• dist/src/bithenge/fat.bh (added)

uspace/app/bithenge/expression.c

@@ -196 +196 @@
     bithenge_scope_t *scope, bithenge_node_t **out)
 {
-        for (; scope && !bithenge_scope_is_barrier(scope);
-            scope = bithenge_scope_outer(scope)) {
+        for (; scope; scope = bithenge_scope_outer(scope)) {
                 *out = bithenge_scope_in_node(scope);
                 if (*out)
@@ -618 +617 @@
 {
         subblob_expression_t *self = expression_as_subblob(base);
+        bithenge_expression_dec_ref(self->blob);
         bithenge_expression_dec_ref(self->start);
         bithenge_expression_dec_ref(self->limit);

uspace/app/bithenge/script.c

@@ -485 +485 @@
                 }
 
+                next_token(state);
+
                 bithenge_expression_t *expr;
                 rc = bithenge_param_expression(&expr, i);
@@ -491 +493 @@
                         return NULL;
                 }
-
-                next_token(state);
-
                 return expr;
         } else if (state->token == '.') {

uspace/app/bithenge/transform.c

@@ -41 +41 @@
 #include "transform.h"
 
+
+
+/***************** transform                                 *****************/
+
 /** Initialize a new transform.
  * @param[out] self Transform to initialize.
@@ -165 +169 @@
 }
 
+
+
+/***************** scope                                     *****************/
+
 /** Create a transform scope. It must be dereferenced with @a
  * bithenge_scope_dec_ref after it is used. Takes ownership of nothing.
@@ -318 +326 @@
 }
 
+
+
+/***************** barrier_transform                         *****************/
+
 typedef struct {
         bithenge_transform_t base;
@@ -344 +356 @@
                 return rc;
         bithenge_scope_set_barrier(inner_scope);
-        rc = bithenge_transform_apply(self->transform, scope, in, out);
+        bithenge_scope_set_in_node(inner_scope, in);
+        rc = bithenge_transform_apply(self->transform, inner_scope, in, out);
         bithenge_scope_dec_ref(inner_scope);
         return rc;
@@ -358 +371 @@
                 return rc;
         bithenge_scope_set_barrier(inner_scope);
-        rc = bithenge_transform_prefix_length(self->transform, scope, in, out);
+        bithenge_scope_set_in_node(inner_scope, bithenge_blob_as_node(in));
+        rc = bithenge_transform_prefix_length(self->transform, inner_scope, in,
+            out);
         bithenge_scope_dec_ref(inner_scope);
         return rc;
@@ -373 +388 @@
                 return rc;
         bithenge_scope_set_barrier(inner_scope);
-        rc = bithenge_transform_prefix_apply(self->transform, scope, in,
+        bithenge_scope_set_in_node(inner_scope, bithenge_blob_as_node(in));
+        rc = bithenge_transform_prefix_apply(self->transform, inner_scope, in,
             out_node, out_length);
         bithenge_scope_dec_ref(inner_scope);