Changeset 03b2b2c in mainline

Timestamp:

2012-06-24T17:32:30Z (12 years ago)

Author:

Sean Bartell <wingedtachikoma@…>

Branches:

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

Children:

0d1a8fd

Parents:

da0fef6

Message:

Bithenge: add working but useless script parser.

Location:

uspace/app/bithenge

Files:

• Makefile (modified) (1 diff)
• Makefile.linux (modified) (1 diff)
• helenos/os.h (modified) (1 diff)
• linux/os.h (modified) (1 diff)
• script.c (added)
• script.h (added)
• test.c (modified) (3 diffs)
• transform.h (modified) (2 diffs)

uspace/app/bithenge/Makefile

@@ -37 +37 @@
         file.c \
         print.c \
+        script.c \
         source.c \
         test.c \

uspace/app/bithenge/Makefile.linux

@@ -36 +36 @@
         file.c \
         print.c \
+        script.c \
         source.c \
         test.c \

uspace/app/bithenge/helenos/os.h

@@ -32 +32 @@
 #include <bool.h>
 #include <byteorder.h>
+#include <errno.h>
 #include <macros.h>
 #include <mem.h>

uspace/app/bithenge/linux/os.h

@@ -85 +85 @@
 }
 
+static inline char *str_ndup(const char *s, size_t max_len)
+{
+        return strndup(s, max_len);
+}
+
 static inline const char *str_error(int e)
 {

uspace/app/bithenge/test.c

@@ -42 +42 @@
 #include "source.h"
 #include "print.h"
+#include "script.h"
+#include "transform.h"
 #include "tree.h"
 
 int main(int argc, char *argv[])
 {
-        if (argc < 2) {
+        int rc;
+        if (argc < 3) {
                 // {True: {}, -1351: "\"false\"", "true": False, 0: b"..."}
                 const char data[] = "'Twas brillig, and the slithy toves";
@@ -66 +69 @@
                 bithenge_node_destroy(node);
         } else {
-                bithenge_node_t *node;
-                int rc = bithenge_node_from_source(&node, argv[1]);
+                bithenge_transform_t *transform;
+                rc = bithenge_parse_script(argv[1], &transform);
+                if (rc != EOK) {
+                        printf("Error parsing script: %s\n", str_error(rc));
+                        return 1;
+                }
+
+                bithenge_node_t *node, *node2;
+                int rc = bithenge_node_from_source(&node, argv[2]);
                 if (rc != EOK) {
                         printf("Error creating node from source: %s\n", str_error(rc));
                         return 1;
                 }
-                rc = bithenge_print_node(BITHENGE_PRINT_PYTHON, node);
+
+                rc = bithenge_transform_apply(transform, node, &node2);
+                if (rc != EOK) {
+                        printf("Error applying transform: %s\n", str_error(rc));
+                        return 1;
+                }
+
+                bithenge_node_destroy(node);
+                bithenge_transform_dec_ref(transform);
+
+                rc = bithenge_print_node(BITHENGE_PRINT_PYTHON, node2);
                 if (rc != EOK) {
                         printf("Error printing node: %s\n", str_error(rc));
@@ -78 +98 @@
                 }
                 printf("\n");
-                bithenge_node_destroy(node);
         }
 

uspace/app/bithenge/transform.h

@@ -38 +38 @@
 #define BITHENGE_TRANSFORM_H_
 
+#include "blob.h"
 #include "tree.h"
 
@@ -104 +105 @@
 
 /** Decrement a transform's reference count.
- * @param xform The transform to dereference.
+ * @param xform The transform to dereference, or NULL.
  * @return EOK on success or an error code from errno.h. */
 static inline int bithenge_transform_dec_ref(bithenge_transform_t *xform)
 {
-        assert(xform);
+        if (!xform)
+                return EOK;
         assert(xform->ops);
         if (--xform->refs == 0)