Merge branch 'master' of github.com:Araq/Nimrod

1 files changed, 15 insertions, 1 deletions

diff --git a/tests/run/ttypetraits.nim b/tests/run/ttypetraits.nim
index 5b683bef0..cba610871 100644
--- a/tests/run/ttypetraits.nim
+++ b/tests/run/ttypetraits.nim
@@ -1,10 +1,11 @@
 discard """
   msg:    "int\nstring\nTBar[int]"
-  output: "int\nstring\nTBar[int]"
+  output: "int\nstring\nTBar[int]\nint\nrange 0..2"
 """
 
 import typetraits
 
+# simple case of type trait usage inside/outside of static blocks
 proc foo(x) =
   static:
     var t = type(x)
@@ -22,3 +23,16 @@ foo 10
 foo "test"
 foo bar
 
+# generic params on user types work too
+proc foo2[T](x: TBar[T]) =
+  echo T.name
+
+foo2 bar
+
+# less usual generic params on built-in types
+var arr: array[0..2, int] = [1, 2, 3]
+
+proc foo3[R, T](x: array[R, T]) =
+  echo name(R)
+
+foo3 arr