add constraints for Canonical slices

9il · 9il · commit 8f8bc108be56 · 2017-05-06T00:26:57.000+07:00
diff --git a/source/mir/ndslice/slice.d b/source/mir/ndslice/slice.d
@@ -94,7 +94,7 @@ enum kindOf(T : Slice!(kind, packs, Iterator), SliceKind kind, size_t[] packs, I
 ///
 unittest
 {
-    static assert(kindOf!(Slice!(Canonical, [1], int*)) == Canonical);
+    static assert(kindOf!(Slice!(Universal, [1], int*)) == Universal);
 }
 
 private template SkipDimension(size_t dimension, size_t index)
@@ -519,7 +519,7 @@ Slice!(Universal, [N], Iterator)
 -------
 +/
 struct Slice(SliceKind kind, size_t[] packs, Iterator)
-    if (packs.sum < 255)
+    if (packs.sum < 255 && !(kind == Canonical && packs == [1]))
 {
     @fastmath:
 

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ enum kindOf(T : Slice!(kind, packs, Iterator), SliceKind kind, size_t[] packs, I`
`94`	`94`	`///`
`95`	`95`	`unittest`
`96`	`96`	`{`
`97`		`- static assert(kindOf!(Slice!(Canonical, [1], int*)) == Canonical);`
	`97`	`+ static assert(kindOf!(Slice!(Universal, [1], int*)) == Universal);`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`private template SkipDimension(size_t dimension, size_t index)`
`@@ -519,7 +519,7 @@ Slice!(Universal, [N], Iterator)`
`519`	`519`	`-------`
`520`	`520`	`+/`
`521`	`521`	`struct Slice(SliceKind kind, size_t[] packs, Iterator)`
`522`		`- if (packs.sum < 255)`
	`522`	`+ if (packs.sum < 255 && !(kind == Canonical && packs == [1]))`
`523`	`523`	`{`
`524`	`524`	`@fastmath:`
`525`	`525`