Skip to content
This repository has been archived by the owner on Jul 30, 2020. It is now read-only.

Commit

Permalink
Index tests need to be CRLF
Browse files Browse the repository at this point in the history
  • Loading branch information
jacobdufault committed Jan 4, 2018
1 parent ee01f8c commit 322fccd
Show file tree
Hide file tree
Showing 39 changed files with 221 additions and 222 deletions.
3 changes: 1 addition & 2 deletions .gitattributes
Expand Up @@ -4,5 +4,4 @@
*.cc text eol=auto

# Tests must always be crlf
full_tests/** text eol=crlf
tests/** text eol=crlf
index_tests/** text eol=crlf
4 changes: 2 additions & 2 deletions index_tests/constructors/constructor.cc
Expand Up @@ -60,7 +60,7 @@ void foo() {
}],
"vars": [{
"id": 0,
"usr": "c:constructor.cc@50@F@foo#@f",
"usr": "c:constructor.cc@56@F@foo#@f",
"short_name": "f",
"detailed_name": "Foo f",
"definition_spelling": "7:7-7:8",
Expand All @@ -70,7 +70,7 @@ void foo() {
"uses": ["7:7-7:8"]
}, {
"id": 1,
"usr": "c:constructor.cc@59@F@foo#@f2",
"usr": "c:constructor.cc@66@F@foo#@f2",
"short_name": "f2",
"detailed_name": "Foo *f2",
"definition_spelling": "8:8-8:10",
Expand Down
2 changes: 1 addition & 1 deletion index_tests/constructors/destructor.cc
Expand Up @@ -80,7 +80,7 @@ void foo() {
}],
"vars": [{
"id": 0,
"usr": "c:destructor.cc@63@F@foo#@f",
"usr": "c:destructor.cc@70@F@foo#@f",
"short_name": "f",
"detailed_name": "Foo f",
"definition_spelling": "8:7-8:8",
Expand Down
4 changes: 2 additions & 2 deletions index_tests/constructors/implicit_constructor.cc
Expand Up @@ -59,7 +59,7 @@ void Make() {
}],
"vars": [{
"id": 0,
"usr": "c:implicit_constructor.cc@46@F@Make#@foo0",
"usr": "c:implicit_constructor.cc@51@F@Make#@foo0",
"short_name": "foo0",
"detailed_name": "Type foo0",
"definition_spelling": "6:8-6:12",
Expand All @@ -69,7 +69,7 @@ void Make() {
"uses": ["6:8-6:12"]
}, {
"id": 1,
"usr": "c:implicit_constructor.cc@59@F@Make#@foo1",
"usr": "c:implicit_constructor.cc@65@F@Make#@foo1",
"short_name": "foo1",
"detailed_name": "Type foo1",
"definition_spelling": "7:8-7:12",
Expand Down
12 changes: 6 additions & 6 deletions index_tests/constructors/make_functions.cc
Expand Up @@ -129,7 +129,7 @@ OUTPUT: make_functions.cc
"skipped_by_preprocessor": [],
"types": [{
"id": 0,
"usr": "c:make_functions.cc@39",
"usr": "c:make_functions.cc@41",
"short_name": "T",
"detailed_name": "T",
"definition_spelling": "3:20-3:21",
Expand All @@ -143,7 +143,7 @@ OUTPUT: make_functions.cc
"uses": ["4:1-4:2", "3:20-3:21"]
}, {
"id": 1,
"usr": "c:make_functions.cc@51",
"usr": "c:make_functions.cc@53",
"short_name": "Args",
"detailed_name": "Args",
"definition_spelling": "3:35-3:39",
Expand All @@ -157,7 +157,7 @@ OUTPUT: make_functions.cc
"uses": ["3:35-3:39", "4:15-4:19"]
}, {
"id": 2,
"usr": "c:make_functions.cc@132",
"usr": "c:make_functions.cc@139",
"short_name": "T",
"detailed_name": "T",
"definition_spelling": "8:20-8:21",
Expand All @@ -171,7 +171,7 @@ OUTPUT: make_functions.cc
"uses": ["9:1-9:2", "8:20-8:21"]
}, {
"id": 3,
"usr": "c:make_functions.cc@144",
"usr": "c:make_functions.cc@151",
"short_name": "Args",
"detailed_name": "Args",
"definition_spelling": "8:35-8:39",
Expand Down Expand Up @@ -301,7 +301,7 @@ OUTPUT: make_functions.cc
}],
"vars": [{
"id": 0,
"usr": "c:make_functions.cc@83@FT@>2#T#pTMakeUnique#P&&t0.1#*t0.0#@args",
"usr": "c:make_functions.cc@86@FT@>2#T#pTMakeUnique#P&&t0.1#*t0.0#@args",
"short_name": "args",
"detailed_name": "Args &&... args",
"definition_spelling": "4:25-4:29",
Expand All @@ -310,7 +310,7 @@ OUTPUT: make_functions.cc
"uses": ["4:25-4:29"]
}, {
"id": 1,
"usr": "c:make_functions.cc@177@FT@>2#T#pTmaKE_NoRefs#Pt0.1#*t0.0#@args",
"usr": "c:make_functions.cc@185@FT@>2#T#pTmaKE_NoRefs#Pt0.1#*t0.0#@args",
"short_name": "args",
"detailed_name": "Args... args",
"definition_spelling": "9:24-9:28",
Expand Down
Expand Up @@ -42,7 +42,7 @@ int foo(int a, int b) { return 0; }
}],
"vars": [{
"id": 0,
"usr": "c:func_associated_function_params.cc@87@F@foo#I#I#@a",
"usr": "c:func_associated_function_params.cc@91@F@foo#I#I#@a",
"short_name": "a",
"detailed_name": "int a",
"definition_spelling": "5:13-5:14",
Expand All @@ -51,7 +51,7 @@ int foo(int a, int b) { return 0; }
"uses": ["5:13-5:14"]
}, {
"id": 1,
"usr": "c:func_associated_function_params.cc@94@F@foo#I#I#@b",
"usr": "c:func_associated_function_params.cc@98@F@foo#I#I#@b",
"short_name": "b",
"detailed_name": "int b",
"definition_spelling": "5:20-5:21",
Expand Down
4 changes: 2 additions & 2 deletions index_tests/inheritance/class_inherit_templated_parent.cc
Expand Up @@ -75,7 +75,7 @@ class Derived : Base1<3>, Base2<Derived>, Derived1<4>, Derived2<Derived> {};
"uses": ["11:7-11:15", "13:56-13:64"]
}, {
"id": 4,
"usr": "c:class_inherit_templated_parent.cc@145",
"usr": "c:class_inherit_templated_parent.cc@154",
"short_name": "T",
"detailed_name": "T",
"definition_spelling": "10:19-10:20",
Expand Down Expand Up @@ -105,7 +105,7 @@ class Derived : Base1<3>, Base2<Derived>, Derived1<4>, Derived2<Derived> {};
"funcs": [],
"vars": [{
"id": 0,
"usr": "c:class_inherit_templated_parent.cc@89",
"usr": "c:class_inherit_templated_parent.cc@95",
"short_name": "T",
"detailed_name": "unsigned int T",
"definition_spelling": "7:23-7:24",
Expand Down
10 changes: 5 additions & 5 deletions index_tests/lambdas/lambda.cc
Expand Up @@ -18,7 +18,7 @@ void foo() {
"skipped_by_preprocessor": [],
"types": [{
"id": 0,
"usr": "c:lambda.cc@44@F@foo#@Sa",
"usr": "c:lambda.cc@47@F@foo#@Sa",
"short_name": "",
"detailed_name": "",
"parents": [],
Expand Down Expand Up @@ -46,7 +46,7 @@ void foo() {
}, {
"id": 1,
"is_operator": false,
"usr": "c:lambda.cc@54@F@foo#@Sa@F@operator()#I#1",
"usr": "c:lambda.cc@57@F@foo#@Sa@F@operator()#I#1",
"short_name": "",
"detailed_name": "",
"declarations": [],
Expand All @@ -58,7 +58,7 @@ void foo() {
}],
"vars": [{
"id": 0,
"usr": "c:lambda.cc@15@F@foo#@x",
"usr": "c:lambda.cc@16@F@foo#@x",
"short_name": "x",
"detailed_name": "int x",
"definition_spelling": "2:7-2:8",
Expand All @@ -67,7 +67,7 @@ void foo() {
"uses": ["2:7-2:8", "5:7-5:8", "4:24-4:25"]
}, {
"id": 1,
"usr": "c:lambda.cc@25@F@foo#@dosomething",
"usr": "c:lambda.cc@28@F@foo#@dosomething",
"short_name": "dosomething",
"detailed_name": "lambda dosomething",
"definition_spelling": "4:8-4:19",
Expand All @@ -77,7 +77,7 @@ void foo() {
"uses": ["4:8-4:19", "9:3-9:14", "10:3-10:14", "11:3-11:14"]
}, {
"id": 2,
"usr": "c:lambda.cc@49@F@foo#@Sa@F@operator()#I#1@y",
"usr": "c:lambda.cc@52@F@foo#@Sa@F@operator()#I#1@y",
"short_name": "y",
"detailed_name": "int y",
"definition_spelling": "4:31-4:32",
Expand Down
2 changes: 1 addition & 1 deletion index_tests/macros/foo.cc
Expand Up @@ -64,7 +64,7 @@ int x = A;
"uses": ["1:9-1:10", "8:9-8:10"]
}, {
"id": 2,
"usr": "c:foo.cc@20@macro@DISALLOW",
"usr": "c:foo.cc@21@macro@DISALLOW",
"short_name": "DISALLOW",
"detailed_name": "DISALLOW",
"hover": "#define DISALLOW(type) type(type&&) = delete;",
Expand Down
4 changes: 2 additions & 2 deletions index_tests/namespaces/namespace_alias.cc
Expand Up @@ -45,7 +45,7 @@ void func() {
"uses": ["4:18-4:21", "12:26-12:29", "13:16-13:19"]
}, {
"id": 1,
"usr": "c:namespace_alias.cc@156@F@func#@a",
"usr": "c:namespace_alias.cc@167@F@func#@a",
"short_name": "a",
"detailed_name": "int a",
"definition_spelling": "12:7-12:8",
Expand All @@ -54,7 +54,7 @@ void func() {
"uses": ["12:7-12:8"]
}, {
"id": 2,
"usr": "c:namespace_alias.cc@186@F@func#@b",
"usr": "c:namespace_alias.cc@198@F@func#@b",
"short_name": "b",
"detailed_name": "int b",
"definition_spelling": "13:7-13:8",
Expand Down
2 changes: 1 addition & 1 deletion index_tests/namespaces/namespace_reference.cc
Expand Up @@ -55,7 +55,7 @@ void Runner() {
"uses": ["2:7-2:10", "7:18-7:21", "9:10-9:13"]
}, {
"id": 1,
"usr": "c:namespace_reference.cc@40@N@ns@F@Accept#I#@a",
"usr": "c:namespace_reference.cc@42@N@ns@F@Accept#I#@a",
"short_name": "a",
"detailed_name": "int a",
"definition_spelling": "3:19-3:20",
Expand Down

0 comments on commit 322fccd

Please sign in to comment.