Changeset 32eb01b in mainline for uspace/app/bithenge/script.c

Timestamp:

2012-07-28T04:19:00Z (12 years ago)

Author:

Sean Bartell <wingedtachikoma@…>

Branches:

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

Children:

f85ca3f

Parents:

4056ad0

Message:

Bithenge: allow defining transforms with parameters

File:

• uspace/app/bithenge/script.c (modified) (7 diffs)

uspace/app/bithenge/script.c

@@ -74 +74 @@
          * to indicate whether an error has occurred. */
         int error;
+
         /** The list of named transforms. */
         transform_list_t *transform_list;
+
         /** The name of the script file. */
         const char *filename;
@@ -91 +93 @@
         /** Added to a buffer position to find the column number. */
         int line_offset;
+
         /** The type of the current token. */
         token_type_t token;
@@ -100 +103 @@
                 bithenge_int_t token_int;
         };
+
+        /** The names of the current transform's parameters. */
+        char **parameter_names;
+        /** The number of parameters. */
+        int num_params;
 } state_t;
 
@@ -340 +348 @@
 
                 return expr;
+        } else if (state->token == TOKEN_IDENTIFIER) {
+                int i;
+                for (i = 0; i < state->num_params; i++)
+                        if (!str_cmp(state->parameter_names[i],
+                            state->token_string))
+                                break;
+
+                if (i == state->num_params) {
+                        syntax_error(state, "unknown identifier");
+                        return NULL;
+                }
+
+                bithenge_expression_t *expr;
+                int rc = bithenge_param_expression(&expr, i);
+                if (rc != EOK) {
+                        error_errno(state, rc);
+                        return NULL;
+                }
+
+                next_token(state);
+
+                return expr;
         } else {
                 syntax_error(state, "expression expected");
@@ -494 +524 @@
         expect(state, TOKEN_TRANSFORM);
         char *name = expect_identifier(state);
+
+        if (state->token == '(') {
+                next_token(state);
+                while (state->error == EOK && state->token != ')') {
+                        if (state->num_params)
+                                expect(state, ',');
+                        state->parameter_names = state_realloc(state,
+                            state->parameter_names,
+                            (state->num_params + 1)*sizeof(*state->parameter_names));
+                        if (state->error != EOK)
+                                break;
+                        state->parameter_names[state->num_params++] =
+                            expect_identifier(state);
+                }
+                expect(state, ')');
+        }
+
         expect(state, '=');
         bithenge_transform_t *xform = parse_transform(state);
         expect(state, ';');
+
+        if (state->error == EOK && state->num_params) {
+                int rc = bithenge_new_param_transform(&xform, xform,
+                    state->num_params);
+                if (rc != EOK) {
+                        xform = NULL;
+                        error_errno(state, rc);
+                }
+        }
+
         add_named_transform(state, xform, name);
+
+        for (int i = 0; i < state->num_params; i++)
+                free(state->parameter_names[i]);
+        free(state->parameter_names);
+        state->parameter_names = NULL;
+        state->num_params = 0;
 }
 
@@ -505 +568 @@
         state->error = EOK;
         state->transform_list = NULL;
+        state->parameter_names = NULL;
+        state->num_params = 0;
         state->token = TOKEN_ERROR;
         state->old_buffer_pos = state->buffer_pos = BUFFER_SIZE - 1;
@@ -532 +597 @@
                 entry = next;
         }
+        for (int i = 0; i < state->num_params; i++)
+                free(state->parameter_names[i]);
+        free(state->parameter_names);
 }