Skip to content
This repository was archived by the owner on Mar 8, 2020. It is now read-only.

Commit 1476349

Browse files
author
Juanjo Alvarez
committed
Fixed bug where different properties were dumped together in some instances. Removed some verbosity
Signed-off-by: Juanjo Alvarez <juanjo@sourced.tech> Regenerated fixtures Signed-off-by: Juanjo Alvarez <juanjo@sourced.tech>
1 parent 456c612 commit 1476349

194 files changed

Lines changed: 242238 additions & 309675 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎fixtures/_integration.cpp.legacy‎

Lines changed: 14 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@ CPPASTTranslationUnit {
3030
. . . Properties: {
3131
. . . . IsActive: true
3232
. . . . IsFrozen: true
33-
. . . . Role: IASTTranslationUnit.OWNED_DECLARATION - IASTDeclaration for IASTTranslationUnit
34-
. . . . internalRole: IASTTranslationUnit.OWNED_DECLARATION
33+
. . . . internalRole: Prop_OWNED_DECLARATION
3534
. . . }
3635
. . . Children: {
3736
. . . . 0: CPPASTName {
@@ -51,8 +50,7 @@ CPPASTTranslationUnit {
5150
. . . . . . IsFrozen: true
5251
. . . . . . IsQualified: false
5352
. . . . . . Name: std
54-
. . . . . . Role: ICPPASTUsingDirective.QUALIFIED_NAME - Name brought into local scope
55-
. . . . . . internalRole: ICPPASTUsingDirective.QUALIFIED_NAME
53+
. . . . . . internalRole: Prop_QUALIFIED_NAME
5654
. . . . . }
5755
. . . . }
5856
. . . }
@@ -74,8 +72,7 @@ CPPASTTranslationUnit {
7472
. . . . IsDefaulted: false
7573
. . . . IsDeleted: false
7674
. . . . IsFrozen: true
77-
. . . . Role: IASTTranslationUnit.OWNED_DECLARATION - IASTDeclaration for IASTTranslationUnit
78-
. . . . internalRole: IASTTranslationUnit.OWNED_DECLARATION
75+
. . . . internalRole: Prop_OWNED_DECLARATION
7976
. . . }
8077
. . . Children: {
8178
. . . . 0: CPPASTSimpleDeclSpecifier {
@@ -109,10 +106,9 @@ CPPASTTranslationUnit {
109106
. . . . . . IsUnsigned: false
110107
. . . . . . IsVirtual: false
111108
. . . . . . IsVolatile: false
112-
. . . . . . Role: IASTFunctionDefinition.DECL_SPECIFIER - IASTDeclSpecifier for IASTFunctionDefinition
113109
. . . . . . StorageClass: unspecified
114110
. . . . . . Type: int
115-
. . . . . . internalRole: IASTFunctionDefinition.DECL_SPECIFIER
111+
. . . . . . internalRole: Prop_DECL_SPECIFIER
116112
. . . . . }
117113
. . . . }
118114
. . . . 1: CPPASTFunctionDeclarator {
@@ -137,9 +133,8 @@ CPPASTTranslationUnit {
137133
. . . . . . IsOverride: false
138134
. . . . . . IsPureVirtual: false
139135
. . . . . . IsVolatile: false
140-
. . . . . . Role: IASTFunctionDefinition.DECLARATOR - IASTFunctionDeclarator for IASTFunctionDefinition
141136
. . . . . . TakesVarArgs: false
142-
. . . . . . internalRole: IASTFunctionDefinition.DECLARATOR
137+
. . . . . . internalRole: Prop_DECLARATOR
143138
. . . . . }
144139
. . . . . Children: {
145140
. . . . . . 0: CPPASTName {
@@ -159,8 +154,7 @@ CPPASTTranslationUnit {
159154
. . . . . . . . IsFrozen: true
160155
. . . . . . . . IsQualified: false
161156
. . . . . . . . Name: main
162-
. . . . . . . . Role: IASTDeclarator.DECLARATOR_NAME - IASTName for IASTDeclarator
163-
. . . . . . . . internalRole: IASTDeclarator.DECLARATOR_NAME
157+
. . . . . . . . internalRole: Prop_DECLARATOR_NAME
164158
. . . . . . . }
165159
. . . . . . }
166160
. . . . . }
@@ -180,8 +174,7 @@ CPPASTTranslationUnit {
180174
. . . . . Properties: {
181175
. . . . . . IsActive: true
182176
. . . . . . IsFrozen: true
183-
. . . . . . Role: IASTFunctionDefinition.FUNCTION_BODY - Function Body for IASTFunctionDefinition
184-
. . . . . . internalRole: IASTFunctionDefinition.FUNCTION_BODY
177+
. . . . . . internalRole: Prop_FUNCTION_BODY
185178
. . . . . }
186179
. . . . . Children: {
187180
. . . . . . 0: CPPASTExpressionStatement {
@@ -199,8 +192,7 @@ CPPASTTranslationUnit {
199192
. . . . . . . Properties: {
200193
. . . . . . . . IsActive: true
201194
. . . . . . . . IsFrozen: true
202-
. . . . . . . . Role: IASTCompoundStatement.NESTED_STATEMENT - nested IASTStatement for IASTCompoundStatement
203-
. . . . . . . . internalRole: IASTCompoundStatement.NESTED_STATEMENT
195+
. . . . . . . . internalRole: Prop_NESTED_STATEMENT
204196
. . . . . . . }
205197
. . . . . . . Children: {
206198
. . . . . . . . 0: CPPASTBinaryExpression {
@@ -222,8 +214,7 @@ CPPASTTranslationUnit {
222214
. . . . . . . . . . IsFrozen: true
223215
. . . . . . . . . . IsLValue: false
224216
. . . . . . . . . . Operator: left <<
225-
. . . . . . . . . . Role: IASTExpressionStatement.EXPRESSION - IASTExpression for IASTExpressionStatement
226-
. . . . . . . . . . internalRole: IASTExpressionStatement.EXPRESSION
217+
. . . . . . . . . . internalRole: Prop_EXPRESSION
227218
. . . . . . . . . }
228219
. . . . . . . . . Children: {
229220
. . . . . . . . . . 0: CPPASTIdExpression {
@@ -244,8 +235,7 @@ CPPASTTranslationUnit {
244235
. . . . . . . . . . . . IsActive: true
245236
. . . . . . . . . . . . IsFrozen: true
246237
. . . . . . . . . . . . IsLValue: false
247-
. . . . . . . . . . . . Role: IASTBinaryExpression.OPERAND_ONE - IASTExpression for LHS
248-
. . . . . . . . . . . . internalRole: IASTBinaryExpression.OPERAND_ONE
238+
. . . . . . . . . . . . internalRole: Prop_OPERAND_ONE
249239
. . . . . . . . . . . }
250240
. . . . . . . . . . . Children: {
251241
. . . . . . . . . . . . 0: CPPASTName {
@@ -265,8 +255,7 @@ CPPASTTranslationUnit {
265255
. . . . . . . . . . . . . . IsFrozen: true
266256
. . . . . . . . . . . . . . IsQualified: false
267257
. . . . . . . . . . . . . . Name: cout
268-
. . . . . . . . . . . . . . Role: IASTIdExpression.ID_NAME - IASTName for IASTIdExpression
269-
. . . . . . . . . . . . . . internalRole: IASTIdExpression.ID_NAME
258+
. . . . . . . . . . . . . . internalRole: Prop_ID_NAME
270259
. . . . . . . . . . . . . }
271260
. . . . . . . . . . . . }
272261
. . . . . . . . . . . }
@@ -290,8 +279,7 @@ CPPASTTranslationUnit {
290279
. . . . . . . . . . . . IsFrozen: true
291280
. . . . . . . . . . . . IsLValue: true
292281
. . . . . . . . . . . . LiteralValue: "Hello, World!"
293-
. . . . . . . . . . . . Role: IASTBinaryExpression.OPERAND_TWO - IASTExpression for RHS
294-
. . . . . . . . . . . . internalRole: IASTBinaryExpression.OPERAND_TWO
282+
. . . . . . . . . . . . internalRole: Prop_OPERAND_TWO
295283
. . . . . . . . . . . . kind: string_literal
296284
. . . . . . . . . . . }
297285
. . . . . . . . . . }
@@ -314,8 +302,7 @@ CPPASTTranslationUnit {
314302
. . . . . . . Properties: {
315303
. . . . . . . . IsActive: true
316304
. . . . . . . . IsFrozen: true
317-
. . . . . . . . Role: IASTCompoundStatement.NESTED_STATEMENT - nested IASTStatement for IASTCompoundStatement
318-
. . . . . . . . internalRole: IASTCompoundStatement.NESTED_STATEMENT
305+
. . . . . . . . internalRole: Prop_NESTED_STATEMENT
319306
. . . . . . . }
320307
. . . . . . . Children: {
321308
. . . . . . . . 0: CPPASTLiteralExpression {
@@ -337,8 +324,7 @@ CPPASTTranslationUnit {
337324
. . . . . . . . . . IsFrozen: true
338325
. . . . . . . . . . IsLValue: false
339326
. . . . . . . . . . LiteralValue: 0
340-
. . . . . . . . . . Role: IASTReturnValue.RETURNVALUE - [IASTInitializerClause]
341-
. . . . . . . . . . internalRole: IASTReturnValue.RETURNVALUE
327+
. . . . . . . . . . internalRole: Prop_RETURNVALUE
342328
. . . . . . . . . . kind: integer_constant
343329
. . . . . . . . . }
344330
. . . . . . . . }

‎fixtures/_integration.cpp.native‎

Lines changed: 60 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,17 @@
11
{
22
IASTClass: "CPPASTTranslationUnit",
3-
'IASTTranslationUnit.OWNED_DECLARATION': [
3+
IsActive: true,
4+
IsFrozen: true,
5+
LocOffsetEnd: 100,
6+
LocOffsetStart: 0,
7+
'Prop_OWNED_DECLARATION': [
48
{
59
IASTClass: "CPPASTUsingDirective",
6-
'ICPPASTUsingDirective.QUALIFIED_NAME': [
10+
IsActive: true,
11+
IsFrozen: true,
12+
LocOffsetEnd: 40,
13+
LocOffsetStart: 20,
14+
'Prop_QUALIFIED_NAME': [
715
{
816
IASTClass: "CPPASTName",
917
IsActive: true,
@@ -12,33 +20,21 @@
1220
LocOffsetEnd: 39,
1321
LocOffsetStart: 36,
1422
Name: "std",
15-
Role: "ICPPASTUsingDirective.QUALIFIED_NAME - Name brought into local scope",
1623
},
1724
],
18-
IsActive: true,
19-
IsFrozen: true,
20-
LocOffsetEnd: 40,
21-
LocOffsetStart: 20,
22-
Role: "IASTTranslationUnit.OWNED_DECLARATION - IASTDeclaration for IASTTranslationUnit",
2325
},
2426
{
2527
IASTClass: "CPPASTFunctionDefinition",
26-
'IASTFunctionDefinition.DECLARATOR': [
28+
IsActive: true,
29+
IsDefaulted: false,
30+
IsDeleted: false,
31+
IsFrozen: true,
32+
LocOffsetEnd: 99,
33+
LocOffsetStart: 42,
34+
'Prop_DECLARATOR': [
2735
{
2836
DeclaresParameterPack: false,
2937
IASTClass: "CPPASTFunctionDeclarator",
30-
'IASTDeclarator.DECLARATOR_NAME': [
31-
{
32-
IASTClass: "CPPASTName",
33-
IsActive: true,
34-
IsFrozen: true,
35-
IsQualified: false,
36-
LocOffsetEnd: 50,
37-
LocOffsetStart: 46,
38-
Name: "main",
39-
Role: "IASTDeclarator.DECLARATOR_NAME - IASTName for IASTDeclarator",
40-
},
41-
],
4238
IsActive: true,
4339
IsConst: false,
4440
IsFinal: false,
@@ -49,11 +45,21 @@
4945
IsVolatile: false,
5046
LocOffsetEnd: 52,
5147
LocOffsetStart: 46,
52-
Role: "IASTFunctionDefinition.DECLARATOR - IASTFunctionDeclarator for IASTFunctionDefinition",
48+
'Prop_DECLARATOR_NAME': [
49+
{
50+
IASTClass: "CPPASTName",
51+
IsActive: true,
52+
IsFrozen: true,
53+
IsQualified: false,
54+
LocOffsetEnd: 50,
55+
LocOffsetStart: 46,
56+
Name: "main",
57+
},
58+
],
5359
TakesVarArgs: false,
5460
},
5561
],
56-
'IASTFunctionDefinition.DECL_SPECIFIER': [
62+
'Prop_DECL_SPECIFIER': [
5763
{
5864
IASTClass: "CPPASTSimpleDeclSpecifier",
5965
IsActive: true,
@@ -76,27 +82,46 @@
7682
IsVolatile: false,
7783
LocOffsetEnd: 45,
7884
LocOffsetStart: 42,
79-
Role: "IASTFunctionDefinition.DECL_SPECIFIER - IASTDeclSpecifier for IASTFunctionDefinition",
8085
StorageClass: "unspecified",
8186
Type: "int",
8287
},
8388
],
84-
'IASTFunctionDefinition.FUNCTION_BODY': [
89+
'Prop_FUNCTION_BODY': [
8590
{
8691
IASTClass: "CPPASTCompoundStatement",
87-
'IASTCompoundStatement.NESTED_STATEMENT': [
92+
IsActive: true,
93+
IsFrozen: true,
94+
LocOffsetEnd: 99,
95+
LocOffsetStart: 53,
96+
'Prop_NESTED_STATEMENT': [
8897
{
8998
IASTClass: "CPPASTExpressionStatement",
90-
'IASTExpressionStatement.EXPRESSION': [
99+
IsActive: true,
100+
IsFrozen: true,
101+
LocOffsetEnd: 83,
102+
LocOffsetStart: 59,
103+
'Prop_EXPRESSION': [
91104
{
92105
ExpressionType: "org.eclipse.cdt.internal.core.dom.parser.ProblemType@28eaa59a",
93106
ExpressionValueCategory: "PRVALUE",
94-
'IASTBinaryExpression.OPERAND_ONE': [
107+
IASTClass: "CPPASTBinaryExpression",
108+
IsActive: true,
109+
IsFrozen: true,
110+
IsLValue: false,
111+
LocOffsetEnd: 82,
112+
LocOffsetStart: 59,
113+
Operator: "left <<",
114+
'Prop_OPERAND_ONE': [
95115
{
96116
ExpressionType: "org.eclipse.cdt.internal.core.dom.parser.ProblemType@28eaa59a",
97117
ExpressionValueCategory: "PRVALUE",
98118
IASTClass: "CPPASTIdExpression",
99-
'IASTIdExpression.ID_NAME': [
119+
IsActive: true,
120+
IsFrozen: true,
121+
IsLValue: false,
122+
LocOffsetEnd: 63,
123+
LocOffsetStart: 59,
124+
'Prop_ID_NAME': [
100125
{
101126
IASTClass: "CPPASTName",
102127
IsActive: true,
@@ -105,18 +130,11 @@
105130
LocOffsetEnd: 63,
106131
LocOffsetStart: 59,
107132
Name: "cout",
108-
Role: "IASTIdExpression.ID_NAME - IASTName for IASTIdExpression",
109133
},
110134
],
111-
IsActive: true,
112-
IsFrozen: true,
113-
IsLValue: false,
114-
LocOffsetEnd: 63,
115-
LocOffsetStart: 59,
116-
Role: "IASTBinaryExpression.OPERAND_ONE - IASTExpression for LHS",
117135
},
118136
],
119-
'IASTBinaryExpression.OPERAND_TWO': [
137+
'Prop_OPERAND_TWO': [
120138
{
121139
ExpressionType: "const char [14]",
122140
ExpressionValueCategory: "LVALUE",
@@ -127,29 +145,19 @@
127145
LiteralValue: "\"Hello, World!\"",
128146
LocOffsetEnd: 82,
129147
LocOffsetStart: 67,
130-
Role: "IASTBinaryExpression.OPERAND_TWO - IASTExpression for RHS",
131148
kind: "string_literal",
132149
},
133150
],
134-
IASTClass: "CPPASTBinaryExpression",
135-
IsActive: true,
136-
IsFrozen: true,
137-
IsLValue: false,
138-
LocOffsetEnd: 82,
139-
LocOffsetStart: 59,
140-
Operator: "left <<",
141-
Role: "IASTExpressionStatement.EXPRESSION - IASTExpression for IASTExpressionStatement",
142151
},
143152
],
144-
IsActive: true,
145-
IsFrozen: true,
146-
LocOffsetEnd: 83,
147-
LocOffsetStart: 59,
148-
Role: "IASTCompoundStatement.NESTED_STATEMENT - nested IASTStatement for IASTCompoundStatement",
149153
},
150154
{
151155
IASTClass: "CPPASTReturnStatement",
152-
'IASTReturnValue.RETURNVALUE': [
156+
IsActive: true,
157+
IsFrozen: true,
158+
LocOffsetEnd: 97,
159+
LocOffsetStart: 88,
160+
'Prop_RETURNVALUE': [
153161
{
154162
ExpressionType: "int",
155163
ExpressionValueCategory: "PRVALUE",
@@ -160,35 +168,13 @@
160168
LiteralValue: "0",
161169
LocOffsetEnd: 96,
162170
LocOffsetStart: 95,
163-
Role: "IASTReturnValue.RETURNVALUE - [IASTInitializerClause]",
164171
kind: "integer_constant",
165172
},
166173
],
167-
IsActive: true,
168-
IsFrozen: true,
169-
LocOffsetEnd: 97,
170-
LocOffsetStart: 88,
171-
Role: "IASTCompoundStatement.NESTED_STATEMENT - nested IASTStatement for IASTCompoundStatement",
172174
},
173175
],
174-
IsActive: true,
175-
IsFrozen: true,
176-
LocOffsetEnd: 99,
177-
LocOffsetStart: 53,
178-
Role: "IASTFunctionDefinition.FUNCTION_BODY - Function Body for IASTFunctionDefinition",
179176
},
180177
],
181-
IsActive: true,
182-
IsDefaulted: false,
183-
IsDeleted: false,
184-
IsFrozen: true,
185-
LocOffsetEnd: 99,
186-
LocOffsetStart: 42,
187-
Role: "IASTTranslationUnit.OWNED_DECLARATION - IASTDeclaration for IASTTranslationUnit",
188178
},
189179
],
190-
IsActive: true,
191-
IsFrozen: true,
192-
LocOffsetEnd: 100,
193-
LocOffsetStart: 0,
194180
}

0 commit comments

Comments
 (0)