further improvements for static generic params; activate the hardest test cases

This commit is contained in:
Zahary Karadjov 2014-03-10 00:29:15 +02:00
commit 9fb0755572
4 changed files with 45 additions and 23 deletions

View file

@ -14,7 +14,8 @@ macro selectType(a, b: typedesc): typedesc =
type
Foo[T] = object
data1: array[T.high, int]
data2: array[typeNameLen(T), float] # data3: array[0..T.typeNameLen, selectType(float, int)]
data2: array[typeNameLen(T), float]
data3: array[0..T.typeNameLen, selectType(float, int)]
MyEnum = enum A, B, C, D
@ -27,10 +28,15 @@ echo high(f1.data2) # (MyEnum.len = 6) - 1 == 5
echo high(f2.data1) # 127 - 1 == 126
echo high(f2.data2) # int8.len - 1 == 3
#static:
# assert high(f1.data1) == ord(D)
# assert high(f1.data2) == 6 # length of MyEnum
static:
assert high(f1.data1) == ord(C)
assert high(f1.data2) == 5 # length of MyEnum minus one, because we used T.high
# assert high(f2.data1) == 127
# assert high(f2.data2) == 4 # length of int8
assert high(f2.data1) == 126
assert high(f2.data2) == 3
assert high(f1.data3) == 6 # length of MyEnum
assert high(f2.data3) == 4 # length of int8
assert f2.data3[0] is float