From 0f743e01833290e2995756fbd459728b12d833be Mon Sep 17 00:00:00 2001 From: Araq Date: Sun, 16 Jan 2011 16:22:23 +0100 Subject: explicit indices in array literals --- rod/msgs.nim | 2 ++ rod/semexprs.nim | 22 ++++++++++++++++++++-- 2 files changed, 22 insertions(+), 2 deletions(-) (limited to 'rod') diff --git a/rod/msgs.nim b/rod/msgs.nim index d6fde38b4..e34631c90 100755 --- a/rod/msgs.nim +++ b/rod/msgs.nim @@ -94,6 +94,7 @@ type errXCannotBeInParamDecl, errPragmaOnlyInHeaderOfProc, errImplOfXNotAllowed, errImplOfXexpected, errNoSymbolToBorrowFromFound, errDiscardValue, errInvalidDiscard, errIllegalConvFromXtoY, errCannotBindXTwice, + errInvalidOrderInArrayConstructor, errInvalidOrderInEnumX, errEnumXHasWholes, errExceptExpected, errInvalidTry, errOptionExpected, errXisNoLabel, errNotAllCasesCovered, errUnkownSubstitionVar, errComplexStmtRequiresInd, errXisNotCallable, @@ -214,6 +215,7 @@ const "value returned by statement has to be discarded", "statement returns no value that can be discarded", "conversion from $1 to $2 is invalid", "cannot bind parameter \'$1\' twice", + "invalid order in array constructor", "invalid order in enum \'$1\'", "enum \'$1\' has wholes", "\'except\' or \'finally\' expected", "after catch all \'except\' or \'finally\' no section may follow", diff --git a/rod/semexprs.nim b/rod/semexprs.nim index 10ed6567e..e6cf097e5 100755 --- a/rod/semexprs.nim +++ b/rod/semexprs.nim @@ -260,11 +260,29 @@ proc semArrayConstr(c: PContext, n: PNode): PNode = if sonsLen(n) == 0: addSon(result.typ, newTypeS(tyEmpty, c)) # needs an empty basetype! else: - addSon(result, semExprWithType(c, n.sons[0])) + var x = n.sons[0] + var lastIndex: biggestInt = 0 + var indexType = getSysType(tyInt) + if x.kind == nkExprColonExpr: + var idx = semConstExpr(c, x.sons[0]) + lastIndex = getOrdValue(idx) + indexType = idx.typ + x = x.sons[1] + + addSon(result, semExprWithType(c, x)) var typ = skipTypes(result.sons[0].typ, {tyGenericInst, tyVar, tyOrdinal}) for i in countup(1, sonsLen(n) - 1): - n.sons[i] = semExprWithType(c, n.sons[i]) + x = n.sons[i] + if x.kind == nkExprColonExpr: + var idx = semConstExpr(c, x.sons[0]) + idx = fitNode(c, indexType, idx) + if lastIndex+1 != getOrdValue(idx): + liMessage(x.info, errInvalidOrderInArrayConstructor) + x = x.sons[1] + + n.sons[i] = semExprWithType(c, x) addSon(result, fitNode(c, typ, n.sons[i])) + inc(lastIndex) addSon(result.typ, typ) result.typ.sons[0] = makeRangeType(c, 0, sonsLen(result) - 1, n.info) -- cgit 1.4.1-2-gfad0 t?h=devel&id=ac8f6c57a1eb915e9b25ea52bf868c8b89b30c04'>plain) (tree) 
0b44d812f ^













ad6ee9e85 ^




0b44d812f ^

ad6ee9e85 ^

0b44d812f ^




75abf7250 ^

ad6ee9e85 ^


0b44d812f ^

ad6ee9e85 ^



d43febf81 ^




0b44d812f ^

d43febf81 ^



3b50a9920 ^

d43febf81 ^



0b44d812f ^

d43febf81 ^



ad6ee9e85 ^



0b44d812f ^

ad6ee9e85 ^

3ea644690 ^

0b44d812f ^

ad6ee9e85 ^




0b44d812f ^

ad6ee9e85 ^


















3ea644690 ^

ad6ee9e85 ^















3ea644690 ^

ad6ee9e85 ^
















3ea644690 ^

ad6ee9e85 ^













3ea644690 ^

ad6ee9e85 ^














3ea644690 ^

ad6ee9e85 ^















3ea644690 ^

ad6ee9e85 ^


















3ea644690 ^

ad6ee9e85 ^





















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