fix length/shape

9il · 9il · commit 439b9d27699f · 2018-10-25T22:37:53.000+07:00
diff --git a/source/mir/interpolate/package.d b/source/mir/interpolate/package.d
@@ -117,7 +117,7 @@ struct Interp1(Range, Interpolant)
 
     static if (hasLength!Range)
     /// Length (optional)
-    size_t length()() @property  { return _range.length; }
+    size_t length()() const @property  { return _range.length; }
     /// Save primitive (optional)
     auto save()() @property
     {
diff --git a/source/mir/ndslice/field.d b/source/mir/ndslice/field.d
@@ -106,19 +106,19 @@ struct MapField(Field, alias _fun)
     }
 
     static if (__traits(hasMember, Field, "length"))
-    auto length() @property
+    auto length() const @property
     {
         return _field.length;
     }
 
     static if (__traits(hasMember, Field, "shape"))
-    auto shape() @property
+    auto shape() const @property
     {
         return _field.shape;
     }
 
     static if (__traits(hasMember, Field, "elementCount"))
-    auto elementCount() @property
+    auto elementCount() const @property
     {
         return _field.elementCount;
     }
@@ -167,19 +167,19 @@ struct VmapField(Field, Fun)
     }
 
     static if (__traits(hasMember, Field, "length"))
-    auto length() @property
+    auto length() const @property
     {
         return _field.length;
     }
 
     static if (__traits(hasMember, Field, "shape"))
-    auto shape() @property
+    auto shape() const @property
     {
         return _field.shape;
     }
 
     static if (__traits(hasMember, Field, "elementCount"))
-    auto elementCount() @property
+    auto elementCount()const @property
     {
         return _field.elementCount;
     }
diff --git a/source/mir/ndslice/ndfield.d b/source/mir/ndslice/ndfield.d
@@ -81,7 +81,7 @@ struct Cartesian(NdFields...)
     }
 
     ///
-    size_t length(size_t d = 0)() @property
+    size_t length(size_t d = 0)() const @property
     {
         foreach(f, ref field; _fields)
             static if (M!f <= d && M!(f + 1) > d)
@@ -95,7 +95,7 @@ struct Cartesian(NdFields...)
     }
 
     ///
-    size_t[N] shape()() @property
+    size_t[N] shape()() const @property
     {
         typeof(return) ret;
         foreach(f, ref field; _fields)
@@ -115,7 +115,7 @@ struct Cartesian(NdFields...)
     }
 
     ///
-    size_t elementCount()() @property
+    size_t elementCount()() const @property
     {
         size_t ret = 1;
         foreach (ref field; _fields)
@@ -168,7 +168,7 @@ struct Kronecker(alias fun, NdFields...)
     private enum N = DimensionCount!(NdFields[$-1]);
 
     ///
-    size_t length(size_t d = 0)() @property
+    size_t length(size_t d = 0)() const @property
     {
         static if (d == 0)
         {
@@ -187,7 +187,7 @@ struct Kronecker(alias fun, NdFields...)
 
     
     ///
-    size_t[N] shape()() @property
+    size_t[N] shape()() const @property
     {
         static if (N > 1)
         {
@@ -211,7 +211,7 @@ struct Kronecker(alias fun, NdFields...)
     }
 
     ///
-    size_t elementCount()() @property
+    size_t elementCount()() const @property
     {
         size_t ret = 1;
         foreach (ref field; _fields)

Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ struct Interp1(Range, Interpolant)`
`117`	`117`
`118`	`118`	`static if (hasLength!Range)`
`119`	`119`	`/// Length (optional)`
`120`		`- size_t length()() @property { return _range.length; }`
	`120`	`+ size_t length()() const @property { return _range.length; }`
`121`	`121`	`/// Save primitive (optional)`
`122`	`122`	`auto save()() @property`
`123`	`123`	`{`
Original file line number	Diff line number	Diff line change
`@@ -106,19 +106,19 @@ struct MapField(Field, alias _fun)`
`106`	`106`	`}`
`107`	`107`
`108`	`108`	`static if (__traits(hasMember, Field, "length"))`
`109`		`- auto length() @property`
	`109`	`+ auto length() const @property`
`110`	`110`	`{`
`111`	`111`	`return _field.length;`
`112`	`112`	`}`
`113`	`113`
`114`	`114`	`static if (__traits(hasMember, Field, "shape"))`
`115`		`- auto shape() @property`
	`115`	`+ auto shape() const @property`
`116`	`116`	`{`
`117`	`117`	`return _field.shape;`
`118`	`118`	`}`
`119`	`119`
`120`	`120`	`static if (__traits(hasMember, Field, "elementCount"))`
`121`		`- auto elementCount() @property`
	`121`	`+ auto elementCount() const @property`
`122`	`122`	`{`
`123`	`123`	`return _field.elementCount;`
`124`	`124`	`}`
`@@ -167,19 +167,19 @@ struct VmapField(Field, Fun)`
`167`	`167`	`}`
`168`	`168`
`169`	`169`	`static if (__traits(hasMember, Field, "length"))`
`170`		`- auto length() @property`
	`170`	`+ auto length() const @property`
`171`	`171`	`{`
`172`	`172`	`return _field.length;`
`173`	`173`	`}`
`174`	`174`
`175`	`175`	`static if (__traits(hasMember, Field, "shape"))`
`176`		`- auto shape() @property`
	`176`	`+ auto shape() const @property`
`177`	`177`	`{`
`178`	`178`	`return _field.shape;`
`179`	`179`	`}`
`180`	`180`
`181`	`181`	`static if (__traits(hasMember, Field, "elementCount"))`
`182`		`- auto elementCount() @property`
	`182`	`+ auto elementCount()const @property`
`183`	`183`	`{`
`184`	`184`	`return _field.elementCount;`
`185`	`185`	`}`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ struct Cartesian(NdFields...)`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`///`
`84`		`- size_t length(size_t d = 0)() @property`
	`84`	`+ size_t length(size_t d = 0)() const @property`
`85`	`85`	`{`
`86`	`86`	`foreach(f, ref field; _fields)`
`87`	`87`	`static if (M!f <= d && M!(f + 1) > d)`
`@@ -95,7 +95,7 @@ struct Cartesian(NdFields...)`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`///`
`98`		`- size_t[N] shape()() @property`
	`98`	`+ size_t[N] shape()() const @property`
`99`	`99`	`{`
`100`	`100`	`typeof(return) ret;`
`101`	`101`	`foreach(f, ref field; _fields)`
`@@ -115,7 +115,7 @@ struct Cartesian(NdFields...)`
`115`	`115`	`}`
`116`	`116`
`117`	`117`	`///`
`118`		`- size_t elementCount()() @property`
	`118`	`+ size_t elementCount()() const @property`
`119`	`119`	`{`
`120`	`120`	`size_t ret = 1;`
`121`	`121`	`foreach (ref field; _fields)`
`@@ -168,7 +168,7 @@ struct Kronecker(alias fun, NdFields...)`
`168`	`168`	`private enum N = DimensionCount!(NdFields[$-1]);`
`169`	`169`
`170`	`170`	`///`
`171`		`- size_t length(size_t d = 0)() @property`
	`171`	`+ size_t length(size_t d = 0)() const @property`
`172`	`172`	`{`
`173`	`173`	`static if (d == 0)`
`174`	`174`	`{`
`@@ -187,7 +187,7 @@ struct Kronecker(alias fun, NdFields...)`
`187`	`187`
`188`	`188`
`189`	`189`	`///`
`190`		`- size_t[N] shape()() @property`
	`190`	`+ size_t[N] shape()() const @property`
`191`	`191`	`{`
`192`	`192`	`static if (N > 1)`
`193`	`193`	`{`
`@@ -211,7 +211,7 @@ struct Kronecker(alias fun, NdFields...)`
`211`	`211`	`}`
`212`	`212`
`213`	`213`	`///`
`214`		`- size_t elementCount()() @property`
	`214`	`+ size_t elementCount()() const @property`
`215`	`215`	`{`
`216`	`216`	`size_t ret = 1;`
`217`	`217`	`foreach (ref field; _fields)`