ndtypes 0.2.0dev5 → 0.2.0dev6

data/ext/ruby_ndtypes/ndtypes/libndtypes/tests/test_parse_roundtrip.c

@@ -276,6 +276,7 @@ const char *parse_roundtrip_tests[] = {
   /* BEGIN RANDOM */
   "fixed_bytes(size=1342281600, align=16)",
   "var * var * var * (...)",
+  "array of (...)",
   "categorical(-84, 18772, 49062, 1619552300, 'a', 'l')",
   "categorical(24, 44038, 1763886348, 2840608325, 1.2e-32, 'jOt')",
   "categorical(-2049848438, 94, 3577056037, 3599739756, 1.2e-32)",
@@ -283,12 +284,15 @@ const char *parse_roundtrip_tests[] = {
   "1286044356 * LbR6JPFI * 2096958782 * uint8",
   "categorical(-25910, 4265882500, 1.2e-32, 'xM3Mys0XqH')",
   "var * var * FixedBytesKind",
+  "array of FixedBytesKind",
   "var * var * var * fixed_bytes(size=2816010912, align=16)",
   "36 * 16 * fixed_bytes(size=912328236, align=2)",
   "var * var * var * ZcTmBXnKPi",
   "categorical(946986991, 43, 'omhwkoWVWw')",
   "var * float32",
+  "array of float32",
   "var * var * var * uint16",
+  "array of uint16",
   "var * var * var * ScalarKind",
   "fixed_bytes(size=280180300, align=2)",
   "fixed_string(1901614748, 'utf32')",
@@ -304,6 +308,7 @@ const char *parse_roundtrip_tests[] = {
   "fixed_bytes(size=1233209904, align=8)",
   "WhRsMHHXYp(categorical(145))",
   "var * var * bytes(align=2)",
+  "array of fixed_bytes(size=2882797900, align=2)",
   "categorical(-85, -49, -26791, 8094, 1780, 1.2e-32, 'pX')",
   "D6nfBg_(categorical(16278, 26651, 147170982, 1.2e-32, 'ylR7'))",
   "categorical(482331467, 3229733591, -1.2e-32, 1.2e-32)",
@@ -340,10 +345,21 @@ const char *parse_roundtrip_tests[] = {
   "!2 * 3 * uint8",
   "!2 * 3 * {a : !10 * 20 * int64, b : !10 * 2 * float64}",
 
+  /* Unions */
+  "[Int of int64]",
+  "[Int of int64 | Float of float32]",
+  "[Int of int64 | Union of [Complex of complex128 | Float of float32]]",
+  "2 * 10 * [Int of int64 | Union of [Complex of complex128 | Float of float32]]",
+  "2 * 10 * ([Int of int64 | Union of [Complex of complex128 | Float of float32]], [Some of bool])",
+
   /* Overflow */
   "9223372036854775807 * uint8",
   "1 * 1 * 9223372036854775807 * uint8",
 
+  /* var... and array... */
+  "var... * float64",
+  "array... of float64",
+
   /* END MANUALLY GENERATED */
 
   NULL

data/ext/ruby_ndtypes/ndtypes/libndtypes/tests/test_record.c

@@ -90,7 +90,7 @@ test_struct_align_pack(void)
     packed_with_trailing_padding_t packed_with_trail;
     aligned_t aligned;
     ndt_context_t *ctx;
-    ndt_t *t;
+    const ndt_t *t;
 
     ctx = ndt_context_new();
     if (ctx == NULL) {
@@ -127,7 +127,7 @@ test_struct_align_pack(void)
         fprintf(stderr, "test_struct_align_pack: packed_no_trail: FAIL");
         ndt_context_del(ctx);
     }
-    ndt_del(t);
+    ndt_decref(t);
 
 
     t = ndt_from_string(s1_abbrev, ctx);
@@ -159,7 +159,7 @@ test_struct_align_pack(void)
         fprintf(stderr, "test_struct_align_pack: packed_no_trail_abbrev: FAIL\n");
         ndt_context_del(ctx);
     }
-    ndt_del(t);
+    ndt_decref(t);
 
 
     t = ndt_from_string(s2, ctx);
@@ -191,7 +191,7 @@ test_struct_align_pack(void)
         fprintf(stderr, "test_struct_align_pack: packed_with_trail: FAIL");
         ndt_context_del(ctx);
     }
-    ndt_del(t);
+    ndt_decref(t);
 
 
     t = ndt_from_string(s3, ctx);
@@ -219,7 +219,7 @@ test_struct_align_pack(void)
         fprintf(stderr, "test_struct_align_pack: aligned: FAIL");
         ndt_context_del(ctx);
     }
-    ndt_del(t);
+    ndt_decref(t);
 
     fprintf(stderr, "test_struct_align_pack (4 test cases)\n");
 

data/ext/ruby_ndtypes/ndtypes/libndtypes/tests/test_typecheck.c

@@ -37,339 +37,792 @@
 
 const typecheck_testcase_t typecheck_tests[] = {
 
-  { .signature="void -> float32",
-    .in={NULL},
-    .out={"float32"},
-    .broadcast={NULL},
-    .outer_dims=0,
-    .success=true },
+  { .loc = loc(),
+    .success=true,
 
-  { .signature="T -> T",
-    .in={"T"},
-    .out={NULL},
-    .broadcast={NULL},
-    .outer_dims=0,
-    .success=false },
+    .signature="void -> float32",
+    .args={NULL},
+    .kwargs={NULL},
 
-  { .signature="T -> T",
-    .in={"int64"},
-    .out={"int64"},
-    .broadcast={NULL},
     .outer_dims=0,
-    .success=true },
+    .nin=0,
+    .nout=1,
+    .nargs=1,
+    .types={"float32"} },
 
-  { .signature="M*N*T, N*P*T -> M*P*T",
-    .in={"2 * 3 * int64", "3 * 10 * int64"},
-    .out={"2 * 10 * int64"},
-    .broadcast={NULL},
-    .outer_dims=0,
-    .success=true },
+  { .loc = loc(),
+    .success=true,
+
+    .signature="void -> float32",
+    .args={NULL},
+    .kwargs={"float32"},
 
-  { .signature="Dims... *M*N*T, Dims... *N*P*T -> Dims... *M*P*T",
-    .in={"2 * 3 * int64", "3 * 10 * int64"},
-    .out={"2 * 10 * int64"},
-    .broadcast={NULL},
     .outer_dims=0,
-    .success=true },
+    .nin=0,
+    .nout=1,
+    .nargs=1,
+    .types={"float32"} },
 
-  { .signature="Dims... *M*N*T, Dims... *N*P*T -> Dims... *M*P*T",
-    .in={"100 * 2 * 3 * int64", "100 * 3 * 10 * int64"},
-    .out={"100 * 2 * 10 * int64"},
-    .broadcast={NULL},
-    .outer_dims=1,
-    .success=true },
+  { .loc = loc(),
+    .success=false,
 
-  { .signature="Dims... *M*N*T, Dims... *N*P*T -> Dims... *M*P*T",
-    .in={"2 * 3 * int64", "3 * 10 * int32"},
-    .out={NULL},
-    .broadcast={NULL},
-    .outer_dims=0,
-    .success=false },
+    .signature="T -> T",
+    .args={"T"},
+    .kwargs={NULL} },
+
+  { .loc = loc(),
+    .success=false,
+
+    .signature="T -> T",
+    .args={"T"},
+    .kwargs={"T"} },
+
+  { .loc = loc(),
+    .success=true,
+
+    .signature="T -> T",
+    .args={"int64"},
+    .kwargs={NULL},
 
-  { .signature="Dims... *M*N*T, Dims... *N*P*T -> Dims... *M*P*T",
-    .in={"3 * int64", "3 * 10 * int64"},
-    .out={NULL},
-    .broadcast={NULL},
     .outer_dims=0,
-    .success=false },
+    .nin=1,
+    .nout=1,
+    .nargs=2,
+    .types={"int64", "int64"} },
 
-  { .signature="Dims... * M*N*T, Dims... * N*P*T -> Dims... *M*T",
-    .in={"10 * 2 * 3 * int64", "10 * 3 * 10 * int64"},
-    .out={"10 * 2 * int64"},
-    .broadcast={NULL},
-    .outer_dims=1,
-    .success=true },
 
-  { .signature="Dims... * M*T, Dims... * N*T -> Dims... * M*T",
-    .in={"2 * 3 * int64", "3 * 3 * int64"},
-    .out={NULL},
-    .broadcast={NULL},
+  { .loc = loc(),
+    .success=true,
+
+    .signature="T -> T",
+    .args={"int64"},
+    .kwargs={"int64"},
+
     .outer_dims=0,
-    .success=false },
+    .nin=1,
+    .nout=1,
+    .nargs=2,
+    .types={"int64", "int64"} },
+
+
+  { .loc = loc(),
+    .success=false,
+
+    .signature="T -> T",
+    .args={"int64"},
+    .kwargs={"int32"} },
+
+  { .loc = loc(),
+    .success=true,
+
+    .signature="M*N*T, N*P*T -> M*P*T",
+    .args={"2 * 3 * int64", "3 * 10 * int64"},
+    .kwargs={NULL},
 
-  { .signature="Dims... * M*T, Dims... * N*T -> Dims... * M*T",
-    .in={"2 * 3 * int64", "3 * 3 * int64"},
-    .out={NULL},
-    .broadcast={NULL},
     .outer_dims=0,
-    .success=false },
+    .nin=2,
+    .nout=1,
+    .nargs=3,
+    .types={"2 * 3 * int64", "3 * 10 * int64", "2 * 10 * int64"} },
+
+  { .loc = loc(),
+    .success=true,
+
+    .signature="M*N*T, N*P*T -> M*P*T",
+    .args={"2 * 3 * int64", "3 * 10 * int64"},
+    .kwargs={"2 * 10 * int64"},
 
-  { .signature="M*N*T, N*P*T -> M*P*T",
-    .in={"2 * 3 * int64", "2 * 10 * int64"},
-    .out={NULL},
-    .broadcast={NULL},
     .outer_dims=0,
-    .success=false },
+    .nin=2,
+    .nout=1,
+    .nargs=3,
+    .types={"2 * 3 * int64", "3 * 10 * int64", "2 * 10 * int64"} },
+
+  { .loc = loc(),
+    .success=false,
+
+    .signature="M*N*T, N*P*T -> M*P*T",
+    .args={"2 * 3 * int64", "3 * 10 * int64", "3 * 10 * int64"},
+    .kwargs={NULL} },
+
+  { .loc = loc(),
+    .success=true,
+
+    .signature="Dims... *M*N*T, Dims... *N*P*T -> Dims... *M*P*T",
+    .args={"2 * 3 * int64", "3 * 10 * int64"},
+    .kwargs={NULL},
 
-  { .signature="M*N*T, N*P*T -> M*P*T",
-    .in={"2 * 3 * int64", "3 * 10 * int32"},
-    .out={NULL},
-    .broadcast={NULL},
     .outer_dims=0,
-    .success=false },
+    .nin=2,
+    .nout=1,
+    .nargs=3,
+    .types={"2 * 3 * int64", "3 * 10 * int64", "2 * 10 * int64"} },
+
+  { .loc = loc(),
+    .success=true,
+
+    .signature="Dims... *M*N*T, Dims... *N*P*T -> Dims... *M*P*T",
+    .args={"2 * 3 * int64", "3 * 10 * int64"},
+    .kwargs={"2 * 10 * int64"},
 
-  { .signature="Dims... * M*N*T, Dims... * N*P*T -> Dims... *M*P*T",
-    .in={"3 * int64", "3 * 10 * int64"},
-    .out={NULL},
-    .broadcast={NULL},
     .outer_dims=0,
-    .success=false },
+    .nin=2,
+    .nout=1,
+    .nargs=3,
+    .types={"2 * 3 * int64", "3 * 10 * int64", "2 * 10 * int64"} },
+
+  { .loc = loc(),
+    .success=true,
+
+    .signature="Dims... *M*N*T, Dims... *N*P*T -> Dims... *M*P*T",
+    .args={"100 * 2 * 3 * int64", "100 * 3 * 10 * int64"},
+    .kwargs={NULL},
+
+    .outer_dims=1,
+    .nin=2,
+    .nout=1,
+    .nargs=3,
+    .types={"100 * 2 * 3 * int64", "100 * 3 * 10 * int64", "100 * 2 * 10 * int64"} },
+
+  { .loc = loc(),
+    .success=true,
+
+    .signature="Dims... *M*N*T, Dims... *N*P*T -> Dims... *M*P*T",
+    .args={"100 * 2 * 3 * int64", "100 * 3 * 10 * int64"},
+    .kwargs={"100 * 2 * 10 * int64"},
+
+    .outer_dims=1,
+    .nin=2,
+    .nout=1,
+    .nargs=3,
+    .types={"100 * 2 * 3 * int64", "100 * 3 * 10 * int64", "100 * 2 * 10 * int64"} },
+
+  { .loc = loc(),
+    .success=false,
+
+    .signature="Dims... *M*N*T, Dims... *N*P*T -> Dims... *M*P*T",
+    .args={"100 * 2 * 3 * int64", "100 * 3 * 10 * int64"},
+    .kwargs={"100 * 2 * 20 * int64"} },
+
+  { .loc = loc(),
+    .success=false,
+
+    .signature="Dims... *M*N*T, Dims... *N*P*T -> Dims... *M*P*T",
+    .args={"2 * 3 * int64", "3 * 10 * int32"},
+    .kwargs={NULL} },
+
+  { .loc = loc(), 
+    .success=false,
+
+    .signature="Dims... *M*N*T, Dims... *N*P*T -> Dims... *M*P*T",
+    .args={"3 * int64", "3 * 10 * int64"},
+    .kwargs={NULL} },
+
+  { .loc = loc(),
+    .success=true,
+
+    .signature="Dims... * M*N*T, Dims... * N*P*T -> Dims... *M*T",
+    .args={"10 * 2 * 3 * int64", "10 * 3 * 10 * int64"},
+    .kwargs={NULL},
 
-  { .signature="Dims... * M*N*T, Dims... *N*P*T -> Dims... *M*P*T",
-    .in={"100 * 2 * 3 * int64", "100 * 3 * 10 * int64"},
-    .out={"100 * 2 * 10 * int64"},
-    .broadcast={NULL},
     .outer_dims=1,
-    .success=true },
+    .nin=2,
+    .nout=1,
+    .nargs=3,
+    .types={"10 * 2 * 3 * int64", "10 * 3 * 10 * int64", "10 * 2 * int64"} },
+
+  { .loc = loc(),
+    .success=true,
+
+    .signature="Dims... * M*N*T, Dims... * N*P*T -> Dims... *M*T",
+    .args={"10 * 2 * 3 * int64", "10 * 3 * 10 * int64"},
+    .kwargs={"10 * 2 * int64"},
 
-  { .signature="Dims... * M*N*T, Dims... *N*P*T -> Dims... *M*P*T",
-    .in={"400 * 2 * 3 * int64", "400 * 3 * 10 * int64"},
-    .out={"400 * 2 * 10 * int64"},
-    .broadcast={NULL},
     .outer_dims=1,
-    .success=true },
+    .nin=2,
+    .nout=1,
+    .nargs=3,
+    .types={"10 * 2 * 3 * int64", "10 * 3 * 10 * int64", "10 * 2 * int64"} },
+
+  { .loc = loc(),
+    .success=false,
+
+    .signature="Dims... * M*T, Dims... * N*T -> Dims... * M*T",
+    .args={"2 * 3 * int64", "3 * 3 * int64"},
+    .kwargs={NULL} },
+
+  { .loc = loc(),
+    .success=false,
+
+    .signature="Dims... * M*T, Dims... * N*T -> Dims... * M*T",
+    .args={"2 * 3 * int64", "3 * 3 * int64"},
+    .kwargs={"3 * 3 * int64"} },
+
+  { .loc = loc(),
+    .success=false,
+
+    .signature="Dims... * M*T, Dims... * N*T -> Dims... * M*T",
+    .args={"2 * 3 * int64", "3 * 3 * int64"},
+    .kwargs={NULL} },
+
+  { .loc = loc(),
+    .success=false,
+
+    .signature="M*N*T, N*P*T -> M*P*T",
+    .args={"2 * 3 * int64", "2 * 10 * int64"},
+    .kwargs={NULL} },
+
+  { .loc = loc(),
+    .success=false,
+
+    .signature="M*N*T, N*P*T -> M*P*T",
+    .args={"2 * 3 * int64", "3 * 10 * int32"},
+    .kwargs={NULL} },
+
+  { .loc = loc(),
+    .success=false,
+
+    .signature="Dims... * M*N*T, Dims... * N*P*T -> Dims... *M*P*T",
+    .args={"3 * int64", "3 * 10 * int64"},
+    .kwargs={NULL} },
+
+  { .loc = loc(),
+    .success=true,
+
+    .signature="Dims... * M*N*T, Dims... * N*P*T -> Dims... * M*P*T",
+    .args={"1000 * 400 * 2 * 3 * int64", "1000 * 400 * 3 * 10 * int64"},
+    .kwargs={NULL},
+
+    .outer_dims=2,
+    .nin=2,
+    .nout=1,
+    .nargs=3,
+    .types = { "1000 * 400 * 2 * 3 * int64",
+               "1000 * 400 * 3 * 10 * int64",
+               "1000 * 400 * 2 * 10 * int64"} },
+
+  { .loc = loc(),
+    .success=true,
+
+    .signature="Dims... * M*N*T, Dims... * N*P*T -> Dims... * M*P*T",
+    .args={"1000 * 400 * 2 * 3 * int64", "1000 * 400 * 3 * 10 * int64"},
+    .kwargs={"1000 * 400 * 2 * 10 * int64"},
 
-  { .signature="Dims... * M*N*T, Dims... * N*P*T -> Dims... * M*P*T",
-    .in={"1000 * 400 * 2 * 3 * int64", "1000 * 400 * 3 * 10 * int64"},
-    .out={"1000 * 400 * 2 * 10 * int64"},
-    .broadcast={NULL},
     .outer_dims=2,
-    .success=true },
+    .nin=2,
+    .nout=1,
+    .nargs=3,
+    .types = { "1000 * 400 * 2 * 3 * int64",
+               "1000 * 400 * 3 * 10 * int64",
+               "1000 * 400 * 2 * 10 * int64"} },
+
+  { .loc = loc(),
+    .success=true,
+
+    .signature="Dims... * M*N*T, Dims... *N*P*T -> Dims... * M*P*T",
+    .args={"2 * 3 * 1000 * 400 * 2 * 3 * int64", "2 * 3 * 1000 * 400 * 3 * 10 * int64"},
+    .kwargs={"2 * 3 * 1000 * 400 * 2 * 10 * int64"},
 
-  { .signature="Dims... * M*N*T, Dims... *N*P*T -> Dims... * M*P*T",
-    .in={"2 * 3 * 1000 * 400 * 2 * 3 * int64", "2 * 3 * 1000 * 400 * 3 * 10 * int64"},
-    .out={"2 * 3 * 1000 * 400 * 2 * 10 * int64"},
-    .broadcast={NULL},
     .outer_dims=4,
-    .success=true },
+    .nin=2,
+    .nout=1,
+    .nargs=3,
+    .types = { "2 * 3 * 1000 * 400 * 2 * 3 * int64",
+               "2 * 3 * 1000 * 400 * 3 * 10 * int64",
+               "2 * 3 * 1000 * 400 * 2 * 10 * int64"} },
+
+  { .loc = loc(),
+    .success=false,
+
+    .signature="Dims... * M*N*T, Dims... *N*P*T -> Dims... * M*P*T",
+    .args={"2 * 3 * 1000 * 400 * 2 * 3 * int64", "2 * 3 * 1000 * 400 * 3 * 10 * int64"},
+    .kwargs={"2 * 3 * 100 * 400 * 2 * 10 * int64"} },
+
+  { .loc = loc(),
+    .success=true,
+
+    .signature="D... * int64 -> D... * int64",
+    .args={"2 * 3 * int64"},
+    .kwargs={NULL},
+
+    .outer_dims=2,
+    .nin=1,
+    .nout=1,
+    .nargs=2,
+    .types = { "2 * 3 * int64", "2 * 3 * int64"} },
+
+  { .loc = loc(),
+    .success=true,
+
+    .signature="D... * int64 -> D... * int64",
+    .args={"2 * 3 * int64"},
+    .kwargs={"2 * 3 * int64"},
+
+    .outer_dims=2,
+    .nin=1,
+    .nout=1,
+    .nargs=2,
+    .types = { "2 * 3 * int64", "2 * 3 * int64"} },
+
+  { .loc = loc(),
+    .success=false,
+
+    .signature="D... * int64 -> D... * int64",
+    .args={"2 * 3 * int64"},
+    .kwargs={"2 * 3 * float32"} },
+
+  { .loc = loc(),
+    .success=true,
+
+    .signature="... * int64 -> ... * int64",
+    .args={"2 * 3 * int64"},
+    .kwargs={NULL},
 
-  { .signature="D... * int64 -> D... * int64",
-    .in={"2 * 3 * int64"},
-    .out={"2 * 3 * int64"},
-    .broadcast={NULL},
     .outer_dims=2,
-    .success=true },
+    .nin=1,
+    .nout=1,
+    .nargs=2,
+    .types = { "2 * 3 * int64", "2 * 3 * int64"} },
+
+  { .loc = loc(),
+    .success=true,
+
+    .signature="... * int64 -> ... * int64",
+    .args={"2 * 3 * int64"},
+    .kwargs={"2 * 3 * int64"},
 
-  { .signature="... * int64 -> ... * int64",
-    .in={"2 * 3 * int64"},
-    .out={"2 * 3 * int64"},
-    .broadcast={"2 * 3 * int64"},
     .outer_dims=2,
-    .success=true },
+    .nin=1,
+    .nout=1,
+    .nargs=2,
+    .types = { "2 * 3 * int64", "2 * 3 * int64"} },
+
+  { .loc = loc(),
+    .success=false,
+
+    .signature="... * int64 -> ... * int64",
+    .args={"2 * 3 * int64"},
+    .kwargs={"2 * 4 * int64"} },
+
+
+  { .loc = loc(),
+    .success=false,
+
+    .signature="... * int64 -> ... * int64",
+    .args={"2 * 3 * int64"},
+    .kwargs={"2 * 3 * int64", "2 * 3 * int64"} },
+
+  { .loc = loc(),
+    .success=true,
+
+    .signature="... * int64, ... * int64 -> ... * int64",
+    .args={"2 * 3 * int64", "10 * 2 * 3 * int64"},
+    .kwargs = {NULL},
+
+    .outer_dims=3,
+    .nin=2,
+    .nout=1,
+    .nargs=3,
+    .types = { "fixed(shape=10, step=0) * 2 * 3 * int64",
+               "10 * 2 * 3 * int64",
+               "10 * 2 * 3 * int64" } },
+
+  { .loc = loc(),
+    .success=true,
+
+    .signature="... * int64, ... * int64 -> ... * int64",
+    .args={"2 * 3 * int64", "10 * 2 * 3 * int64"},
+    .kwargs = {"10 * 2 * 3 * int64"},
 
-  { .signature="... * int64, ... * int64 -> ... * int64",
-    .in={"2 * 3 * int64", "10 * 2 * 3 * int64"},
-    .out={"10 * 2 * 3 * int64"},
-    .broadcast={"fixed(shape=10, step=0) * 2 * 3 * int64", "10 * 2 * 3 * int64"},
     .outer_dims=3,
-    .success=true },
+    .nin=2,
+    .nout=1,
+    .nargs=3,
+    .types = { "fixed(shape=10, step=0) * 2 * 3 * int64",
+               "10 * 2 * 3 * int64",
+               "10 * 2 * 3 * int64" } },
+
+  { .loc = loc(),
+    .success=true,
+
+    .signature="... * N * int64,      ... * int64 -> ... * int64",
+    .args={"2 * 3 * int64", "10 * 2 * int64"},
+    .kwargs={NULL},
 
-  { .signature="... * N * int64,      ... * int64 -> ... * int64",
-    .in={"2 * 3 * int64", "10 * 2 * int64"},
-    .out={"10 * 2 * int64"},
-    .broadcast={"fixed(shape=10, step=0) * 2 * 3 * int64", "10 * 2 * int64"},
     .outer_dims=2,
-    .success=true },
+    .nin=2,
+    .nout=1,
+    .nargs=3,
+    .types = { "fixed(shape=10, step=0) * 2 * 3 * int64",
+               "10 * 2 * int64",
+               "10 * 2 * int64" } },
+
+  { .loc = loc(),
+    .success=true,
+
+    .signature="... * N * int64, ... * int64 -> ... * int64",
+    .args={"2 * 3 * int64", "20 * 10 * 2 * int64"},
+    .kwargs={NULL},
 
-  { .signature="... * N * int64, ... * int64 -> ... * int64",
-    .in={"2 * 3 * int64", "20 * 10 * 2 * int64"},
-    .out={"20 * 10 * 2 * int64"},
-    .broadcast={"fixed(shape=20, step=0) * fixed(shape=10, step=0) * 2 * 3 * int64", "20 * 10 * 2 * int64"},
     .outer_dims=3,
-    .success=true },
+    .nin=2,
+    .nout=1,
+    .nargs=3,
+    .types = { "fixed(shape=20, step=0) * fixed(shape=10, step=0) * 2 * 3 * int64",
+               "20 * 10 * 2 * int64",
+               "20 * 10 * 2 * int64" } },
+
+  { .loc = loc(),
+    .success=true,
+
+    .signature="... * N * int64, ... * int64 -> ... * N * int64",
+    .args={"2 * 3 * int64", "20 * 10 * 2 * int64"},
+    .kwargs={NULL},
 
-  { .signature="... * N * int64, ... * int64 -> ... * N * int64",
-    .in={"2 * 3 * int64", "20 * 10 * 2 * int64"},
-    .out={"20 * 10 * 2 * 3 * int64"},
-    .broadcast={"fixed(shape=20, step=0) * fixed(shape=10, step=0) * 2 * 3 * int64", "20 * 10 * 2 * int64"},
     .outer_dims=3,
-    .success=true },
+    .nin=2,
+    .nout=1,
+    .nargs=3,
+    .types = { "fixed(shape=20, step=0) * fixed(shape=10, step=0) * 2 * 3 * int64",
+               "20 * 10 * 2 * int64",
+               "20 * 10 * 2 * 3 * int64" } },
 
-  { .signature="var... * int64 -> var... * int64",
-    .in={"2 * 3 * int64"},
-    .out={NULL},
-    .broadcast={NULL},
-    .outer_dims=0,
-    .success=false },
+  { .loc = loc(),
+    .success=false,
 
-  { .signature="A... * int64 -> A... * int64",
-    .in={"var(offsets=[0,2]) * int64"},
-    .out={NULL},
-    .broadcast={NULL},
-    .outer_dims=0,
-    .success=false },
+    .signature="var... * int64 -> var... * int64",
+    .args={"2 * 3 * int64"},
+    .kwargs={NULL} },
+
+  { .loc = loc(),
+    .success=false,
+
+    .signature="A... * int64 -> A... * int64",
+    .args={"var(offsets=[0,2]) * int64"},
+    .kwargs={NULL} },
+
+  { .loc = loc(),
+    .success=true,
+
+    .signature="var... * int64 -> var... * int64",
+    .args={"var(offsets=[0,2]) * int64"},
+    .kwargs={NULL},
 
-  { .signature="var... * int64 -> var... * int64",
-    .in={"var(offsets=[0,2]) * int64"},
-    .out={"var(offsets=[0,2]) * int64"},
-    .broadcast={NULL},
     .outer_dims=1,
-    .success=true },
+    .nin=1,
+    .nout=1,
+    .nargs=2,
+    .types = { "var(offsets=[0,2]) * int64", "var(offsets=[0,2]) * int64" } },
+
+
+  { .loc = loc(),
+    .success=true,
+
+    .signature="var... * int64 -> var... * int64",
+    .args={"var(offsets=[0,2]) * var(offsets=[0,4,10]) * int64"},
+    .kwargs={"var(offsets=[0,2]) * var(offsets=[0,4,10]) * int64"},
 
-  { .signature="var... * int64 -> var... * int64",
-    .in={"var(offsets=[0,2]) * var(offsets=[0,4,10]) * int64"},
-    .out={"var(offsets=[0,2]) * var(offsets=[0,4,10]) * int64"},
-    .broadcast={NULL},
     .outer_dims=2,
-    .success=true },
+    .nin=1,
+    .nout=1,
+    .nargs=2,
+    .types = { "var(offsets=[0,2]) * var(offsets=[0,4,10]) * int64",
+               "var(offsets=[0,2]) * var(offsets=[0,4,10]) * int64" } },
+
+  { .loc = loc(),
+    .success=true,
+
+    .signature="var... * int64 -> var... * int64",
+    .args={"var(offsets=[0,2]) * var(offsets=[0,4,10]) * int64"},
+    .kwargs={NULL},
 
-  { .signature="var... * int64 -> var... * int64",
-    .in={"var(offsets=[0,2]) * var(offsets=[0,4,10]) * int64"},
-    .out={"var(offsets=[0,2]) * var(offsets=[0,4,10]) * int64"},
-    .broadcast={NULL},
     .outer_dims=2,
-    .success=true },
+    .nin=1,
+    .nout=1,
+    .nargs=2,
+    .types={ "var(offsets=[0,2]) * var(offsets=[0,4,10]) * int64",
+             "var(offsets=[0,2]) * var(offsets=[0,4,10]) * int64"} },
+
+  { .loc = loc(),
+    .success=true,
+
+    .signature="var... * int64, var... * int64 -> var... * int64",
+    .args={ "var(offsets=[0,2]) * int64",
+            "var(offsets=[0,2]) * int64" },
+    .kwargs={NULL},
 
-  { .signature="var... * int64, var... * int64 -> var... * int64",
-    .in={"var(offsets=[0,2]) * int64",
-         "var(offsets=[0,2]) * int64"},
-    .out={"var(offsets=[0,2]) * int64"},
-    .broadcast={NULL},
     .outer_dims=1,
-    .success=true },
+    .nin=2,
+    .nout=1,
+    .nargs=3,
+    .types={ "var(offsets=[0,2]) * int64",
+             "var(offsets=[0,2]) * int64",
+             "var(offsets=[0,2]) * int64"} },
 
-  { .signature="var... * int64, var... * int64 -> var... * int64",
-    .in={"var(offsets=[0,3]) * int64",
-         "var(offsets=[0,2]) * int64"},
-    .out={NULL},
-    .broadcast={NULL},
-    .outer_dims=0,
-    .success=false },
+  { .loc = loc(),
+    .success=false,
+
+    .signature="var... * int64, var... * int64 -> var... * int64",
+    .args={ "var(offsets=[0,3]) * int64",
+            "var(offsets=[0,2]) * int64" },
+    .kwargs={NULL} },
+
+  { .loc = loc(),
+    .success=true,
+
+    .signature="var... * int64, var... * int64 -> var... * int64",
+    .args={ "var(offsets=[0,2]) * var(offsets=[0,4,10]) * int64",
+            "var(offsets=[0,2]) * var(offsets=[0,4,10]) * int64" },
+    .kwargs={NULL},
 
-  { .signature="var... * int64, var... * int64 -> var... * int64",
-    .in={"var(offsets=[0,2]) * var(offsets=[0,4,10]) * int64",
-         "var(offsets=[0,2]) * var(offsets=[0,4,10]) * int64"},
-    .out={"var(offsets=[0,2]) * var(offsets=[0,4,10]) * int64"},
-    .broadcast={NULL},
     .outer_dims=2,
-    .success=true },
+    .nin=2,
+    .nout=1,
+    .nargs=3,
+    .types={ "var(offsets=[0,2]) * var(offsets=[0,4,10]) * int64",
+             "var(offsets=[0,2]) * var(offsets=[0,4,10]) * int64",
+             "var(offsets=[0,2]) * var(offsets=[0,4,10]) * int64" } },
 
-  { .signature="var... * int64, var... * int64 -> var... * int64",
-    .in={"var(offsets=[0,2]) * var(offsets=[0,4,11]) * int64",
-         "var(offsets=[0,2]) * var(offsets=[0,4,10]) * int64"},
-    .out={NULL},
-    .broadcast={NULL},
-    .outer_dims=0,
-    .success=false },
+  { .loc = loc(),
+    .success=false,
+
+    .signature="var... * int64, var... * int64 -> var... * int64",
+    .args={ "var(offsets=[0,2]) * var(offsets=[0,4,11]) * int64",
+            "var(offsets=[0,2]) * var(offsets=[0,4,10]) * int64" },
+    .kwargs={NULL} },
+
+  { .loc = loc(),
+    .success=false,
+
+    .signature="var... * int64, var... * int64 -> var... * int64",
+    .args={ "var(offsets=[0,3]) * var(offsets=[0,4,10,20]) * int64",
+            "var(offsets=[0,2]) * var(offsets=[0,4,10]) * int64" },
+    .kwargs={NULL} },
+
+  { .loc = loc(),
+    .success=true,
+
+    .signature="var * var * (int32, float64), int32 -> var * var * int32",
+    .args={ "var(offsets=[0,3]) * var(offsets=[0,4,10,20]) * (int32, float64)",
+            "int32" },
+    .kwargs={NULL},
 
-  { .signature="var... * int64, var... * int64 -> var... * int64",
-    .in={"var(offsets=[0,3]) * var(offsets=[0,4,10,20]) * int64",
-         "var(offsets=[0,2]) * var(offsets=[0,4,10]) * int64"},
-    .out={NULL},
-    .broadcast={NULL},
     .outer_dims=0,
-    .success=false },
+    .nin=2,
+    .nout=1,
+    .nargs=3,
+    .types={ "var(offsets=[0,3]) * var(offsets=[0,4,10,20]) * (int32, float64)",
+             "int32",
+             "var * var * int32"} },
+
+  { .loc = loc(),
+    .success=true,
+
+    .signature="... * C[2 * 3 * float64], ... * F[3 * 4 * float32] -> ... * F[10 * 2 * float64]",
+    .args={"2 * 3 * float64", "!3 * 4 * float32"},
+    .kwargs={NULL},
 
-  { .signature="var * var * (int32, float64), int32 -> var * var * int32",
-    .in={"var(offsets=[0,3]) * var(offsets=[0,4,10,20]) * (int32, float64)",
-         "int32"},
-    .out={"var * var * int32"},
-    .broadcast={NULL},
     .outer_dims=0,
-    .success=true },
+    .nin=2,
+    .nout=1,
+    .nargs=3,
+    .types={ "2 * 3 * float64", "!3 * 4 * float32", "!10 * 2 * float64" } },
+
+  { .loc = loc(),
+    .success=true,
+
+    .signature="... * C[2 * 3 * float64], ... * F[3 * 4 * float32] -> ... * F[10 * 2 * float64]",
+    .args={"2 * 3 * float64", "!3 * 4 * float32"},
+    .kwargs={"!10 * 2 * float64"},
 
-  { .signature="... * C[2 * 3 * float64], ... * F[3 * 4 * float32] -> ... * F[10 * 2 * float64]",
-    .in={"2 * 3 * float64", "!3 * 4 * float32"},
-    .out={"!10 * 2 * float64"},
-    .broadcast={"2 * 3 * float64", "!3 * 4 * float32"},
     .outer_dims=0,
-    .success=true },
+    .nin=2,
+    .nout=1,
+    .nargs=3,
+    .types={ "2 * 3 * float64", "!3 * 4 * float32", "!10 * 2 * float64" } },
+
+  { .loc = loc(),
+    .success=false,
+
+    .signature="... * C[2 * 3 * float64], ... * F[3 * 4 * float32] -> ... * F[10 * 2 * float64]",
+    .args={"2 * 3 * float64", "!3 * 4 * float32"},
+    .kwargs={"10 * 2 * float64"} },
+
+  { .loc = loc(),
+    .success=true,
+
+    .signature="... * C[2 * 3 * float64], ... * F[3 * 4 * float32] -> ... * F[10 * 2 * float64]",
+    .args={ "20 * 2 * 3 * float64", "20 * !3 * 4 * float32" },
+    .kwargs={NULL},
 
-  { .signature="... * C[2 * 3 * float64], ... * F[3 * 4 * float32] -> ... * F[10 * 2 * float64]",
-    .in={"20 * 2 * 3 * float64", "20 * !3 * 4 * float32"},
-    .out={"20 * !10 * 2 * float64"},
-    .broadcast={"20 * 2 * 3 * float64", "20 * !3 * 4 * float32"},
     .outer_dims=1,
-    .success=true },
+    .nin=2,
+    .nout=1,
+    .nargs=3,
+    .types={ "20 * 2 * 3 * float64", "20 * !3 * 4 * float32", "20 * !10 * 2 * float64"} },
+
+  { .loc = loc(),
+    .success=true,
+
+    .signature="... * C[2 * 3 * float64], ... * F[3 * 4 * float32] -> ... * F[10 * 2 * float64]",
+    .args={ "20 * 2 * 3 * float64", "!3 * 4 * float32" },
+    .kwargs={NULL},
 
-  { .signature="... * C[2 * 3 * float64], ... * F[3 * 4 * float32] -> ... * F[10 * 2 * float64]",
-    .in={"20 * 2 * 3 * float64", "!3 * 4 * float32"},
-    .out={"20 * !10 * 2 * float64"},
-    .broadcast={"20 * 2 * 3 * float64", "fixed(shape=20, step=0) * !3 * 4 * float32"},
     .outer_dims=1,
-    .success=true },
+    .nin=2,
+    .nout=1,
+    .nargs=3,
+    .types={ "20 * 2 * 3 * float64",
+             "fixed(shape=20, step=0) * !3 * 4 * float32",
+             "20 * !10 * 2 * float64" } },
+
+  { .loc = loc(),
+    .success=true,
+
+    .signature="... * C[2 * 3 * float64], ... * F[3 * 4 * float32] -> ... * F[10 * 2 * float64]",
+    .args={ "2 * 3 * float64", "20 * 30 * !3 * 4 * float32" },
+    .kwargs={NULL},
 
-  { .signature="... * C[2 * 3 * float64], ... * F[3 * 4 * float32] -> ... * F[10 * 2 * float64]",
-    .in={"2 * 3 * float64", "20 * 30 * !3 * 4 * float32"},
-    .out={"20 * 30 * !10 * 2 * float64"},
-    .broadcast={"fixed(shape=20, step=0) * fixed(shape=30, step=0) * 2 * 3 * float64",
-                "20 * 30 * !3 * 4 * float32"},
     .outer_dims=2,
-    .success=true },
+    .nin=2,
+    .nout=1,
+    .nargs=3,
+    .types={ "fixed(shape=20, step=0) * fixed(shape=30, step=0) * 2 * 3 * float64",
+             "20 * 30 * !3 * 4 * float32",
+             "20 * 30 * !10 * 2 * float64"} },
+
+  { .loc = loc(),
+    .success=true,
+
+    .signature="... * C[2 * 3 * float64], ... * F[3 * 4 * float32] -> ... * C[10 * 2 * float64]",
+    .args={"2 * 3 * float64", "20 * 30 * !3 * 4 * float32"},
+    .kwargs={NULL},
 
-  { .signature="... * C[2 * 3 * float64], ... * F[3 * 4 * float32] -> ... * C[10 * 2 * float64]",
-    .in={"2 * 3 * float64", "20 * 30 * !3 * 4 * float32"},
-    .out={"20 * 30 * 10 * 2 * float64"},
-    .broadcast={"fixed(shape=20, step=0) * fixed(shape=30, step=0) * 2 * 3 * float64",
-                "20 * 30 * !3 * 4 * float32"},
     .outer_dims=2,
-    .success=true },
+    .nin=2,
+    .nout=1,
+    .nargs=3,
+    .types={ "fixed(shape=20, step=0) * fixed(shape=30, step=0) * 2 * 3 * float64",
+             "20 * 30 * !3 * 4 * float32", 
+             "20 * 30 * 10 * 2 * float64" } },
+
+  { .loc = loc(),
+    .success=true,
+
+    .signature="... * C[2 * 3 * float64], ... * F[3 * 4 * float32] -> C[... * 10 * 2 * float64]",
+    .args={"2 * 3 * float64", "20 * 30 * !3 * 4 * float32"},
+    .kwargs={NULL},
 
-  { .signature="... * C[2 * 3 * float64], ... * F[3 * 4 * float32] -> C[... * 10 * 2 * float64]",
-    .in={"2 * 3 * float64", "20 * 30 * !3 * 4 * float32"},
-    .out={"20 * 30 * 10 * 2 * float64"},
-    .broadcast={"fixed(shape=20, step=0) * fixed(shape=30, step=0) * 2 * 3 * float64",
-                "20 * 30 * !3 * 4 * float32"},
     .outer_dims=2,
-    .success=true },
+    .nin=2,
+    .nout=1,
+    .nargs=3,
+    .types={ "fixed(shape=20, step=0) * fixed(shape=30, step=0) * 2 * 3 * float64",
+             "20 * 30 * !3 * 4 * float32",
+             "20 * 30 * 10 * 2 * float64" } },
+
+  { .loc = loc(),
+    .success=true,
+
+    .signature="... * C[2 * 3 * float64], ... * F[3 * 4 * float32] -> F[... * 10 * 2 * float64]",
+    .args={"2 * 3 * float64", "20 * 30 * !3 * 4 * float32"},
+    .kwargs={NULL},
 
-  { .signature="... * C[2 * 3 * float64], ... * F[3 * 4 * float32] -> F[... * 10 * 2 * float64]",
-    .in={"2 * 3 * float64", "20 * 30 * !3 * 4 * float32"},
-    .out={"!20 * 30 * 10 * 2 * float64"},
-    .broadcast={"fixed(shape=20, step=0) * fixed(shape=30, step=0) * 2 * 3 * float64",
-                "20 * 30 * !3 * 4 * float32"},
     .outer_dims=2,
-    .success=true },
+    .nin=2,
+    .nout=1,
+    .nargs=3,
+    .types={ "fixed(shape=20, step=0) * fixed(shape=30, step=0) * 2 * 3 * float64",
+             "20 * 30 * !3 * 4 * float32",
+             "!20 * 30 * 10 * 2 * float64" } },
+
+  { .loc = loc(),
+    .success=true,
+
+    .signature="... * C[2 * 3 * float64], ... * F[3 * 4 * float32] -> F[... * 20 * 30 * 10 * 2 * float64]",
+    .args={"2 * 3 * float64", "!3 * 4 * float32"},
+    .kwargs={NULL},
 
-  { .signature="... * C[2 * 3 * float64], ... * F[3 * 4 * float32] -> F[... * 20 * 30 * 10 * 2 * float64]",
-    .in={"2 * 3 * float64", "!3 * 4 * float32"},
-    .out={"!20 * 30 * 10 * 2 * float64"},
-    .broadcast={"2 * 3 * float64", "!3 * 4 * float32"},
     .outer_dims=0,
-    .success=true },
+    .nin=2,
+    .nout=1,
+    .nargs=3,
+    .types={ "2 * 3 * float64", "!3 * 4 * float32", "!20 * 30 * 10 * 2 * float64" } },
+
+  { .loc = loc(),
+    .success=true,
+
+    .signature="... * C[2 * 3 * float64], ... * F[3 * 4 * float32] -> F[... * 20 * 30 * 10 * 2 * float64]",
+    .args={"2 * 3 * float64", "!3 * 4 * float32"},
+    .kwargs={"!20 * 30 * 10 * 2 * float64"},
 
-  { .signature="C[... * 2 * 3 * int64], ... * F[3 * 4 * float32] -> F[... * 20 * 30 * 10 * 2 * float64]",
-    .in={"2 * 3 * int64", "!3 * 4 * float32"},
-    .out={"!20 * 30 * 10 * 2 * float64"},
-    .broadcast={"2 * 3 * int64", "!3 * 4 * float32"},
     .outer_dims=0,
-    .success=true },
+    .nin=2,
+    .nout=1,
+    .nargs=3,
+    .types={ "2 * 3 * float64", "!3 * 4 * float32", "!20 * 30 * 10 * 2 * float64" } },
+
+  { .loc = loc(),
+    .success=false,
+
+    .signature="... * C[2 * 3 * float64], ... * F[3 * 4 * float32] -> F[... * 20 * 30 * 10 * 2 * float64]",
+    .args={"2 * 3 * float64", "!3 * 4 * float32"},
+    .kwargs={"20 * 30 * 10 * 2 * float64"} },
+
+  { .loc = loc(),
+    .success=true,
+
+    .signature="C[... * 2 * 3 * int64], ... * F[3 * 4 * float32] -> F[... * 20 * 30 * 10 * 2 * float64]",
+    .args={"2 * 3 * int64", "!3 * 4 * float32"},
+    .kwargs={NULL},
 
-  /* First argument is not C after broadcasting. */
-  { .signature="C[... * 2 * 3 * int64], ... * F[2 * 3 * 4 * float32] -> F[... * 20 * 30 * 10 * 2 * float64]",
-    .in={"2 * 3 * float64", "!2 * 3 * 4 * float32"},
-    .out={NULL},
-    .broadcast={NULL},
     .outer_dims=0,
-    .success=false },
+    .nin=2,
+    .nout=1,
+    .nargs=3,
+    .types={ "2 * 3 * int64", "!3 * 4 * float32", "!20 * 30 * 10 * 2 * float64" } },
+
+  /* First argument is not C after broadcasting. */
+  { .loc = loc(),
+    .success=false,
+    
+    .signature="C[... * 2 * 3 * int64], ... * F[2 * 3 * 4 * float32] -> F[... * 20 * 30 * 10 * 2 * float64]",
+    .args={"2 * 3 * float64", "!2 * 3 * 4 * float32"},
+    .kwargs={NULL} },
 
   /* Second argument is not F after broadcasting. */
-  { .signature="... * C[2 * 3 * 4 * int64], F[... * 3 * 4 * float32] -> F[... * 20 * 30 * 10 * 2 * float64]",
-    .in={"3 * 4 * float64", "!3 * 4 * float32"},
-    .out={NULL},
-    .broadcast={NULL},
-    .outer_dims=0,
-    .success=false },
+  { .loc = loc(),
+    .success=false,
+
+    .signature="... * C[2 * 3 * 4 * int64], F[... * 3 * 4 * float32] -> F[... * 20 * 30 * 10 * 2 * float64]",
+    .args={"3 * 4 * float64", "!3 * 4 * float32"},
+    .kwargs={NULL} },
+
+  { .loc = loc(),
+    .success=true,
+
+    .signature="array... of float64 -> array... of int64",
+    .args={"array of float64"},
+    .kwargs={NULL},
+
+    .outer_dims=1,
+    .nin=1,
+    .nout=1,
+    .nargs=2,
+    .types={ "array of float64", "array of int64" } },
+
+  { .loc = loc(),
+    .success=true,
+
+    .signature="array... of array of float64, array... of uint8 -> array... of array of int64",
+    .args={"array of array of float64", "array of uint8"},
+    .kwargs={NULL},
+
+    .outer_dims=1,
+    .nin=2,
+    .nout=1,
+    .nargs=3,
+    .types={ "array of array of float64", "array of uint8", "array of array of int64" } },
 
-  { NULL, {NULL}, {NULL}, {NULL}, 0, false }
+  { .loc=NULL, .success=false, .signature= NULL, .args={NULL}, .kwargs={NULL} }
 };