isRef -> isReference

my-mail-ru · Jun 1, 2017 · 57d17c2 · 57d17c2
1 parent 1bd1a97
commit 57d17c2
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/Sources/Perl/Scalar.swift b/Sources/Perl/Scalar.swift
@@ -157,8 +157,8 @@ public final class PerlScalar : PerlValue {
 	}
 
 	/// A boolean value indicating whether the `SV` is a reference.
-	public var isRef: Bool {
-		return withUnsafeSvContext { $0.isRef }
+	public var isReference: Bool {
+		return withUnsafeSvContext { $0.isReference }
 	}
 
 	/// A boolean value indicating whether the `SV` is an object.

diff --git a/Sources/Perl/UnsafeSV.swift b/Sources/Perl/UnsafeSV.swift
@@ -30,7 +30,7 @@ public struct UnsafeSvContext {
 	var isInteger: Bool { return SvIOK(sv) }
 	var isDouble: Bool { return SvNOK(sv) }
 	var isString: Bool { return SvPOK(sv) }
-	var isRef: Bool { return SvROK(sv) }
+	var isReference: Bool { return SvROK(sv) }
 
 	var referent: UnsafeSvContext? {
 		return SvROK(sv) ? UnsafeSvContext(sv: SvRV(sv)!, perl: perl) : nil

diff --git a/Tests/PerlTests/ConvertFromPerl.swift b/Tests/PerlTests/ConvertFromPerl.swift
@@ -24,7 +24,7 @@ class ConvertFromPerlTests : EmbeddedTestCase {
 		XCTAssert(!v.isInteger)
 		XCTAssert(!v.isDouble)
 		XCTAssert(!v.isString)
-		XCTAssert(!v.isRef)
+		XCTAssert(!v.isReference)
 		XCTAssertNil(v.map { $0 })
 		XCTAssertNil(v.flatMap { $0 })
 		XCTAssertEqual(try Int(v ?? 10), 10)
@@ -64,7 +64,7 @@ class ConvertFromPerlTests : EmbeddedTestCase {
 		XCTAssert(v.isInteger)
 		XCTAssert(!v.isDouble)
 		XCTAssert(!v.isString)
-		XCTAssert(!v.isRef)
+		XCTAssert(!v.isReference)
 		XCTAssertEqual(try Int(v), 42)
 		XCTAssertEqual(try String(v), "42")
 		// Implicit conversion from UnsafeSvPointer
@@ -138,7 +138,7 @@ class ConvertFromPerlTests : EmbeddedTestCase {
 		XCTAssert(v.isInteger)
 		XCTAssert(!v.isDouble)
 		XCTAssert(!v.isString)
-		XCTAssert(!v.isRef)
+		XCTAssert(!v.isReference)
 		XCTAssertEqual(try UInt(v), 42)
 		XCTAssertEqual(try String(v), "42")
 		// Implicit conversion from UnsafeSvPointer
@@ -211,7 +211,7 @@ class ConvertFromPerlTests : EmbeddedTestCase {
 		XCTAssert(!v.isInteger)
 		XCTAssert(v.isDouble)
 		XCTAssert(!v.isString)
-		XCTAssert(!v.isRef)
+		XCTAssert(!v.isReference)
 		XCTAssertEqual(try Double(v), 42.3)
 		XCTAssertEqual(try String(v), "42.3")
 		// Implicit conversion from UnsafeSvPointer
@@ -273,7 +273,7 @@ class ConvertFromPerlTests : EmbeddedTestCase {
 		XCTAssert(!v.isInteger)
 		XCTAssert(!v.isDouble)
 		XCTAssert(v.isString)
-		XCTAssert(!v.isRef)
+		XCTAssert(!v.isReference)
 		XCTAssertThrowsError(try Int(v))
 		XCTAssertThrowsError(try Double(v))
 		XCTAssertEqual(try String(v), "test")
@@ -320,7 +320,7 @@ class ConvertFromPerlTests : EmbeddedTestCase {
 		XCTAssert(!v.isInteger)
 		XCTAssert(!v.isDouble)
 		XCTAssert(!v.isString)
-		XCTAssert(v.isRef)
+		XCTAssert(v.isReference)
 		XCTAssertNotNil(v.referent)
 		let r = v.referent! as! PerlScalar
 		XCTAssert(r.isInteger)
@@ -336,7 +336,7 @@ class ConvertFromPerlTests : EmbeddedTestCase {
 		XCTAssert(!sv.isInteger)
 		XCTAssert(!sv.isDouble)
 		XCTAssert(!sv.isString)
-		XCTAssert(sv.isRef)
+		XCTAssert(sv.isReference)
 		XCTAssertNotNil(sv.referent)
 		let av: PerlArray = try PerlArray(sv)
 		XCTAssertEqual(av.count, 2)
@@ -379,7 +379,7 @@ class ConvertFromPerlTests : EmbeddedTestCase {
 		XCTAssert(!sv.isInteger)
 		XCTAssert(!sv.isDouble)
 		XCTAssert(!sv.isString)
-		XCTAssert(sv.isRef)
+		XCTAssert(sv.isReference)
 		XCTAssertNotNil(sv.referent)
 		let hv: PerlHash = try PerlHash(sv)
 //		XCTAssertEqual(hv.count, 2)
@@ -404,7 +404,7 @@ class ConvertFromPerlTests : EmbeddedTestCase {
 		XCTAssert(!sv.isInteger)
 		XCTAssert(!sv.isDouble)
 		XCTAssert(!sv.isString)
-		XCTAssert(sv.isRef)
+		XCTAssert(sv.isReference)
 		XCTAssertNotNil(sv.referent)
 		let cv: PerlSub = try PerlSub(sv)
 		XCTAssertEqual(try cv.call(10, 15) as Int?, 25)

diff --git a/Tests/PerlTests/ConvertToPerl.swift b/Tests/PerlTests/ConvertToPerl.swift
@@ -100,15 +100,15 @@ class ConvertToPerlTests : EmbeddedTestCase {
 
 	func testScalarRef() throws {
 		let v = PerlScalar(referenceTo: PerlScalar(10 as Int))
-		XCTAssert(v.isRef)
+		XCTAssert(v.isReference)
 		try perl.eval("sub is_ref_10 { return ${$_[0]} == 10 }")
 		XCTAssert(try perl.call(sub: "is_ref_10", v))
 	}
 
 	func testArrayRef() throws {
 		let array = [10, 20]
 		let v = PerlScalar(referenceTo: PerlArray(array))
-		XCTAssert(v.isRef)
+		XCTAssert(v.isReference)
 		try perl.eval("sub is_array { return @{$_[0]} == 2 && $_[0][0] == 10 && $_[0][1] == 20 }")
 		XCTAssert(try perl.call(sub: "is_array", v))
 		let v2 = PerlScalar(PerlArray(array))
@@ -120,7 +120,7 @@ class ConvertToPerlTests : EmbeddedTestCase {
 	func testHashRef() throws {
 		let dict = ["a": 10, "b": 20]
 		let v = PerlScalar(referenceTo: PerlHash(dict))
-		XCTAssert(v.isRef)
+		XCTAssert(v.isReference)
 		try perl.eval("sub is_hash { return keys(%{$_[0]}) == 2 && $_[0]{a} == 10 && $_[0]{b} == 20 }")
 		XCTAssert(try perl.call(sub: "is_hash", v))
 		let v2 = PerlScalar(PerlHash(dict))