Implement ( expr ) and improve stranding

1 files changed, 9 insertions, 0 deletions

diff --git a/apl9.h b/apl9.h
index 41ad5e2..4080a81 100644
--- a/apl9.h
+++ b/apl9.h
@@ -27,6 +27,7 @@ typedef enum
 
 /* Data types */
 typedef struct Array Array;
+typedef struct Expr Expr;
 typedef struct Datum Datum;
 
 struct Array
@@ -35,6 +36,7 @@ struct Array
 	int rank;
 	int *shape;
 	int size;
+	int stranded; /* 1 if build directly by stranding */
 	union {
 		char *rawdata;
 		vlong *intdata;
@@ -42,12 +44,19 @@ struct Array
 	};
 };
 
+struct Expr
+{
+	int ntoks;
+	Datum *toks;
+};
+
 struct Datum
 {
 	datumTag tag;
 	union {
 		Array *array;
 		int code;
+		Expr expr;
 	};
 };