Skip to content

Commit f8d070e

Browse files
swift-ciswift-ci
committed
---
yaml --- r: 348131 b: refs/heads/master c: efe2c66 h: refs/heads/master i: 348129: 348c3cb 348127: bf2c39d
1 parent 3ea4b74 commit f8d070e

File tree

3 files changed

+14
-14
lines changed

3 files changed

+14
-14
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: ecbcf4815a1609c0b8c105bbb748213846e6e76c
2+
refs/heads/master: efe2c66c97438fcb7423bd6a2d10edd19739e54f
33
refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
44
refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
55
refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

‎trunk/test/NameBinding/scope_map.swift

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ class LazyProperties {
198198

199199

200200
// CHECK-EXPANDED: ***Complete scope map***
201-
// CHECK-EXPANDED-NEXT: ASTSourceFileScope {{.*}}, [1:1 - {{525}}:1] 'SOURCE_DIR/test/NameBinding/scope_map.swift'
201+
// CHECK-EXPANDED-NEXT: ASTSourceFileScope {{.*}}, [1:1 - {{525}}:1] 'SOURCE_DIR{{[/\\]}}test{{[/\\]}}NameBinding{{[/\\]}}scope_map.swift'
202202
// CHECK-EXPANDED-NEXT: |-NominalTypeDeclScope {{.*}}, [4:1 - 6:1] 'S0'
203203
// CHECK-EXPANDED-NEXT: `-NominalTypeBodyScope {{.*}}, [4:11 - 6:1] 'S0'
204204
// CHECK-EXPANDED-NEXT: `-NominalTypeDeclScope {{.*}}, [5:3 - 5:19] 'InnerC0'
@@ -349,7 +349,7 @@ class LazyProperties {
349349
// CHECK-EXPANDED-NEXT: `-NominalTypeBodyScope {{.*}}, [108:13 - 112:1] 'MyEnum'
350350
// CHECK-EXPANDED-NEXT: |-NominalTypeDeclScope {{.*}}, [114:1 - 130:1] 'StructContainsAbstractStorageDecls'
351351
// CHECK-EXPANDED-NEXT: `-NominalTypeBodyScope {{.*}}, [114:43 - 130:1] 'StructContainsAbstractStorageDecls'
352-
// CHECK-EXPANDED-NEXT: |-SubscriptDeclScope {{.*}}, [115:3 - 121:3] scope_map.(file).StructContainsAbstractStorageDecls.subscript(_:_:)@SOURCE_DIR/test/NameBinding/scope_map.swift:115:3
352+
// CHECK-EXPANDED-NEXT: |-SubscriptDeclScope {{.*}}, [115:3 - 121:3] scope_map.(file).StructContainsAbstractStorageDecls.subscript(_:_:)@SOURCE_DIR{{[/\\]}}test{{[/\\]}}NameBinding{{[/\\]}}scope_map.swift:115:3
353353
// CHECK-EXPANDED-NEXT: `-AbstractFunctionParamsScope {{.*}}, [115:13 - 121:3]
354354
// CHECK-EXPANDED-NEXT: |-AbstractFunctionDeclScope {{.*}}, [116:5 - 117:5] '_'
355355
// CHECK-EXPANDED-NEXT: `-MethodBodyScope {{.*}}, [116:9 - 117:5]
@@ -359,7 +359,7 @@ class LazyProperties {
359359
// CHECK-EXPANDED-NEXT: `-BraceStmtScope {{.*}}, [118:9 - 120:5]
360360
// CHECK-EXPANDED-NEXT: `-PatternEntryDeclScope {{.*}}, [123:7 - 129:3] entry 0 'computed'
361361
// CHECK-EXPANDED-NEXT: `-PatternEntryUseScope {{.*}}, [123:17 - 129:3] entry 0 'computed'
362-
// CHECK-EXPANDED-NEXT: `-VarDeclScope {{.*}}, [123:21 - 129:3] scope_map.(file).StructContainsAbstractStorageDecls.computed@SOURCE_DIR/test/NameBinding/scope_map.swift:123:7
362+
// CHECK-EXPANDED-NEXT: `-VarDeclScope {{.*}}, [123:21 - 129:3] scope_map.(file).StructContainsAbstractStorageDecls.computed@SOURCE_DIR{{[/\\]}}test{{[/\\]}}NameBinding{{[/\\]}}scope_map.swift:123:7
363363
// CHECK-EXPANDED-NEXT: |-AbstractFunctionDeclScope {{.*}}, [124:5 - 126:5] '_'
364364
// CHECK-EXPANDED-NEXT: `-MethodBodyScope {{.*}}, [124:9 - 126:5]
365365
// CHECK-EXPANDED-NEXT: `-BraceStmtScope {{.*}}, [124:9 - 126:5]
@@ -371,14 +371,14 @@ class LazyProperties {
371371
// CHECK-EXPANDED-NEXT: |-PatternEntryDeclScope {{.*}}, [133:7 - 135:3] entry 0 'willSetProperty'
372372
// CHECK-EXPANDED-NEXT: |-PatternEntryInitializerScope {{.*}}, [133:30 - 133:30] entry 0 'willSetProperty'
373373
// CHECK-EXPANDED-NEXT: `-PatternEntryUseScope {{.*}}, [133:30 - 135:3] entry 0 'willSetProperty'
374-
// CHECK-EXPANDED-NEXT: `-VarDeclScope {{.*}}, [133:32 - 135:3] scope_map.(file).ClassWithComputedProperties.willSetProperty@SOURCE_DIR/test/NameBinding/scope_map.swift:133:7
374+
// CHECK-EXPANDED-NEXT: `-VarDeclScope {{.*}}, [133:32 - 135:3] scope_map.(file).ClassWithComputedProperties.willSetProperty@SOURCE_DIR{{[/\\]}}test{{[/\\]}}NameBinding{{[/\\]}}scope_map.swift:133:7
375375
// CHECK-EXPANDED-NEXT: `-AbstractFunctionDeclScope {{.*}}, [134:5 - 134:15] '_'
376376
// CHECK-EXPANDED-NEXT: `-MethodBodyScope {{.*}}, [134:13 - 134:15]
377377
// CHECK-EXPANDED-NEXT: `-BraceStmtScope {{.*}}, [134:13 - 134:15]
378378
// CHECK-EXPANDED-NEXT: `-PatternEntryDeclScope {{.*}}, [137:7 - 139:3] entry 0 'didSetProperty'
379379
// CHECK-EXPANDED-NEXT: |-PatternEntryInitializerScope {{.*}}, [137:29 - 137:29] entry 0 'didSetProperty'
380380
// CHECK-EXPANDED-NEXT: `-PatternEntryUseScope {{.*}}, [137:29 - 139:3] entry 0 'didSetProperty'
381-
// CHECK-EXPANDED-NEXT: `-VarDeclScope {{.*}}, [137:31 - 139:3] scope_map.(file).ClassWithComputedProperties.didSetProperty@SOURCE_DIR/test/NameBinding/scope_map.swift:137:7
381+
// CHECK-EXPANDED-NEXT: `-VarDeclScope {{.*}}, [137:31 - 139:3] scope_map.(file).ClassWithComputedProperties.didSetProperty@SOURCE_DIR{{[/\\]}}test{{[/\\]}}NameBinding{{[/\\]}}scope_map.swift:137:7
382382
// CHECK-EXPANDED-NEXT: `-AbstractFunctionDeclScope {{.*}}, [138:5 - 138:14] '_'
383383
// CHECK-EXPANDED-NEXT: `-MethodBodyScope {{.*}}, [138:12 - 138:14]
384384
// CHECK-EXPANDED-NEXT: `-BraceStmtScope {{.*}}, [138:12 - 138:14]
@@ -388,7 +388,7 @@ class LazyProperties {
388388
// CHECK-EXPANDED-NEXT: `-BraceStmtScope {{.*}}, [142:41 - 155:1]
389389
// CHECK-EXPANDED-NEXT: `-PatternEntryDeclScope {{.*}}, [143:7 - 154:8] entry 0 'computed'
390390
// CHECK-EXPANDED-NEXT: `-PatternEntryUseScope {{.*}}, [143:17 - 154:8] entry 0 'computed'
391-
// CHECK-EXPANDED-NEXT: |-VarDeclScope {{.*}}, [143:21 - 149:3] scope_map.(file).funcWithComputedProperties(i:).computed@SOURCE_DIR/test/NameBinding/scope_map.swift:143:7
391+
// CHECK-EXPANDED-NEXT: |-VarDeclScope {{.*}}, [143:21 - 149:3] scope_map.(file).funcWithComputedProperties(i:).computed@SOURCE_DIR{{[/\\]}}test{{[/\\]}}NameBinding{{[/\\]}}scope_map.swift:143:7
392392
// CHECK-EXPANDED-NEXT: |-AbstractFunctionDeclScope {{.*}}, [144:5 - 145:5] '_'
393393
// CHECK-EXPANDED-NEXT: `-PureFunctionBodyScope {{.*}}, [144:9 - 145:5]
394394
// CHECK-EXPANDED-NEXT: `-BraceStmtScope {{.*}}, [144:9 - 145:5]
@@ -400,7 +400,7 @@ class LazyProperties {
400400
// CHECK-EXPANDED-NEXT: `-PatternEntryUseScope {{.*}}, [149:36 - 154:8] entry 1 'stored1' 'stored2'
401401
// CHECK-EXPANDED-NEXT: `-PatternEntryDeclScope {{.*}}, [150:3 - 154:8] entry 2 'alsoComputed'
402402
// CHECK-EXPANDED-NEXT: `-PatternEntryUseScope {{.*}}, [150:21 - 154:8] entry 2 'alsoComputed'
403-
// CHECK-EXPANDED-NEXT: |-VarDeclScope {{.*}}, [150:25 - 152:3] scope_map.(file).funcWithComputedProperties(i:).alsoComputed@SOURCE_DIR/test/NameBinding/scope_map.swift:150:7
403+
// CHECK-EXPANDED-NEXT: |-VarDeclScope {{.*}}, [150:25 - 152:3] scope_map.(file).funcWithComputedProperties(i:).alsoComputed@SOURCE_DIR{{[/\\]}}test{{[/\\]}}NameBinding{{[/\\]}}scope_map.swift:150:7
404404
// CHECK-EXPANDED-NEXT: `-AbstractFunctionDeclScope {{.*}}, [150:25 - 152:3] '_'
405405
// CHECK-EXPANDED-NEXT: `-PureFunctionBodyScope {{.*}}, [150:25 - 152:3]
406406
// CHECK-EXPANDED-NEXT: `-BraceStmtScope {{.*}}, [150:25 - 152:3]
@@ -460,7 +460,7 @@ class LazyProperties {
460460
// CHECK-EXPANDED-NEXT: |-NominalTypeDeclScope {{.*}}, [182:1 - 184:1] 'ProtoWithSubscript'
461461
// CHECK-EXPANDED-NEXT: `-GenericParamScope {{.*}}, [182:29 - 184:1] param 0 'Self : ProtoWithSubscript'
462462
// CHECK-EXPANDED-NEXT: `-NominalTypeBodyScope {{.*}}, [182:29 - 184:1] 'ProtoWithSubscript'
463-
// CHECK-EXPANDED-NEXT: `-SubscriptDeclScope {{.*}}, [183:3 - 183:43] scope_map.(file).ProtoWithSubscript.subscript(_:)@SOURCE_DIR/test/NameBinding/scope_map.swift:183:3
463+
// CHECK-EXPANDED-NEXT: `-SubscriptDeclScope {{.*}}, [183:3 - 183:43] scope_map.(file).ProtoWithSubscript.subscript(_:)@SOURCE_DIR{{[/\\]}}test{{[/\\]}}NameBinding{{[/\\]}}scope_map.swift:183:3
464464
// CHECK-EXPANDED-NEXT: `-AbstractFunctionParamsScope {{.*}}, [183:12 - 183:43]
465465
// CHECK-EXPANDED-NEXT: |-AbstractFunctionDeclScope {{.*}}, [183:35 - 183:35] '_'
466466
// CHECK-EXPANDED-NEXT: `-AbstractFunctionDeclScope {{.*}}, [183:39 - 183:39] '_'
@@ -498,25 +498,25 @@ class LazyProperties {
498498
// CHECK-SEARCHES-NEXT: ***Scope at 5:18***
499499
// CHECK-SEARCHES-NEXT: NominalTypeBodyScope {{.*}}, [5:17 - 5:19] 'InnerC0'
500500
// CHECK-SEARCHES-NEXT: {{.*}} Module name=scope_map
501-
// CHECK-SEARCHES-NEXT: {{.*}} FileUnit file="SOURCE_DIR/test/NameBinding/scope_map.swift"
501+
// CHECK-SEARCHES-NEXT: {{.*}} FileUnit file="SOURCE_DIR{{[/\\]}}test{{[/\\]}}NameBinding{{[/\\]}}scope_map.swift"
502502
// CHECK-SEARCHES-NEXT: {{.*}} StructDecl name=S0
503503
// CHECK-SEARCHES-NEXT: {{.*}} ClassDecl name=InnerC0
504504
// CHECK-SEARCHES-NEXT: ***Scope at 166:32***
505505
// CHECK-SEARCHES-NEXT: DefaultArgumentInitializerScope {{.*}}, [166:32 - 166:32]
506506
// CHECK-SEARCHES-NEXT: {{.*}} Module name=scope_map
507-
// CHECK-SEARCHES-NEXT: {{.*}} FileUnit file="SOURCE_DIR/test/NameBinding/scope_map.swift"
507+
// CHECK-SEARCHES-NEXT: {{.*}} FileUnit file="SOURCE_DIR{{[/\\]}}test{{[/\\]}}NameBinding{{[/\\]}}scope_map.swift"
508508
// CHECK-SEARCHES-NEXT: {{.*}} AbstractFunctionDecl name=defaultArguments(i:j:) : (Int, Int) -> ()
509509
// CHECK-SEARCHES-NEXT: {{.*}} Initializer DefaultArgument index=0
510510
// CHECK-SEARCHES-NEXT: ***Scope at 179:18***
511511
// CHECK-SEARCHES-NEXT: PatternEntryInitializerScope {{.*}}, [179:16 - 179:25] entry 1 'c' 'd'
512512
// CHECK-SEARCHES-NEXT: {{.*}} Module name=scope_map
513-
// CHECK-SEARCHES-NEXT: {{.*}} FileUnit file="SOURCE_DIR/test/NameBinding/scope_map.swift"
513+
// CHECK-SEARCHES-NEXT: {{.*}} FileUnit file="SOURCE_DIR{{[/\\]}}test{{[/\\]}}NameBinding{{[/\\]}}scope_map.swift"
514514
// CHECK-SEARCHES-NEXT: {{.*}} StructDecl name=PatternInitializers
515515
// CHECK-SEARCHES-NEXT: {{.*}} Initializer PatternBinding {{.*}} #1
516516
// CHECK-SEARCHES-NEXT: ***Scope at 193:26***
517517
// CHECK-SEARCHES-NEXT: PatternEntryInitializerScope {{.*}}, [193:24 - 193:29] entry 0 'prop'
518518
// CHECK-SEARCHES-NEXT: {{.*}} Module name=scope_map
519-
// CHECK-SEARCHES-NEXT: {{.*}} FileUnit file="SOURCE_DIR/test/NameBinding/scope_map.swift"
519+
// CHECK-SEARCHES-NEXT: {{.*}} FileUnit file="SOURCE_DIR{{[/\\]}}test{{[/\\]}}NameBinding{{[/\\]}}scope_map.swift"
520520
// CHECK-SEARCHES-NEXT: {{.*}} ClassDecl name=LazyProperties
521521
// CHECK-SEARCHES-NEXT: {{.*}} Initializer PatternBinding {{.*}} #0
522522
// CHECK-SEARCHES-NEXT: Local bindings: self

‎trunk/test/NameBinding/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 {{.*}}, [1:1 - 65:1] 'SOURCE_DIR/test/NameBinding/scope_map_top_level.swift'
29+
// CHECK-EXPANDED-NEXT: ASTSourceFileScope {{.*}}, [1:1 - 65:1] 'SOURCE_DIR{{[/\\]}}test{{[/\\]}}NameBinding{{[/\\]}}scope_map_top_level.swift'
3030
// CHECK-EXPANDED-NEXT: |-NominalTypeDeclScope {{.*}}, [4:1 - 4:13] 'S0'
3131
// CHECK-EXPANDED-NEXT: `-NominalTypeBodyScope {{.*}}, [4:11 - 4:13] 'S0'
3232
// CHECK-EXPANDED-NEXT: `-TopLevelCodeScope {{.*}}, [6:1 - 21:28]

0 commit comments

Comments
 (0)