Merge ../Nim into devel

2015-02-14 14:26:16 -05:00 · 2015-02-14 14:26:16 -05:00 · 6206795464
commit 6206795464
parent 5068a5aa01 ece23d39bc
4 changed files with 22 additions and 1 deletions
--- a/tests/parser/twhen_in_enum.nim
+++ b/tests/parser/twhen_in_enum.nim
@ -0,0 +1,11 @@
+discard """
+  errormsg: "identifier expected, but found 'keyword when'"
+"""
+
+# bug #2123
+type num = enum
+    NUM_NONE = 0
+    NUM_ALL = 1
+    when defined(macosx): NUM_OSX = 10 # only this differs for real
+    NUM_XTRA = 20
+
--- a/tests/tuples/tgeneric_tuple.nim
+++ b/tests/tuples/tgeneric_tuple.nim
@ -0,0 +1,9 @@
+# bug #2121
+
+type
+  Item[K,V] = tuple
+    key: K
+    value: V
+
+var q = newseq[Item[int,int]](0)
+let (x,y) = q[0]