Changeset 5e718d9 in mainline for uspace/lib/bithenge/expression.h

Timestamp:

2012-08-21T10:04:16Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

67edca6

Parents:

0da6c04 (diff), 6a97f2e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge with upstream (lp:~wtachi/helenos/bithenge)

File:

• uspace/lib/bithenge/expression.h (moved) (moved from uspace/app/bithenge/expression.h ) (5 diffs)

uspace/lib/bithenge/expression.h

@@ -38 +38 @@
 #define BITHENGE_EXPRESSION_H_
 
+#include "blob.h"
 #include "transform.h"
 #include "tree.h"
@@ -73 +74 @@
                 return;
         assert(self->ops);
+        assert(self->refs > 0);
         if (--self->refs == 0)
                 self->ops->destroy(self);
@@ -91 +93 @@
 }
 
+/** The binary operators supported by @a bithenge_binary_expression(). */
 typedef enum {
         BITHENGE_EXPRESSION_INVALID_BINARY_OP,
+
         BITHENGE_EXPRESSION_ADD,
         BITHENGE_EXPRESSION_SUBTRACT,
         BITHENGE_EXPRESSION_MULTIPLY,
+        BITHENGE_EXPRESSION_INTEGER_DIVIDE,
+        BITHENGE_EXPRESSION_MODULO,
+
+        BITHENGE_EXPRESSION_LESS_THAN,
+        BITHENGE_EXPRESSION_GREATER_THAN,
+        BITHENGE_EXPRESSION_LESS_THAN_OR_EQUAL,
+        BITHENGE_EXPRESSION_GREATER_THAN_OR_EQUAL,
         BITHENGE_EXPRESSION_EQUALS,
+        BITHENGE_EXPRESSION_NOT_EQUALS,
+
+        BITHENGE_EXPRESSION_AND,
+        BITHENGE_EXPRESSION_OR,
+
+        BITHENGE_EXPRESSION_MEMBER,
+        BITHENGE_EXPRESSION_CONCAT,
 } bithenge_binary_op_t;
 
@@ -107 +125 @@
 int bithenge_param_expression(bithenge_expression_t **, int);
 int bithenge_const_expression(bithenge_expression_t **, bithenge_node_t *);
-int bithenge_member_expression(bithenge_expression_t **,
-    bithenge_expression_t *, bithenge_node_t *);
 int bithenge_scope_member_expression(bithenge_expression_t **,
     bithenge_node_t *);
+int bithenge_subblob_expression(bithenge_expression_t **,
+    bithenge_expression_t *, bithenge_expression_t *, bithenge_expression_t *,
+    bool);
 int bithenge_param_wrapper(bithenge_transform_t **, bithenge_transform_t *,
     bithenge_expression_t **);
@@ -117 +136 @@
 int bithenge_inputless_transform(bithenge_transform_t **,
     bithenge_expression_t *);
-int bithenge_if_transform(bithenge_transform_t **, bithenge_expression_t *,
-    bithenge_transform_t *, bithenge_transform_t *);
+
+int bithenge_concat_blob(bithenge_node_t **, bithenge_blob_t *,
+    bithenge_blob_t *);
+int bithenge_concat_blob_lazy(bithenge_node_t **, bithenge_blob_t *,
+    bithenge_expression_t *, bithenge_scope_t *);
 
 #endif