Remove hacky cast extension

Additionally, tee output for testing. It's nicer to see the build and
test result altogether in Vim.

Author: jerrymarino

Makefile

@@ -110,8 +110,8 @@ test: debug
 		-Xlinker $(BUILD_DIR)/lib$(PLUGIN_NAME).dylib \
 		-Xlinker $(BUILD_DIR)/lib$(PLUGIN_NAME)VimAsync.dylib \
 		-Xlinker $(BUILD_DIR)/lib$(PLUGIN_NAME)Vim.dylib \
-	  	-Xswiftc -target -Xswiftc $(TRIPPLE)
-	@swift test --skip-build | tee $(LAST_LOG)
+	  	-Xswiftc -target -Xswiftc $(TRIPPLE) | tee $(LAST_LOG)
+	@swift test --skip-build 2>&1 | tee -a $(LAST_LOG)
 
 
 .PHONY: test_generate

Sources/Vim/Vim.swift

@@ -9,7 +9,8 @@ public struct Vim {
         return Current()
     }
 
-    /// Run a vim command
+    /// Run a Vim command.
+    /// :help command
     @discardableResult public static func command(_ cmd: String) throws -> VimValue  {
         var value: VimValue?
         cmd.withCString { cStr in
@@ -25,6 +26,7 @@ public struct Vim {
     }
 
     /// Evaluate an expression
+    /// :help eval
     @discardableResult public static func eval(_ cmd: String) throws -> VimValue {
         var value: VimValue?
         cmd.withCString { cStr in

Sources/Vim/VimExtensions.swift

@@ -49,15 +49,15 @@ extension Vim {
     }
 
     public static func get(_ variable: String) -> Bool {
-        return (try? eval(variable))?.asBool() ?? false
+        return Bool(try? eval(variable)) ?? false
     }
 
     public static func get(_ variable: String) -> Int {
-        return (try? eval(variable))?.asInt() ?? 0
+        return Int(try? eval(variable)) ?? 0
     }
 
     public static func get(_ variable: String) -> String {
-        return (try? eval(variable))?.asString() ?? ""
+        return String(try? eval(variable)) ?? ""
     }
 
     /// Returns the 0-based current line and 0-based current column

Sources/Vim/VimValue.swift

@@ -1,10 +1,19 @@
 import VimInterface
 
+// Converting values from Vim.
+// VimValue is a `View` into the state of Vim.
+// Design:
+// - Be fast
+// - Be as idomatic as possible
+//
+// In the standard library, types do not dynamically cast to Any.
+// 
+
 extension Int {
     public init?(_ value: VimValue) {
         // Generally, eval results are returned as strings
         // Perhaps there is a better way to express this.
-        if let strValue = value.asString(), 
+        if let strValue = String(value),
             let intValue = Int(strValue) {
             self.init(intValue)
         } else {
@@ -82,34 +91,12 @@ public final class VimValue {
     }
 }
 
-/// Casting extensions
-extension VimValue {
-    public func asString() -> String? {
-        return String(self)
-    }
-
-    public func asInt() -> Int? {
-        return Int(self)
-    }
-
-    public func asBool() -> Bool? {
-        return Bool(self)
-    }
-
-    public func asList() -> VimList? {
-        return VimList(self)
-    }
-
-    public func asDictionary() -> VimDictionary? {
-        return VimDictionary(self)
-    }
-}
 
 // A Dictionary
 public final class VimDictionary {
     private let value: VimValue
 
-    init?(_ value: VimValue) {
+    public init?(_ value: VimValue) {
         self.value = value
     }
 
@@ -118,14 +105,14 @@ public final class VimDictionary {
     }
 
     public var keys: VimList {
-        guard let list = VimValue(reference: swiftvim_dict_keys(value.reference)).asList() else {
+        guard let list = VimList(VimValue(reference: swiftvim_dict_keys(value.reference))) else {
             fatalError("Can't get keys")
          }
          return list
     }
 
     public var values: VimList {
-        guard let list = VimValue(reference: swiftvim_dict_values(value.reference)).asList() else {
+        guard let list = VimList(VimValue(reference: swiftvim_dict_values(value.reference))) else {
             fatalError("Can't get values")
         }
         return list

Tests/VimAsyncTests/VimAsyncTest.swift

@@ -26,7 +26,7 @@ class VimAsyncTests: XCTestCase {
           fatalError("Fail.")
         }
         XCTAssertNotNil(result)
-        XCTAssertNil(result.asString())
+        XCTAssertNil(String(result))
         swiftvim_finalize()
     }
 }

Tests/VimTests/VimTests.swift

@@ -34,45 +34,45 @@ class VimValueTests: XCTestCase {
     func testEvalString() {
         swiftvim_initialize()
         let result = try! Vim.eval("VALUE")
-        XCTAssertEqual(result.asString(), "VALUE")
+        XCTAssertEqual(String(result), "VALUE")
         swiftvim_finalize()
     }
 
     func testCommandNone() {
         swiftvim_initialize()
         let result = try! Vim.command("VALUE")
-        XCTAssertNil(result.asString())
+        XCTAssertNil(String(result))
         swiftvim_finalize()
     }
 
     func testEvalInt() {
         swiftvim_initialize()
         mutateRuntime("eval", lambda: "lambda value : int(value)")
         let result = try! Vim.eval("2")
-        XCTAssertEqual(result.asInt(), 2)
+        XCTAssertEqual(Int(result), 2)
         swiftvim_finalize()
     }
 
     func testEvalList() {
         swiftvim_initialize()
         mutateRuntime("eval", lambda: "lambda value : [1, 2]")
         let result = try! Vim.eval("")
-        let list = result.asList()!
+        let list = VimList(result)!
         XCTAssertEqual(list.count, 2)
-        XCTAssertEqual(list[0].asInt(), 1)
-        XCTAssertEqual(list[1].asInt(), 2)
+        XCTAssertEqual(Int(list[0]), 1)
+        XCTAssertEqual(Int(list[1]), 2)
         list[1] = list[0]
-        XCTAssertEqual(list[1].asInt(), 1)
+        XCTAssertEqual(Int(list[1]), 1)
         swiftvim_finalize()
     }
 
     func testListCollectionUsage() {
         swiftvim_initialize()
         mutateRuntime("eval", lambda: "lambda value : [1, 2]")
         let result = try! Vim.eval("")
-        let list = result.asList()!
+        let list = VimList(result)!
         /// Smoke test we can do collectiony things.
-        let incremented = list.map { $0.asInt()! + 1 }
+        let incremented = list.map { Int($0)! + 1 }
         XCTAssertEqual(incremented[1], 3)
         swiftvim_finalize()
     }
@@ -81,11 +81,11 @@ class VimValueTests: XCTestCase {
         swiftvim_initialize()
         mutateRuntime("eval", lambda: "lambda value : dict(a=42, b='a')")
         let result = try! Vim.eval("")
-        let dict = result.asDictionary()!
+        let dict = VimDictionary(result)!
         let aVal = dict["a"]!
-        XCTAssertEqual(aVal.asInt()!, 42)
+        XCTAssertEqual(Int(aVal)!, 42)
         let nonVal = dict["s"]
-        XCTAssertNil(nonVal?.asInt())
+        XCTAssertNil(Int(nonVal))
 
         swiftvim_finalize()
     }
@@ -94,7 +94,7 @@ class VimValueTests: XCTestCase {
         swiftvim_initialize()
         mutateRuntime("eval", lambda: "lambda value : dict(a=42, b='a')")
         let result = try! Vim.eval("")
-        let dict = result.asDictionary()!
+        let dict = VimDictionary(result)!
         XCTAssertEqual(dict.keys.count, 2)
         XCTAssertEqual(dict.values.count, 2)
         swiftvim_finalize()
@@ -131,7 +131,7 @@ class VimValueTests: XCTestCase {
         let cb = "Example.invoke('\(address)', 'arga')"
         print("Callback:", cb)
         mutateRuntime("eval", lambda: "lambda value : \(cb)")
-        try? Vim.eval("")
+        _ = try? Vim.eval("")
         XCTAssertTrue(called)
         swiftvim_finalize()
     }