diff options
| author | Dominik Picheta <dominikpicheta@googlemail.com> | 2015-04-23 00:26:17 +0100 |
|---|---|---|
| committer | Dominik Picheta <dominikpicheta@googlemail.com> | 2015-04-23 00:26:17 +0100 |
| commit | 9e69e4e078466886565565d6763b1e4794ea0670 (patch) | |
| tree | 2d9adb4a13d6c8f132fa8592092a46da70601c33 /compiler/vmdeps.nim | |
| parent | 13a5ecda320ada29f19432df805dfc4538f8e103 (diff) | |
| parent | 3b00d9cc7a06fd7720d56548b7139b8c52be5f33 (diff) | |
| download | Nim-9e69e4e078466886565565d6763b1e4794ea0670.tar.gz | |
Merge branch 'devel' into underscore-tuple-unpack
Conflicts: compiler/semstmts.nim
Diffstat (limited to 'compiler/vmdeps.nim')
| -rw-r--r-- | compiler/vmdeps.nim | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/compiler/vmdeps.nim b/compiler/vmdeps.nim index 6148ed319..21ee4967b 100644 --- a/compiler/vmdeps.nim +++ b/compiler/vmdeps.nim @@ -144,7 +144,9 @@ proc mapTypeToAst(t: PType, info: TLineInfo; allowRecursion=false): PNode = of tyIter: result = mapTypeToBracket("iter", t, info) of tyProxy: result = atomicType"error" of tyBuiltInTypeClass: result = mapTypeToBracket("builtinTypeClass", t, info) - of tyUserTypeClass: result = mapTypeToBracket("userTypeClass", t, info) + of tyUserTypeClass: + result = mapTypeToBracket("concept", t, info) + result.add t.n.copyTree of tyCompositeTypeClass: result = mapTypeToBracket("compositeTypeClass", t, info) of tyAnd: result = mapTypeToBracket("and", t, info) of tyOr: result = mapTypeToBracket("or", t, info) |