summary refs log tree commit diff stats
path: root/compiler/parser.nim
diff options
context:
space:
mode:
authorJonathan Edwards <apense+git@gmail.com>2015-03-11 16:26:10 -0400
committerJonathan Edwards <apense+git@gmail.com>2015-03-11 16:26:10 -0400
commit50ed39fd664dc498e054a9776437e8e94dc1843f (patch)
treeb904111b87218069da572c8cd885891613b4ea6e /compiler/parser.nim
parent2f7d248090f0ad94826c2f80d6f9d9d20467720e (diff)
parent6dbd41e8751b43d76e6cc74b898d0134d592a2c0 (diff)
downloadNim-50ed39fd664dc498e054a9776437e8e94dc1843f.tar.gz
Merge remote-tracking branch 'upstream/devel' into devel
Diffstat (limited to 'compiler/parser.nim')
-rw-r--r--compiler/parser.nim3
1 files changed, 3 insertions, 0 deletions
diff --git a/compiler/parser.nim b/compiler/parser.nim
index 8fbf033d8..9e4d45cd2 100644
--- a/compiler/parser.nim
+++ b/compiler/parser.nim
@@ -865,6 +865,7 @@ proc parseTuple(p: var TParser, indentAllowed = false): PNode =
   #|     [' optInd  (identColonEquals (comma/semicolon)?)*  optPar ']'
   #| extTupleDecl = 'tuple'
   #|     COMMENT? (IND{>} identColonEquals (IND{=} identColonEquals)*)?
+  #| tupleClass = 'tuple'
   result = newNodeP(nkTupleTy, p)
   getTok(p)
   if p.tok.tokType == tkBracketLe:
@@ -894,6 +895,8 @@ proc parseTuple(p: var TParser, indentAllowed = false): PNode =
             parMessage(p, errIdentifierExpected, p.tok)
             break
           if not sameInd(p): break
+  else:
+    result = newNodeP(nkTupleClassTy, p)
 
 proc parseParamList(p: var TParser, retColon = true): PNode =
   #| paramList = '(' declColonEquals ^* (comma/semicolon) ')'