Skip to content

C++: support for designated initializers #116

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Aug 31, 2018
Merged

C++: support for designated initializers #116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d068d71
C++: dbscheme/library changes to support C99 designated initializers
nickrolfe Aug 29, 2018
4abdeda
C++: update test output to match corrected extractor behaviour
nickrolfe Aug 29, 2018
afa7505
C++: expand test for aggregate literals to include more nesting
nickrolfe Aug 29, 2018
23c6489
C++: properly formatted comments for builtin type kinds
nickrolfe Aug 6, 2018
7556f22
C++: stats for aggregate_{field,array}_init
nickrolfe Aug 30, 2018
d8d3bfd
C++: expand aggregate literals test to cover ordering of child exprs
nickrolfe Aug 30, 2018
2130622
C++: use underlyingElement & unresolveElement for get{Element,Field}Expr
nickrolfe Aug 30, 2018
0589be1
C++: add qldoc comments for aggregate_{field,array}_init
nickrolfe Aug 30, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions cpp/ql/src/semmle/code/cpp/exprs/Literal.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,8 @@ class ClassAggregateLiteral extends AggregateLiteral {
*/
Expr getFieldExpr(Field field) {
field = classType.getAField() and
result = getChild(field.getInitializationOrder())
aggregate_field_init(underlyingElement(this), unresolveElement(result),
unresolveElement(field))
}

/**
Expand Down Expand Up @@ -230,7 +231,8 @@ class ArrayAggregateLiteral extends AggregateLiteral {
* element `elementIndex`, if present.
*/
Expr getElementExpr(int elementIndex) {
result = getChild(elementIndex)
aggregate_array_init(underlyingElement(this), unresolveElement(result),
elementIndex)
}

/**
Expand Down
87 changes: 74 additions & 13 deletions cpp/ql/src/semmlecode.cpp.dbscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -543,19 +543,60 @@ enumconstants(
@localscopevariable = @localvariable | @parameter;

/*
Built-in types are the fundamental types, i.e., integral, floating, and void.
kind(1) = error, kind(2) = unknown, kind(3) = void, kind(4) = boolean,
kind(5) = char, kind(6) = unsigned char, kind(7) = signed char
kind(8) = short, kind(9) = unsigned short, kind(10) = signed short
kind(11) = int, kind(12) = unsigned int, kind(13) = signed int,
kind(14) = long, kind(15) = unsigned long, kind(16) = signed long,
kind(17) = long long, kind(18) = unsigned long long, kind(19) = signed long long,
kind(20) = __int8, kind(21) = __int16, kind(22) = __int32, kind(23) = __int64, // Microsoft specific
kind(24) = float, kind(25) = double, kind(26) = long double,
kind(27) = _Complex float, kind(28) = _Complex double, kind(29) = _Complex long double, //C99 specific
kind(30) = _Imaginary float, kind(31) = _Imaginary double, kind(32) = _Imaginary long double, //C99 specific
kind(33) = wchar_t, // MS specific
kind(34) = decltype(nullptr), // C++11
Built-in types are the fundamental types, e.g., integral, floating, and void.

case @builtintype.kind of
1 = error
| 2 = unknown
| 3 = void
| 4 = boolean
| 5 = char
| 6 = unsigned_char
| 7 = signed_char
| 8 = short
| 9 = unsigned_short
| 10 = signed_short
| 11 = int
| 12 = unsigned_int
| 13 = signed_int
| 14 = long
| 15 = unsigned_long
| 16 = signed_long
| 17 = long_long
| 18 = unsigned_long_long
| 19 = signed_long_long
| 20 = __int8 // Microsoft-specific
| 21 = __int16 // Microsoft-specific
| 22 = __int32 // Microsoft-specific
| 23 = __int64 // Microsoft-specific
| 24 = float
| 25 = double
| 26 = long_double
| 27 = _Complex_float // C99-specific
| 28 = _Complex_double // C99-specific
| 29 = _Complex_long double // C99-specific
| 30 = _Imaginary_float // C99-specific
| 31 = _Imaginary_double // C99-specific
| 32 = _Imaginary_long_double // C99-specific
| 33 = wchar_t // Microsoft-specific
| 34 = decltype_nullptr // C++11
| 35 = __int128
| 36 = unsigned___int128
| 37 = signed___int128
| 38 = __float128
| 39 = _Complex___float128
| 40 = _Decimal32
| 41 = _Decimal64
| 42 = _Decimal128
| 43 = char16_t
| 44 = char32_t
| 45 = _Float32
| 46 = _Float32x
| 47 = _Float64
| 48 = _Float64x
| 49 = _Float128
| 50 = _Float128x
;
*/
builtintypes(
unique int id: @builtintype,
Expand Down Expand Up @@ -1400,6 +1441,26 @@ new_array_allocated_type(
int type_id: @type ref
);

/**
* The field being initialized by an initializer expression within an aggregate
* initializer for a class/struct/union.
*/
aggregate_field_init(
unique int aggregate: @aggregateliteral ref,
int initializer: @expr ref,
int field: @membervariable ref
);

/**
* The index of the element being initialized by an initializer expression
* within an aggregate initializer for an array.
*/
aggregate_array_init(
unique int aggregate: @aggregateliteral ref,
int initializer: @expr ref,
int element_index: int ref
);

@ctorinit = @ctordirectinit
| @ctorvirtualinit
| @ctorfieldinit
Expand Down
Loading