From 832b0a0232e610c1935aaf6ce0b45f69199f8a19 Mon Sep 17 00:00:00 2001 From: Andreas Rumpf Date: Fri, 18 Oct 2019 22:13:24 +0200 Subject: fixes #12420 [backport] (#12456) --- compiler/packagehandling.nim | 13 +++++-------- tests/modules/a/utils.nim | 2 ++ tests/modules/b/utils.nim | 2 ++ tests/modules/tutils_ab.nim | 5 +++++ 4 files changed, 14 insertions(+), 8 deletions(-) create mode 100644 tests/modules/a/utils.nim create mode 100644 tests/modules/b/utils.nim create mode 100644 tests/modules/tutils_ab.nim diff --git a/compiler/packagehandling.nim b/compiler/packagehandling.nim index 7fb560433..ee6af0615 100644 --- a/compiler/packagehandling.nim +++ b/compiler/packagehandling.nim @@ -47,12 +47,9 @@ proc demanglePackageName*(path: string): string = proc withPackageName*(conf: ConfigRef; path: AbsoluteFile): AbsoluteFile = let x = getPackageName(conf, path.string) - if x.len == 0: - result = path + let (p, file, ext) = path.splitFile + if x == "stdlib": + # Hot code reloading now relies on 'stdlib_system' names etc. + result = p / RelativeFile((x & '_' & file) & ext) else: - let (p, file, ext) = path.splitFile - if x == "stdlib": - # Hot code reloading now relies on 'stdlib_system' names etc. - result = p / RelativeFile((x & '_' & file) & ext) - else: - result = p / RelativeFile(fakePackageName(conf, path)) + result = p / RelativeFile(fakePackageName(conf, path)) diff --git a/tests/modules/a/utils.nim b/tests/modules/a/utils.nim new file mode 100644 index 000000000..f37abfb93 --- /dev/null +++ b/tests/modules/a/utils.nim @@ -0,0 +1,2 @@ +proc burnMem*(a: int) = + discard diff --git a/tests/modules/b/utils.nim b/tests/modules/b/utils.nim new file mode 100644 index 000000000..e343385f5 --- /dev/null +++ b/tests/modules/b/utils.nim @@ -0,0 +1,2 @@ +# module b/utils.nim +let x* = 10 diff --git a/tests/modules/tutils_ab.nim b/tests/modules/tutils_ab.nim new file mode 100644 index 000000000..25bd08f3c --- /dev/null +++ b/tests/modules/tutils_ab.nim @@ -0,0 +1,5 @@ +import a/utils as autils, b/utils + +# bug #12420 + +burnMem(x) -- cgit 1.4.1-2-gfad0 >
path: root/doc/rifle.1
blob: 0b67edcc599fa689efaee843dbf268011d1907d4 (plain) (tree) 
a0b6b9e0 ^

a6836d5d ^







































5eb98930 ^


a6836d5d ^










5eb98930 ^



a6836d5d ^

5eb98930 ^






a6836d5d ^

5eb98930 ^





a6836d5d ^

5eb98930 ^

a6836d5d ^

































































c79354b9 ^

a6836d5d ^






























































5eb98930 ^

a6836d5d ^






57c2dff1 ^







a6836d5d ^


57c2dff1 ^





a6836d5d ^


57c2dff1 ^





a6836d5d ^


57c2dff1 ^




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
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135

136

137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198

199

200
201
202
203
204
205

206
207
208
209
210
211
212

213
214

215
216
217
218
219

220
221

222
223
224
225
226

227
228

229
230
231
232