Merge pull request #106 from CodaFi/fourth-of-firth-of-fifth

Update to Swift 4.0

Author: CodaFi

.travis.yml

@@ -5,7 +5,7 @@ matrix:
   include:
   - os: osx
     language: objective-c
-    osx_image: xcode8.3
+    osx_image: xcode9
     before_install:
     - export PATH=/usr/local/opt/llvm/bin:"${PATH}"
     - brew update
@@ -33,10 +33,10 @@ matrix:
     - sudo rm -f /usr/bin/llvm-config
     - sudo ln -s /usr/bin/llvm-config-${LLVM_API_VERSION} /usr/bin/llvm-config
     - wget -q -O - https://swift.org/keys/all-keys.asc | gpg --import -
-    - wget https://swift.org/builds/swift-3.1.1-release/ubuntu1404/swift-3.1.1-RELEASE/swift-3.1.1-RELEASE-ubuntu14.04.tar.gz
-    - tar xzf swift-3.1.1-RELEASE-ubuntu14.04.tar.gz
-    - export PATH=${PWD}/swift-3.1.1-RELEASE-ubuntu14.04/usr/bin:"${PATH}"
-    - sudo ./swift-3.1.1-RELEASE-ubuntu14.04/usr/bin/swift utils/make-pkgconfig.swift
+    - wget https://swift.org/builds/swift-4.0-release/ubuntu1404/swift-4.0-RELEASE/swift-4.0-RELEASE-ubuntu14.04.tar.gz
+    - tar xzf swift-4.0-RELEASE-ubuntu14.04.tar.gz
+    - export PATH=${PWD}/swift-4.0-RELEASE-ubuntu14.04/usr/bin:"${PATH}"
+    - sudo ./swift-4.0-RELEASE-ubuntu14.04/usr/bin/swift utils/make-pkgconfig.swift
     script:
     - swift test
 notifications:

Package.swift

@@ -1,8 +1,23 @@
+// swift-tools-version:4.0
+
 import PackageDescription
 
 let package = Package(
   name: "LLVM",
+  products: [
+    .library(
+      name: "LLVM",
+      targets: ["LLVM"]),
+  ],
   dependencies: [
-    .Package(url: "https://github.com/trill-lang/cllvm.git", majorVersion: 0),
+    .package(url: "https://github.com/trill-lang/cllvm.git", .branch("master")),
+    .package(url: "https://github.com/trill-lang/FileCheck.git", .branch("master")),
+  ],
+  targets: [
+    .target(
+      name: "LLVM"),
+    .testTarget(
+      name: "LLVMTests",
+      dependencies: ["LLVM", "FileCheck"]),
   ]
 )

Sources/LLVM/IntType.swift

@@ -52,7 +52,7 @@ public struct IntType: IRType {
   ///   type's bit width.  Defaults to `false`.
   public func constant<IntTy: UnsignedInteger>(_ value: IntTy, signExtend: Bool = false) -> Constant<Unsigned> {
     return Constant(llvm: LLVMConstInt(asLLVM(),
-                          value.toUIntMax(),
+                          UInt64(value),
                           signExtend.llvm))
   }
 
@@ -63,7 +63,7 @@ public struct IntType: IRType {
   ///   type's bit width.  Defaults to `false`.
   public func constant<IntTy: SignedInteger>(_ value: IntTy, signExtend: Bool = false) -> Constant<Signed> {
     return Constant(llvm: LLVMConstInt(asLLVM(),
-                                       UInt64(bitPattern: value.toIntMax()),
+                                       UInt64(bitPattern: Int64(value)),
                                        signExtend.llvm))
   }
 

Tests/LLVMTests/ANSIColor.swift

@@ -1,5 +1,6 @@
 import LLVM
 import XCTest
+import FileCheck
 import Foundation
 
 class ConstantSpec : XCTestCase {

Tests/LLVMTests/ColoredStream.swift

@@ -1,5 +1,6 @@
 import LLVM
 import XCTest
+import FileCheck
 import Foundation
 
 class FileCheckSpec : XCTestCase {