summary refs log tree commit diff stats
path: root/compiler
diff options
context:
space:
mode:
authorAraq <rumpf_a@web.de>2017-05-16 20:51:50 +0200
committerAraq <rumpf_a@web.de>2017-05-16 20:51:50 +0200
commit0f2648c56dec3681bb6e3b0d53c8a75f901c6b96 (patch)
treebf5d0761f2e9918e0082a8898624cb760204ec0b /compiler
parent321d1f8b65c1cb41995ad033ea1a6a11bb22df8d (diff)
parent0613f08b2461c5ecb64518a65e20c3769938d21e (diff)
downloadNim-0f2648c56dec3681bb6e3b0d53c8a75f901c6b96.tar.gz
Merge branch 'devel' of github.com:nim-lang/Nim into devel
Diffstat (limited to 'compiler')
-rw-r--r--compiler/vmdeps.nim7
1 files changed, 6 insertions, 1 deletions
diff --git a/compiler/vmdeps.nim b/compiler/vmdeps.nim
index 8c7388643..b2b1ec92b 100644
--- a/compiler/vmdeps.nim
+++ b/compiler/vmdeps.nim
@@ -175,7 +175,12 @@ proc mapTypeToAstX(t: PType; info: TLineInfo;
           result.add mapTypeToAst(t.sons[i], info)
     else:
       result = mapTypeToAstX(t.lastSon, info, inst, allowRecursion)
-  of tyGenericBody, tyOrdinal:
+  of tyGenericBody:
+    if inst:
+      result = mapTypeToAstX(t.lastSon, info, inst, true)
+    else:
+      result = mapTypeToAst(t.lastSon, info)
+  of tyOrdinal:
     result = mapTypeToAst(t.lastSon, info)
   of tyDistinct:
     if inst:
e18a48c'>^
ca4b971bc ^
fe0f10f6b ^
0879f0b0a ^
0879f0b0a ^
1b1bb284d ^
0879f0b0a ^

5263d9d6f ^
93e03144f ^
1b1bb284d ^





2f48dbd16 ^
0879f0b0a ^
180ab350d ^
d20a8ac68 ^
b2e486b23 ^
9af85fb69 ^
1b1bb284d ^
1dd9ec85b ^
f2f16f645 ^






ca4b971bc ^
f2f16f645 ^


f04b502cf ^

9b29436f6 ^
f04b502cf ^

e9b665f33 ^

c60bb9464 ^
e9b665f33 ^

f04b502cf ^
1b1bb284d ^
b77ae66e8 ^
9a68e1ad0 ^
5263d9d6f ^



035f0fb02 ^
8d2953e80 ^
035f0fb02 ^

8d2953e80 ^
e9b665f33 ^
a5ecbf823 ^


4a720394b ^



1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80