Changeset 03cad47 in mainline

Timestamp:

2012-07-28T00:20:31Z (12 years ago)

Author:

Sean Bartell <wingedtachikoma@…>

Branches:

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

Children:

4056ad0

Parents:

6e34bd0

Message:

Bithenge: make num_params more dynamic

Location:

uspace/app/bithenge

Files:

• expression.c (modified) (2 diffs)
• transform.c (modified) (7 diffs)
• transform.h (modified) (5 diffs)

uspace/app/bithenge/expression.c

@@ -271 +271 @@
         .prefix_length = param_wrapper_prefix_length,
         .destroy = param_wrapper_destroy,
-        .num_params = 0, /* This transform should not be used inside another
-                            param_wrapper or explicitly in a script, so this
-                            number doesn't matter. */
 };
 
@@ -295 +292 @@
 
         rc = bithenge_init_transform(param_wrapper_as_transform(self),
-            &param_wrapper_ops);
+            &param_wrapper_ops, 0);
         if (rc != EOK)
                 goto error;

uspace/app/bithenge/transform.c

@@ -44 +44 @@
  * @param[out] self Transform to initialize.
  * @param[in] ops Operations provided by the transform.
+ * @param num_params The number of parameters required. If this is nonzero, the
+ * transform will get its own context with parameters, probably provided by a
+ * param_wrapper. If this is zero, the existing outer context will be used with
+ * whatever parameters it has.
  * @return EOK or an error code from errno.h. */
 int bithenge_init_transform(bithenge_transform_t *self,
-    const bithenge_transform_ops_t *ops)
+    const bithenge_transform_ops_t *ops, int num_params)
 {
         assert(ops);
@@ -53 +57 @@
         self->ops = ops;
         self->refs = 1;
+        self->num_params = num_params;
         return EOK;
 }
@@ -99 +104 @@
 /** The ASCII text transform. */
 bithenge_transform_t bithenge_ascii_transform = {
-        &ascii_ops, 1
+        &ascii_ops, 1, 0
 };
 
@@ -159 +164 @@
                                                                                \
         bithenge_transform_t bithenge_##NAME##_transform = {                   \
-                &NAME##_ops, 1                                                 \
+                &NAME##_ops, 1, 0                                              \
         }
 
@@ -222 +227 @@
 /** The zero-terminated data transform. */
 bithenge_transform_t bithenge_zero_terminated_transform = {
-        &zero_terminated_ops, 1
+        &zero_terminated_ops, 1, 0
 };
 
@@ -480 +485 @@
         }
         rc = bithenge_init_transform(struct_as_transform(self),
-            &struct_transform_ops);
+            &struct_transform_ops, 0);
         if (rc != EOK)
                 goto error;
@@ -579 +584 @@
         }
         rc = bithenge_init_transform(compose_as_transform(self),
-            &compose_transform_ops);
+            &compose_transform_ops, 0);
         if (rc != EOK)
                 goto error;

uspace/app/bithenge/transform.h

@@ -46 +46 @@
         const struct bithenge_transform_ops *ops;
         unsigned int refs;
+        int num_params;
 } bithenge_transform_t;
 
@@ -66 +67 @@
          * @param self The transform. */
         void (*destroy)(bithenge_transform_t *self);
-        /** The number of parameters required. */
-        int num_params;
 } bithenge_transform_ops_t;
 
@@ -136 +135 @@
 }
 
-/** Get the number of parameters required by a transform. Takes ownership of
- * nothing.
+/** Get the number of parameters required by a transform. This number is used
+ * by the parser and param-wrapper. Takes ownership of nothing.
  * @param self The transform.
  * @return The number of parameters required. */
@@ -143 +142 @@
 {
         assert(self);
-        assert(self->ops);
-        return self->ops->num_params;
+        return self->num_params;
 }
 
@@ -220 +218 @@
 
 int bithenge_init_transform(bithenge_transform_t *self,
-    const bithenge_transform_ops_t *ops);
+    const bithenge_transform_ops_t *ops, int num_params);
 int bithenge_new_struct(bithenge_transform_t **out,
     bithenge_named_transform_t *subtransforms);