QMovableArrayOps::Inserter: move the displace() call into the ctor
Coverity complained that ~Inserter() will access at least displaceFrom
and displaceTo uninitialized, which is correct, if none of the
insert() overloads have been called in-between. This is a brittle
construct, even though, currently, all users of the class comply.
To help Coverity (and other readers of the code) understand what's
going on, move the displace() call that creates the hole in the
container which the insert() overloads then fill from said overloads
into the ctor, original-RAII style (ctor acquires the hole, dtor closes
it, if needed). This means all fields are initialized in the ctor now.
This is safe, as displace() cannot fail by itself (just a memmove()),
but requires moving the (pos, n) (= hole) information into the ctor
instead. The displace() call in the insert() overloads now becomes a
read of its return argument, displaceFrom.
(Incidentally, that shows that we have maintained the same pointer
twice in the insert overloads, something we'll clean up in a
follow-up.)
In order to verify the insert() post-condition (ie. that we filled the
whole hole created by the ctor, or threw an exception trying),
continue to pass the count to insert().
As a drive-by, rename the insert()-overloads to insertRange() and
insertFill() to match the existing insertOne() function, and to better
express what their purpose is.
Pick-to: 6.9 6.8 6.5
Coverity-Id: 378364
Coverity-Id: 378461
Coverity-Id: 378343
Change-Id:
I1a6bc1ea0e5506d473f6089818797b02d09ba13e
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Reviewed-by: Ahmad Samir <a.samirh78@gmail.com>
0 files changed, 0 insertions, 0 deletions
href='#n155'>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
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
/****************************************************************************
**
** Copyright (C) 2016 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the tools applications of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:GPL-EXCEPT$
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at https://www.qt.io/contact-us.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU
** General Public License version 3 as published by the Free Software
** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
** included in the packaging of this file. Please review the following
** information to ensure the GNU General Public License requirements will
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
**
** $QT_END_LICENSE$
**
****************************************************************************/
#include <stdio.h>
#include <string.h>
#include <qbytearray.h>
#include <qlist.h>
struct Keyword
{
const char *lexem;
const char *token;
};
static const Keyword pp_keywords[] = {
{ "<", "PP_LANGLE" },
{ ">", "PP_RANGLE" },
{ "(", "PP_LPAREN"},
{ ")", "PP_RPAREN"},
{ ",", "PP_COMMA"},
{ "\n", "PP_NEWLINE"},
{ "#define", "PP_DEFINE"},
{ "#if", "PP_IF"},
{ "#undef", "PP_UNDEF"},
{ "#ifdef", "PP_IFDEF"},
{ "#ifndef", "PP_IFNDEF"},
{ "#elif", "PP_ELIF"},
{ "#else", "PP_ELSE"},
{ "#endif", "PP_ENDIF"},
{ "#include", "PP_INCLUDE"},
{ "defined", "PP_DEFINED"},
{ "+", "PP_PLUS" },
{ "-", "PP_MINUS" },
{ "*", "PP_STAR" },
{ "/", "PP_SLASH" },
{ "%", "PP_PERCENT" },
{ "^", "PP_HAT" },
{ "&", "PP_AND" },
{ "bitand", "PP_AND" },
{ "|", "PP_OR" },
{ "bitor", "PP_OR" },
{ "~", "PP_TILDE" },
{ "compl", "PP_TILDE" },
{ "!", "PP_NOT" },
{ "not", "PP_NOT" },
{ "<<", "PP_LTLT" },
{ ">>", "PP_GTGT" },
{ "==", "PP_EQEQ" },
{ "!=", "PP_NE" },
{ "not_eq", "PP_NE" },
{ "<=", "PP_LE" },
{ ">=", "PP_GE" },
{ "&&", "PP_ANDAND" },
{ "||", "PP_OROR" },
{ "?", "PP_QUESTION" },
{ ":", "PP_COLON" },
{ "##", "PP_HASHHASH"},
{ "%:%:", "PP_HASHHASH"},
{ "#", "PP_HASH"},
{ "\"", "PP_QUOTE"},
{ "\'", "PP_SINGLEQUOTE"},
{ " ", "PP_WHITESPACE" },
{ "\t", "PP_WHITESPACE" },
{ "//", "PP_CPP_COMMENT" },
{ "/*", "PP_C_COMMENT" },
{ "\\", "PP_BACKSLASH" },
{ 0, "PP_NOTOKEN"}
};
static const Keyword keywords[] = {
{ "<", "LANGLE" },
{ ">", "RANGLE" },
{ "(", "LPAREN" },
{ ")", "RPAREN" },
{ "...", "ELIPSIS" },
{ ",", "COMMA" },
{ "[", "LBRACK" },
{ "]", "RBRACK" },
{ "<:", "LBRACK" },
{ ":>", "RBRACK" },
{ "<::", "LANGLE_SCOPE" },
{ "{", "LBRACE" },
{ "<%", "LBRACE" },
{ "}", "RBRACE" },
{ "%>", "RBRACE" },
{ "=", "EQ" },
{ "::", "SCOPE" },
{ ";", "SEMIC" },
{ ":", "COLON" },
{ ".*", "DOTSTAR" },
{ "?", "QUESTION" },
{ ".", "DOT" },
{ "dynamic_cast", "DYNAMIC_CAST" },
{ "static_cast", "STATIC_CAST" },
{ "reinterpret_cast", "REINTERPRET_CAST" },
{ "const_cast", "CONST_CAST" },
{ "typeid", "TYPEID" },
{ "this", "THIS" },
{ "template", "TEMPLATE" },
{ "throw", "THROW" },
{ "try", "TRY" },
{ "catch", "CATCH" },
{ "typedef", "TYPEDEF" },
{ "friend", "FRIEND" },
{ "class", "CLASS" },
{ "namespace", "NAMESPACE" },
{ "enum", "ENUM" },
{ "struct", "STRUCT" },
{ "union", "UNION" },
{ "virtual", "VIRTUAL" },
{ "private", "PRIVATE" },
{ "protected", "PROTECTED" },
{ "public", "PUBLIC" },
{ "export", "EXPORT" },
{ "auto", "AUTO" },
{ "register", "REGISTER" },
{ "extern", "EXTERN" },
{ "mutable", "MUTABLE" },
{ "asm", "ASM" },
{ "using", "USING" },
{ "inline", "INLINE" },
{ "explicit", "EXPLICIT" },
{ "static", "STATIC" },
{ "const", "CONST" },
{ "volatile", "VOLATILE" },
{ "operator", "OPERATOR" },
{ "sizeof", "SIZEOF" },
{ "new", "NEW" },
{ "delete", "DELETE" },
{ "+", "PLUS" },
{ "-", "MINUS" },
{ "*", "STAR" },
{ "/", "SLASH" },
{ "%", "PERCENT" },
{ "^", "HAT" },
{ "&", "AND" },
{ "bitand", "AND" },
{ "|", "OR" },
{ "bitor", "OR" },
{ "~", "TILDE" },
{ "compl", "TILDE" },
{ "!", "NOT" },
{ "not", "NOT" },
{ "+=", "PLUS_EQ" },
{ "-=", "MINUS_EQ" },
{ "*=", "STAR_EQ" },
{ "/=", "SLASH_EQ" },
{ "%=", "PERCENT_EQ" },
{ "^=", "HAT_EQ" },
{ "&=", "AND_EQ" },
{ "|=", "OR_EQ" },
{ "<<", "LTLT" },
{ ">>", "GTGT" },
{ ">>=", "GTGT_EQ" },
{ "<<=", "LTLT_EQ" },
{ "==", "EQEQ" },
{ "!=", "NE" },
{ "not_eq", "NE" },
{ "<=", "LE" },
{ ">=", "GE" },
{ "&&", "ANDAND" },
{ "||", "OROR" },
{ "++", "INCR" },
{ "--", "DECR" },
{ ",", "COMMA" },
{ "->*", "ARROW_STAR" },
{ "->", "ARROW" },
{ "char", "CHAR" },
{ "wchar", "WCHAR" },
{ "bool", "BOOL" },
{ "short", "SHORT" },
{ "int", "INT" },
{ "long", "LONG" },
{ "signed", "SIGNED" },
{ "unsigned", "UNSIGNED" },
{ "float", "FLOAT" },
{ "double", "DOUBLE" },
{ "void", "VOID" },
{ "case", "CASE" },
{ "default", "DEFAULT" },
{ "if", "IF" },
{ "else", "ELSE" },
{ "switch", "SWITCH" },
{ "while", "WHILE" },
{ "do", "DO" },
{ "for", "FOR" },
{ "break", "BREAK" },
{ "continue", "CONTINUE" },
{ "goto", "GOTO" },
{ "return", "RETURN" },
{ "Q_OBJECT", "Q_OBJECT_TOKEN" },
{ "Q_NAMESPACE", "Q_NAMESPACE_TOKEN" },
{ "Q_NAMESPACE_EXPORT", "Q_NAMESPACE_EXPORT_TOKEN" },
{ "Q_GADGET", "Q_GADGET_TOKEN" },
{ "Q_PROPERTY", "Q_PROPERTY_TOKEN" },
{ "Q_PLUGIN_METADATA", "Q_PLUGIN_METADATA_TOKEN" },
{ "Q_ENUMS", "Q_ENUMS_TOKEN" },
{ "Q_ENUM", "Q_ENUM_TOKEN" },
{ "Q_ENUM_NS", "Q_ENUM_NS_TOKEN" },
{ "Q_FLAGS", "Q_FLAGS_TOKEN" },
{ "Q_FLAG", "Q_FLAG_TOKEN" },
{ "Q_FLAG_NS", "Q_FLAG_NS_TOKEN" },
{ "Q_DECLARE_FLAGS", "Q_DECLARE_FLAGS_TOKEN" },
{ "Q_DECLARE_INTERFACE", "Q_DECLARE_INTERFACE_TOKEN" },
{ "Q_DECLARE_METATYPE", "Q_DECLARE_METATYPE_TOKEN" },
{ "Q_DECLARE_EXTENSION_INTERFACE", "Q_DECLARE_INTERFACE_TOKEN" },
{ "Q_SETS", "Q_FLAGS_TOKEN" },
{ "Q_CLASSINFO", "Q_CLASSINFO_TOKEN" },
{ "Q_INTERFACES", "Q_INTERFACES_TOKEN" },
{ "signals", "SIGNALS" },
{ "slots", "SLOTS" },
{ "Q_SIGNALS", "Q_SIGNALS_TOKEN" },
{ "Q_SLOTS", "Q_SLOTS_TOKEN" },
{ "Q_PRIVATE_SLOT", "Q_PRIVATE_SLOT_TOKEN" },
{ "QT_MOC_COMPAT", "Q_MOC_COMPAT_TOKEN" },
{ "Q_INVOKABLE", "Q_INVOKABLE_TOKEN" },
{ "Q_SIGNAL", "Q_SIGNAL_TOKEN" },
{ "Q_SLOT", "Q_SLOT_TOKEN" },
{ "Q_SCRIPTABLE", "Q_SCRIPTABLE_TOKEN" },
{ "Q_PRIVATE_PROPERTY", "Q_PRIVATE_PROPERTY_TOKEN" },
{ "Q_REVISION", "Q_REVISION_TOKEN" },
{ "Q_MOC_INCLUDE", "Q_MOC_INCLUDE_TOKEN" },
{ "\n", "NEWLINE" },
{ "\"", "QUOTE" },
{ "\'", "SINGLEQUOTE" },
{ " ", "WHITESPACE" },
{ "\t", "WHITESPACE" },
{ "#", "HASH" },
{ "##", "PP_HASHHASH" },
{ "\\", "BACKSLASH" },
{ "//", "CPP_COMMENT" },
{ "/*", "C_COMMENT" },
{ 0, "NOTOKEN"}
};
inline bool is_ident_start(char s)
{
return ((s >= 'a' && s <= 'z')
|| (s >= 'A' && s <= 'Z')
|| s == '_' || s == '$'
);
}
inline bool is_ident_char(char s)
{
return ((s >= 'a' && s <= 'z')
|| (s >= 'A' && s <= 'Z')
|| (s >= '0' && s <= '9')
|| s == '_' || s == '$'
);
}
struct State
{
State(const char* token):token(token), nextindex(0),
defchar(0), defnext(0), ident(0) {
memset( next, 0, sizeof(next));
}
QByteArray token;
int next[128];
int nextindex;
char defchar;
int defnext;
const char *ident;
bool operator==(const State& o) const
{
return (token == o.token
&& nextindex == o.nextindex
&& defchar == o.defchar
&& defnext == o.defnext
&& ident == o.ident);
}
};
void newState(QList<State> &states, const char *token, const char *lexem, bool pre)
{
const char * ident = 0;
if (is_ident_start(*lexem))
ident = pre?"PP_CHARACTER" : "CHARACTER";
else if (*lexem == '#')
ident = pre?"PP_HASH" : "HASH";
int state = 0;
while (*lexem) {
int next = states[state].next[(int)*lexem];
if (!next) {
const char * t = 0;
if (ident)
t = ident;
else
t = pre?"PP_INCOMPLETE":"INCOMPLETE";
next = states.size();
states += State(t);
states[state].next[(int)*lexem] = next;
states[next].ident = ident;
}
state = next;
++lexem;
if (ident && !is_ident_char(*lexem))
ident = 0;
}
states[state].token = token;
}
void newState(QList<State> &states, const char *token, char lexem)
{
int next = states[0].next[(int)lexem];
if (!next) {
next = states.size();
states += State(token);
states[0].next[(int)lexem] = next;
} else {
states[next].token = token;
}
}
void makeTable(const Keyword keywords[])
{
int i,c;
bool pre = (keywords == pp_keywords);
QList<State> states;
states += State(pre?"PP_NOTOKEN":"NOTOKEN");
// identifiers
for (c = 'a'; c <= 'z'; ++c)
newState(states, pre?"PP_CHARACTER":"CHARACTER", c);
for (c = 'A'; c <= 'Z'; ++c)
newState(states, pre?"PP_CHARACTER":"CHARACTER", c);
newState(states, pre?"PP_CHARACTER":"CHARACTER", '_');
newState(states, pre?"PP_CHARACTER":"CHARACTER", '$');
// add digits
for (c = '0'; c <= '9'; ++c)
newState(states, pre?"PP_DIGIT":"DIGIT", c);
// keywords
for (i = 0; keywords[i].lexem; ++i)
newState(states, keywords[i].token, keywords[i].lexem, pre);
// some floats
for (c = '0'; c <= '9'; ++c)
newState(states, pre?"PP_FLOATING_LITERAL":"FLOATING_LITERAL",
QByteArray(".") + char(c), pre);
// simplify table with default transitions
int transindex = -1;
for (i = 0; i < states.size(); ++i) {
int n = 0;
int defchar = -1;
for (c = 0; c < 128; ++c)
if (states[i].next[c]) {
++n;
defchar = c;
}
if (!n)
continue;
if (n == 1) {
states[i].defnext = states[i].next[defchar];
states[i].defchar = defchar;
continue;
}
states[i].nextindex = ++transindex;
}
#if 1
// compress table
int j, k;
for (i = 0; i < states.size(); ++i) {
for (j = i + 1; j < states.size(); ++j) {
if ( states[i] == states[j] ) {
for (k = 0; k < states.size(); ++k) {
if (states[k].defnext == j)
states[k].defnext = i;
if (states[k].defnext > j)
--states[k].defnext;
for (c = 0; c < 128; ++c) {
if (states[k].next[c] == j)
states[k].next[c] = i;
if (states[k].next[c] > j)
--states[k].next[c];
}
}
states.removeAt(j);
--j;
}
}
}
#endif
printf("static const short %skeyword_trans[][128] = {\n",
pre?"pp_":"");
for (i = 0; i < states.size(); ++i) {
if (i && !states[i].nextindex)
continue;
printf("%s {", i?",\n":"");
for (c = 0; c < 128; ++c)
printf("%s%s%d",
c?",":"",
(!c || c%16)?"":"\n ",
states[i].next[c]
);
printf("}");
}
printf("\n};\n\n");
printf("static const struct\n{\n"
" %sToken token;\n"
" short next;\n"
" char defchar;\n"
" short defnext;\n"
" %sToken ident;\n"
"} %skeywords[] = {\n",
pre ? "PP_":"",
pre ? "PP_":"",
pre ? "pp_":"");
for (i = 0; i < states.size(); ++i) {
printf("%s {%s, %d, %d, %d, %s}",
i?",\n":"",
states[i].token.data(),
states[i].nextindex,
states[i].defchar,
states[i].defnext,
states[i].ident?states[i].ident:(pre?"PP_NOTOKEN":"NOTOKEN"));
}
printf("\n};\n");
}
int main(int argc, char **)
{
printf("// auto generated\n"
"// DO NOT EDIT.\n\n");
if ( argc > 1 )
makeTable(pp_keywords);
else
makeTable(keywords);
return 0;
}
