fixing tests after massive renaming

This commit is contained in:
Max Moiseev
2015-12-08 14:27:28 -08:00
parent 1c0047829a
commit 2d2d8ff1ea
3 changed files with 102 additions and 100 deletions

View File

@@ -146,7 +146,7 @@ class FooUnavailableMembers : FooClassBase {
func availabilityObsoletedMsg()
func availabilityUnavailableMsg()
}
typealias FooCFTypeRef = COpaquePointer
typealias FooCFTypeRef = OpaquePointer
func FooCFTypeRelease(_ _: FooCFTypeRef)
func fooSubFunc1(_ a: Int32) -> Int32
struct FooSubEnum1 : RawRepresentable, Equatable {
@@ -2724,241 +2724,241 @@ var FooSubUnnamedEnumeratorA1: Int { get }
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "COpaquePointer",
key.usr: "s:Vs14COpaquePointer",
key.name: "OpaquePointer",
key.usr: "s:Vs13OpaquePointer",
key.offset: 4321,
key.length: 14
key.length: 13
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
key.offset: 4336,
key.offset: 4335,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
key.offset: 4341,
key.offset: 4340,
key.length: 16
},
{
key.kind: source.lang.swift.syntaxtype.argument,
key.offset: 4358,
key.offset: 4357,
key.length: 1
},
{
key.kind: source.lang.swift.syntaxtype.parameter,
key.offset: 4360,
key.offset: 4359,
key.length: 1
},
{
key.kind: source.lang.swift.ref.typealias,
key.name: "FooCFTypeRef",
key.usr: "c:Foo.h@T@FooCFTypeRef",
key.offset: 4363,
key.offset: 4362,
key.length: 12
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
key.offset: 4377,
key.offset: 4376,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
key.offset: 4382,
key.offset: 4381,
key.length: 11
},
{
key.kind: source.lang.swift.syntaxtype.argument,
key.offset: 4394,
key.offset: 4393,
key.length: 1
},
{
key.kind: source.lang.swift.syntaxtype.parameter,
key.offset: 4396,
key.offset: 4395,
key.length: 1
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
key.offset: 4396,
key.offset: 4395,
key.length: 1
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "Int32",
key.usr: "s:Vs5Int32",
key.offset: 4399,
key.offset: 4398,
key.length: 5
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "Int32",
key.usr: "s:Vs5Int32",
key.offset: 4409,
key.offset: 4408,
key.length: 5
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
key.offset: 4415,
key.offset: 4414,
key.length: 6
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
key.offset: 4422,
key.offset: 4421,
key.length: 11
},
{
key.kind: source.lang.swift.ref.protocol,
key.name: "RawRepresentable",
key.usr: "s:Ps16RawRepresentable",
key.offset: 4436,
key.offset: 4435,
key.length: 16
},
{
key.kind: source.lang.swift.ref.protocol,
key.name: "Equatable",
key.usr: "s:Ps9Equatable",
key.offset: 4454,
key.offset: 4453,
key.length: 9
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
key.offset: 4470,
key.offset: 4469,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.argument,
key.offset: 4475,
key.offset: 4474,
key.length: 1
},
{
key.kind: source.lang.swift.syntaxtype.parameter,
key.offset: 4477,
key.offset: 4476,
key.length: 8
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
key.offset: 4477,
key.offset: 4476,
key.length: 8
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "UInt32",
key.usr: "s:Vs6UInt32",
key.offset: 4487,
key.offset: 4486,
key.length: 6
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
key.offset: 4499,
key.offset: 4498,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.argument,
key.offset: 4504,
key.offset: 4503,
key.length: 8
},
{
key.kind: source.lang.swift.syntaxtype.parameter,
key.offset: 4513,
key.offset: 4512,
key.length: 8
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
key.offset: 4504,
key.offset: 4503,
key.length: 8
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
key.offset: 4513,
key.offset: 4512,
key.length: 8
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "UInt32",
key.usr: "s:Vs6UInt32",
key.offset: 4523,
key.offset: 4522,
key.length: 6
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
key.offset: 4535,
key.offset: 4534,
key.length: 3
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
key.offset: 4539,
key.offset: 4538,
key.length: 8
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "UInt32",
key.usr: "s:Vs6UInt32",
key.offset: 4549,
key.offset: 4548,
key.length: 6
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
key.offset: 4558,
key.offset: 4557,
key.length: 3
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
key.offset: 4562,
key.offset: 4561,
key.length: 12
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "FooSubEnum1",
key.usr: "c:@E@FooSubEnum1",
key.offset: 4576,
key.offset: 4575,
key.length: 11
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
key.offset: 4590,
key.offset: 4589,
key.length: 3
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
key.offset: 4596,
key.offset: 4595,
key.length: 3
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
key.offset: 4600,
key.offset: 4599,
key.length: 12
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "FooSubEnum1",
key.usr: "c:@E@FooSubEnum1",
key.offset: 4614,
key.offset: 4613,
key.length: 11
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
key.offset: 4628,
key.offset: 4627,
key.length: 3
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
key.offset: 4634,
key.offset: 4633,
key.length: 3
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
key.offset: 4638,
key.offset: 4637,
key.length: 25
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "Int",
key.usr: "s:Si",
key.offset: 4665,
key.offset: 4664,
key.length: 3
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
key.offset: 4671,
key.offset: 4670,
key.length: 3
}
]
@@ -4414,19 +4414,19 @@ var FooSubUnnamedEnumeratorA1: Int { get }
key.name: "FooCFTypeRef",
key.usr: "c:Foo.h@T@FooCFTypeRef",
key.offset: 4296,
key.length: 39
key.length: 38
},
{
key.kind: source.lang.swift.decl.function.free,
key.name: "FooCFTypeRelease(_:)",
key.usr: "c:@F@FooCFTypeRelease",
key.offset: 4336,
key.offset: 4335,
key.length: 40,
key.entities: [
{
key.kind: source.lang.swift.decl.var.local,
key.keyword: "_",
key.offset: 4363,
key.offset: 4362,
key.length: 12
}
]
@@ -4435,14 +4435,14 @@ var FooSubUnnamedEnumeratorA1: Int { get }
key.kind: source.lang.swift.decl.function.free,
key.name: "fooSubFunc1(_:)",
key.usr: "c:@F@fooSubFunc1",
key.offset: 4377,
key.offset: 4376,
key.length: 37,
key.entities: [
{
key.kind: source.lang.swift.decl.var.local,
key.keyword: "_",
key.name: "a",
key.offset: 4399,
key.offset: 4398,
key.length: 5
}
]
@@ -4451,7 +4451,7 @@ var FooSubUnnamedEnumeratorA1: Int { get }
key.kind: source.lang.swift.decl.struct,
key.name: "FooSubEnum1",
key.usr: "c:@E@FooSubEnum1",
key.offset: 4415,
key.offset: 4414,
key.length: 142,
key.conforms: [
{
@@ -4470,14 +4470,14 @@ var FooSubUnnamedEnumeratorA1: Int { get }
key.kind: source.lang.swift.decl.function.constructor,
key.name: "init(_:)",
key.usr: "s:FVSC11FooSubEnum1cFVs6UInt32S_",
key.offset: 4470,
key.offset: 4469,
key.length: 24,
key.entities: [
{
key.kind: source.lang.swift.decl.var.local,
key.keyword: "_",
key.name: "rawValue",
key.offset: 4487,
key.offset: 4486,
key.length: 6
}
]
@@ -4486,7 +4486,7 @@ var FooSubUnnamedEnumeratorA1: Int { get }
key.kind: source.lang.swift.decl.function.constructor,
key.name: "init(rawValue:)",
key.usr: "s:FVSC11FooSubEnum1cFT8rawValueVs6UInt32_S_",
key.offset: 4499,
key.offset: 4498,
key.length: 31,
key.conforms: [
{
@@ -4500,7 +4500,7 @@ var FooSubUnnamedEnumeratorA1: Int { get }
key.kind: source.lang.swift.decl.var.local,
key.keyword: "rawValue",
key.name: "rawValue",
key.offset: 4523,
key.offset: 4522,
key.length: 6
}
]
@@ -4509,7 +4509,7 @@ var FooSubUnnamedEnumeratorA1: Int { get }
key.kind: source.lang.swift.decl.var.instance,
key.name: "rawValue",
key.usr: "s:vVSC11FooSubEnum18rawValueVs6UInt32",
key.offset: 4535,
key.offset: 4534,
key.length: 20,
key.conforms: [
{
@@ -4525,21 +4525,21 @@ var FooSubUnnamedEnumeratorA1: Int { get }
key.kind: source.lang.swift.decl.var.global,
key.name: "FooSubEnum1X",
key.usr: "c:@E@FooSubEnum1@FooSubEnum1X",
key.offset: 4558,
key.offset: 4557,
key.length: 37
},
{
key.kind: source.lang.swift.decl.var.global,
key.name: "FooSubEnum1Y",
key.usr: "c:@E@FooSubEnum1@FooSubEnum1Y",
key.offset: 4596,
key.offset: 4595,
key.length: 37
},
{
key.kind: source.lang.swift.decl.var.global,
key.name: "FooSubUnnamedEnumeratorA1",
key.usr: "c:FooSub.h@Ea@FooSubUnnamedEnumeratorA1",
key.offset: 4634,
key.offset: 4633,
key.length: 42
}
]