Skip to content

Commit 5b99c20

Browse files
committed
NFC: Re-organize NameBinding tests
The directory currently seems to have a mix of tests for import resolution and name lookup. Therefore split it into two directories; ImportResolution and NameLookup.
1 parent 92c8a65 commit 5b99c20

File tree

125 files changed

+14
-2
lines changed

Some content is hidden

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

125 files changed

+14
-2
lines changed

lib/AST/UnqualifiedLookup.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1448,7 +1448,7 @@ bool UnqualifiedLookupFactory::shouldDiffer() const {
14481448
"swift/test/TypeCoercion/overload_noncall.swift",
14491449
"swift/test/expr/capture/nested_class.swift",
14501450
"swift/test/expr/capture/order.swift",
1451-
"swift/test/NameBinding/name-binding.swift"
1451+
"swift/test/NameLookup/name_lookup2.swift"
14521452
};
14531453
StringRef fileName = SF->getFilename();
14541454
return llvm::any_of(testsThatShouldDiffer, [&](const char *testFile) {
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
public func funcOrVar() {}
2+
3+
public struct SomeStruct {}
4+
public var someVar : () = ()
5+
6+
public func overloadedFunc() {}
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
public var funcOrVar : Int = Int()
2+
3+
public struct SomeStruct {}
4+
public var someVar : () = ()
5+
6+
public func overloadedFunc(x: Int) {}
File renamed without changes.
File renamed without changes.

test/NameBinding/scope_map_top_level.swift renamed to test/NameLookup/scope_map_top_level.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ var i: Int = b.my_identity()
2626

2727

2828
// CHECK-EXPANDED: ***Complete scope map***
29-
// CHECK-EXPANDED-NEXT: ASTSourceFileScope {{.*}}, (uncached) [1:1 - 6{{.*}}:1] 'SOURCE_DIR{{[/\\]}}test{{[/\\]}}NameBinding{{[/\\]}}scope_map_top_level.swift'
29+
// CHECK-EXPANDED-NEXT: ASTSourceFileScope {{.*}}, (uncached) [1:1 - 6{{.*}}:1] 'SOURCE_DIR{{[/\\]}}test{{[/\\]}}NameLookup{{[/\\]}}scope_map_top_level.swift'
3030
// CHECK-EXPANDED-NEXT: |-NominalTypeDeclScope {{.*}}, [4:1 - 4:13]
3131
// CHECK-EXPANDED-NEXT: `-NominalTypeBodyScope {{.*}}, [4:11 - 4:13]
3232
// CHECK-EXPANDED-NEXT: `-TopLevelCodeScope {{.*}}, [6:1 - 21:28]
File renamed without changes.

0 commit comments

Comments
 (0)