Changeset 23db8aa in mainline

Timestamp:

2012-08-01T21:59:11Z (12 years ago)

Author:

Sean Bartell <wingedtachikoma@…>

Branches:

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

Children:

47a728e1

Parents:

3f2ea63

Message:

Bithenge: style

File:

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

uspace/app/bithenge/script.c

@@ -495 +495 @@
 }
 
+/** Create a transform that just produces an empty node.
+ * @param state The parser state.
+ * @return The new transform, or NULL on error. */
+static bithenge_transform_t *make_empty_transform(state_t *state)
+{
+        bithenge_node_t *node;
+        int rc = bithenge_new_empty_internal_node(&node);
+        if (rc != EOK) {
+                error_errno(state, rc);
+                return NULL;
+        }
+
+        bithenge_expression_t *expr;
+        rc = bithenge_const_expression(&expr, node);
+        if (rc != EOK) {
+                error_errno(state, rc);
+                return NULL;
+        }
+
+        bithenge_transform_t *xform;
+        rc = bithenge_expression_transform(&xform, expr);
+        if (rc != EOK) {
+                error_errno(state, rc);
+                return NULL;
+        }
+
+        return xform;
+}
+
 static bithenge_transform_t *parse_if(state_t *state, bool in_struct)
 {
@@ -505 +534 @@
             in_struct ? parse_struct(state) : parse_transform(state);
         expect(state, '}');
+
         bithenge_transform_t *false_xform = NULL;
         if (state->token == TOKEN_ELSE) {
@@ -513 +543 @@
                 expect(state, '}');
         } else {
-                if (in_struct) {
-                        bithenge_node_t *node;
-                        int rc = bithenge_new_empty_internal_node(&node);
-                        if (rc != EOK) {
-                                error_errno(state, rc);
-                                goto error;
-                        }
-                        bithenge_expression_t *expr;
-                        rc = bithenge_const_expression(&expr, node);
-                        if (rc != EOK) {
-                                error_errno(state, rc);
-                                goto error;
-                        }
-                        rc = bithenge_expression_transform(&false_xform, expr);
-                        if (rc != EOK) {
-                                error_errno(state, rc);
-                                false_xform = NULL;
-                                goto error;
-                        }
-                } else
+                if (in_struct)
+                        false_xform = make_empty_transform(state);
+                else
                         syntax_error(state, "else expected");
         }
+
         if (state->error != EOK) {
-error:
                 bithenge_expression_dec_ref(expr);
                 bithenge_transform_dec_ref(true_xform);
@@ -542 +555 @@
                 return NULL;
         }
+
         bithenge_transform_t *if_xform;
         int rc = bithenge_if_transform(&if_xform, expr, true_xform,