Changeset 600f5d1 in mainline for uspace/app/bithenge/script.c

Timestamp:

2012-06-27T20:10:30Z (12 years ago)

Author:

Sean Bartell <wingedtachikoma@…>

Branches:

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

Children:

02dcb20

Parents:

978ccaf1

Message:

Bithenge: add composition, ascii, and zero_terminated

File:

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

uspace/app/bithenge/script.c

@@ -177 +177 @@
                 return;
         } else if (isalpha(ch)) {
-                while (isalnum(state->buffer[state->buffer_pos]))
+                while (isalnum(state->buffer[state->buffer_pos])
+                    || state->buffer[state->buffer_pos] == '_')
                         state->buffer_pos++;
                 char *value = str_ndup(state->buffer + state->old_buffer_pos,
@@ -308 +309 @@
         expect(state, '{');
         while (state->error == EOK && state->token != '}') {
-                expect(state, '.');
-                subxforms[num].name = expect_identifier(state);
-                expect(state, TOKEN_LEFT_ARROW);
+                if (state->token == '.') {
+                        expect(state, '.');
+                        subxforms[num].name = expect_identifier(state);
+                        expect(state, TOKEN_LEFT_ARROW);
+                } else {
+                        subxforms[num].name = NULL;
+                        expect(state, TOKEN_LEFT_ARROW);
+                }
                 subxforms[num].transform = parse_transform(state);
                 expect(state, ';');
@@ -339 +345 @@
 }
 
-/** Parse a transform. 
+/** Parse a transform without composition.
  * @return The parsed transform, or NULL if an error occurred. */
-static bithenge_transform_t *parse_transform(state_t *state)
+static bithenge_transform_t *parse_transform_no_compose(state_t *state)
 {
         if (state->token == TOKEN_IDENTIFIER) {
@@ -356 +362 @@
                 return NULL;
         }
+}
+
+/** Parse a transform.
+ * @return The parsed transform, or NULL if an error occurred. */
+static bithenge_transform_t *parse_transform(state_t *state)
+{
+        bithenge_transform_t *result = parse_transform_no_compose(state);
+        bithenge_transform_t **xforms = NULL;
+        size_t num = 1;
+        while (state->token == TOKEN_LEFT_ARROW) {
+                expect(state, TOKEN_LEFT_ARROW);
+                xforms = state_realloc(state, xforms,
+                    (num + 1) * sizeof(*xforms));
+                if (state->error != EOK)
+                        break;
+                xforms[num] = parse_transform_no_compose(state);
+                num++;
+        }
+        if (state->error != EOK) {
+                while (xforms && num--)
+                        bithenge_transform_dec_ref(xforms[num]);
+                free(xforms);
+                bithenge_transform_dec_ref(result);
+                return NULL;
+        }
+        if (xforms) {
+                xforms[0] = result;
+                int rc = bithenge_new_composed_transform(&result, xforms, num);
+                if (rc != EOK) {
+                        error_errno(state, rc);
+                        return NULL;
+                }
+        }
+        return result;
 }