4 files changed, 36 insertions(+), 1 deletions(-)

M array.c
M fns.h
M parse.c
M prim.c

@@ 79,6 79,18 @@ setshape(Array *a, int dim, usize size)
 	a->shape[dim] = size;
 }
 
+int
+getrank(Array *a)
+{
+	return a->rank;
+}
+
+usize
+getshape(Array *a, int dim)
+{
+	return a->shape[dim];
+}
+
 static int printarraysub(char *, Array *, int);
 static int
 printitem(char *p, Array *a, uvlong i, int depth)

@@ 5,6 5,9 @@ void setint(Array *, usize, vlong);
 void setchar(Array *, usize, Rune);
 void setarray(Array *, usize, Array *);
 void setshape(Array *, int, usize);
+int getrank(Array *);
+usize getshape(Array *, int);
+
 Array *simplifyarray(Array *);
 char *printarray(Array *);
 char *printfunc(Function *);

@@ 426,7 426,12 @@ parseconst(TokenList *t)
 	case TokString:
 		str = t->tokens[t->offset].string;
 		len = runestrlen(str);
-		val->val = allocarray(TypeChar, len != 1, len);
+		if(len == 1)
+			val->val = allocarray(TypeChar, 0, len);
+		else{
+			val->val = allocarray(TypeChar, 1, len);
+			setshape(val->val, 0, len);
+		}
 		for(uvlong i = 0; i < len; i++)
 			setchar(val->val, i, str[i]);
 		break;

@@ 9,6 9,7 @@
 
 /* monadic functions */
 static Array *primfn_same(Array *);
+static Array *primfn_shape(Array *);
 
 /* dyadic functions */
 static Array *primfn_left(Array *, Array *);


@@ 25,6 26,7 @@ struct {
 	"⊣", NameclassFunc, nil, primfn_same, primfn_left,
 	"+", NameclassFunc, nil, nil, nil,
 	"-", NameclassFunc, nil, nil, nil,
+	"⍴", NameclassFunc, nil, primfn_shape, nil,
 };
 
 char *


@@ 95,6 97,19 @@ primfn_same(Array *a)
 	return a;
 }
 
+static Array *
+primfn_shape(Array *a)
+{
+	Array *r;
+	int rank;
+
+	rank = getrank(a);
+	r = allocarray(TypeNumber, 1, rank);
+	for(int dim = 0; dim < rank; dim++)
+		setint(r, dim, getshape(a, dim));
+	return r;
+}
+
 /* dyadic functions */
 static Array *
 primfn_left(Array *x, Array *)