summary refs log tree commit diff stats
path: root/lib/core
diff options
context:
space:
mode:
authorZahary Karadjov <zahary@gmail.com>2013-09-03 03:14:56 +0300
committerZahary Karadjov <zahary@gmail.com>2013-09-03 03:14:56 +0300
commit6082595e968f000b5089b1db7e72ad55bbf3fac3 (patch)
tree06a76e725c59524b5e7ab23e8c5f1a7c1bef5e54 /lib/core
parent39da6979add895cf58e9c6f883ef8df465975cd6 (diff)
parentc8c8d2035af189bdf63b39d4e47266a6e67c38b9 (diff)
downloadNim-6082595e968f000b5089b1db7e72ad55bbf3fac3.tar.gz
Merge branch 'type-classes' into upstream
Diffstat (limited to 'lib/core')
-rw-r--r--lib/core/macros.nim4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/core/macros.nim b/lib/core/macros.nim
index 879c66df7..9ac6b0082 100644
--- a/lib/core/macros.nim
+++ b/lib/core/macros.nim
@@ -56,10 +56,10 @@ type
     nnkFromStmt,
     nnkIncludeStmt,
     
-    nnkBindStmt, nnkMixinStmt,
+    nnkBindStmt, nnkMixinStmt, nnkUsingStmt,
     nnkCommentStmt, nnkStmtListExpr, nnkBlockExpr,
     nnkStmtListType, nnkBlockType, nnkTypeOfExpr, nnkObjectTy,
-    nnkTupleTy, nnkRecList, nnkRecCase, nnkRecWhen,
+    nnkTupleTy, nnkTypeClassTy, nnkRecList, nnkRecCase, nnkRecWhen,
     nnkRefTy, nnkPtrTy, nnkVarTy,
     nnkConstTy, nnkMutableTy,
     nnkDistinctTy,