Skip to content
This repository was archived by the owner on Dec 14, 2021. It is now read-only.

Commit 707de37

Browse files
authored
Clean up types (#9)
* remove unused node and edge types * update version number
1 parent d18654a commit 707de37

File tree

11 files changed

+12
-44
lines changed

11 files changed

+12
-44
lines changed

core/include/EdgeKind.h

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -37,16 +37,13 @@ namespace sourcetrail
3737
CALL = 1 << 3,
3838
INHERITANCE = 1 << 4,
3939
OVERRIDE = 1 << 5,
40-
TEMPLATE_ARGUMENT = 1 << 6,
41-
TYPE_ARGUMENT = 1 << 7,
42-
TEMPLATE_DEFAULT_ARGUMENT = 1 << 8,
43-
TEMPLATE_SPECIALIZATION = 1 << 9,
44-
TEMPLATE_MEMBER_SPECIALIZATION = 1 << 10,
45-
INCLUDE = 1 << 11,
46-
IMPORT = 1 << 12,
47-
AGGREGATION = 1 << 13,
48-
MACRO_USAGE = 1 << 14,
49-
ANNOTATION_USAGE = 1 << 15
40+
TYPE_ARGUMENT = 1 << 6,
41+
TEMPLATE_SPECIALIZATION = 1 << 7,
42+
INCLUDE = 1 << 8,
43+
IMPORT = 1 << 9,
44+
AGGREGATION = 1 << 10,
45+
MACRO_USAGE = 1 << 11,
46+
ANNOTATION_USAGE = 1 << 12
5047
};
5148

5249
int edgeKindToInt(EdgeKind kind);

core/include/NodeKind.h

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,10 @@ namespace sourcetrail
4141
ENUM = 1 << 14,
4242
ENUM_CONSTANT = 1 << 15,
4343
TYPEDEF = 1 << 16,
44-
TEMPLATE_PARAMETER = 1 << 17,
45-
TYPE_PARAMETER = 1 << 18,
46-
FILE = 1 << 19,
47-
MACRO = 1 << 20,
48-
UNION = 1 << 21
44+
TYPE_PARAMETER = 1 << 17,
45+
FILE = 1 << 18,
46+
MACRO = 1 << 19,
47+
UNION = 1 << 20
4948
};
5049

5150
int nodeKindToInt(NodeKind kind);

core/include/ReferenceKind.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,8 @@ namespace sourcetrail
3131
CALL,
3232
INHERITANCE,
3333
OVERRIDE,
34-
TEMPLATE_ARGUMENT,
3534
TYPE_ARGUMENT,
36-
TEMPLATE_DEFAULT_ARGUMENT,
3735
TEMPLATE_SPECIALIZATION,
38-
TEMPLATE_MEMBER_SPECIALIZATION,
3936
INCLUDE,
4037
IMPORT,
4138
MACRO_USAGE,

core/include/SymbolKind.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ namespace sourcetrail
4242
ENUM,
4343
ENUM_CONSTANT,
4444
TYPEDEF,
45-
TEMPLATE_PARAMETER,
4645
TYPE_PARAMETER,
4746
MACRO,
4847
UNION

core/src/EdgeKind.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,8 @@ namespace sourcetrail
3434
EdgeKind::CALL,
3535
EdgeKind::INHERITANCE,
3636
EdgeKind::OVERRIDE,
37-
EdgeKind::TEMPLATE_ARGUMENT,
3837
EdgeKind::TYPE_ARGUMENT,
39-
EdgeKind::TEMPLATE_DEFAULT_ARGUMENT,
4038
EdgeKind::TEMPLATE_SPECIALIZATION,
41-
EdgeKind::TEMPLATE_MEMBER_SPECIALIZATION,
4239
EdgeKind::INCLUDE,
4340
EdgeKind::IMPORT,
4441
EdgeKind::AGGREGATION,

core/src/NodeKind.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ namespace sourcetrail
4343
NodeKind::ENUM,
4444
NodeKind::ENUM_CONSTANT,
4545
NodeKind::TYPEDEF,
46-
NodeKind::TEMPLATE_PARAMETER,
4746
NodeKind::TYPE_PARAMETER,
4847
NodeKind::FILE,
4948
NodeKind::MACRO,

core/src/ReferenceKind.cpp

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,16 +34,10 @@ namespace sourcetrail
3434
return EdgeKind::INHERITANCE;
3535
case ReferenceKind::OVERRIDE:
3636
return EdgeKind::OVERRIDE;
37-
case ReferenceKind::TEMPLATE_ARGUMENT:
38-
return EdgeKind::TEMPLATE_ARGUMENT;
3937
case ReferenceKind::TYPE_ARGUMENT:
4038
return EdgeKind::TYPE_ARGUMENT;
41-
case ReferenceKind::TEMPLATE_DEFAULT_ARGUMENT:
42-
return EdgeKind::TEMPLATE_DEFAULT_ARGUMENT;
4339
case ReferenceKind::TEMPLATE_SPECIALIZATION:
4440
return EdgeKind::TEMPLATE_SPECIALIZATION;
45-
case ReferenceKind::TEMPLATE_MEMBER_SPECIALIZATION:
46-
return EdgeKind::TEMPLATE_MEMBER_SPECIALIZATION;
4741
case ReferenceKind::INCLUDE:
4842
return EdgeKind::INCLUDE;
4943
case ReferenceKind::IMPORT:

core/src/SymbolKind.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,6 @@ namespace sourcetrail
5656
return NodeKind::ENUM_CONSTANT;
5757
case SymbolKind::TYPEDEF:
5858
return NodeKind::TYPEDEF;
59-
case SymbolKind::TEMPLATE_PARAMETER:
60-
return NodeKind::TEMPLATE_PARAMETER;
6159
case SymbolKind::TYPE_PARAMETER:
6260
return NodeKind::TYPE_PARAMETER;
6361
case SymbolKind::MACRO:

resources_swig/include/sourcetraildb.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ enum SymbolKind
2727
SYMBOL_ENUM,
2828
SYMBOL_ENUM_CONSTANT,
2929
SYMBOL_TYPEDEF,
30-
SYMBOL_TEMPLATE_PARAMETER,
3130
SYMBOL_TYPE_PARAMETER,
3231
SYMBOL_MACRO,
3332
SYMBOL_UNION
@@ -40,11 +39,8 @@ enum ReferenceKind
4039
REFERENCE_CALL,
4140
REFERENCE_INHERITANCE,
4241
REFERENCE_OVERRIDE,
43-
REFERENCE_TEMPLATE_ARGUMENT,
4442
REFERENCE_TYPE_ARGUMENT,
45-
REFERENCE_TEMPLATE_DEFAULT_ARGUMENT,
4643
REFERENCE_TEMPLATE_SPECIALIZATION,
47-
REFERENCE_TEMPLATE_MEMBER_SPECIALIZATION,
4844
REFERENCE_INCLUDE,
4945
REFERENCE_IMPORT,
5046
REFERENCE_MACRO_USAGE,

resources_swig/src/sourcetraildb.cpp

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,6 @@ namespace
5757
return sourcetrail::SymbolKind::ENUM_CONSTANT;
5858
case SYMBOL_TYPEDEF:
5959
return sourcetrail::SymbolKind::TYPEDEF;
60-
case SYMBOL_TEMPLATE_PARAMETER:
61-
return sourcetrail::SymbolKind::TEMPLATE_PARAMETER;
6260
case SYMBOL_TYPE_PARAMETER:
6361
return sourcetrail::SymbolKind::TYPE_PARAMETER;
6462
case SYMBOL_MACRO:
@@ -83,16 +81,10 @@ namespace
8381
return sourcetrail::ReferenceKind::INHERITANCE;
8482
case REFERENCE_OVERRIDE:
8583
return sourcetrail::ReferenceKind::OVERRIDE;
86-
case REFERENCE_TEMPLATE_ARGUMENT:
87-
return sourcetrail::ReferenceKind::TEMPLATE_ARGUMENT;
8884
case REFERENCE_TYPE_ARGUMENT:
8985
return sourcetrail::ReferenceKind::TYPE_ARGUMENT;
90-
case REFERENCE_TEMPLATE_DEFAULT_ARGUMENT:
91-
return sourcetrail::ReferenceKind::TEMPLATE_DEFAULT_ARGUMENT;
9286
case REFERENCE_TEMPLATE_SPECIALIZATION:
9387
return sourcetrail::ReferenceKind::TEMPLATE_SPECIALIZATION;
94-
case REFERENCE_TEMPLATE_MEMBER_SPECIALIZATION:
95-
return sourcetrail::ReferenceKind::TEMPLATE_MEMBER_SPECIALIZATION;
9688
case REFERENCE_INCLUDE:
9789
return sourcetrail::ReferenceKind::INCLUDE;
9890
case REFERENCE_IMPORT:

0 commit comments

Comments
 (0)