Fix swift SIL exception

This commit is contained in:
kawoou
2019-04-05 13:36:03 +09:00
parent 06ea016fd7
commit 3c973689a4
8 changed files with 20 additions and 10 deletions

View File

@@ -21,7 +21,7 @@ matrix:
- os: linux - os: linux
env: SWIFT_VERSION=4.2.3 env: SWIFT_VERSION=4.2.3
- os: linux - os: linux
env: SWIFT_VERSION=5.0-DEVELOPMENT-SNAPSHOT-2019-03-10-a env: SWIFT_VERSION=5.0
language: generic language: generic
sudo: required sudo: required
dist: trusty dist: trusty

View File

@@ -6,8 +6,8 @@
"repositoryURL": "https://github.com/kylef/PathKit.git", "repositoryURL": "https://github.com/kylef/PathKit.git",
"state": { "state": {
"branch": null, "branch": null,
"revision": "e2f5be30e4c8f531c9c1e8765aa7b71c0a45d7a0", "revision": "73f8e9dca9b7a3078cb79128217dc8f2e585a511",
"version": "0.9.2" "version": "1.0.0"
} }
}, },
{ {

View File

@@ -7,7 +7,7 @@ let package = Package(
.library(name: "Stencil", targets: ["Stencil"]) .library(name: "Stencil", targets: ["Stencil"])
], ],
dependencies: [ dependencies: [
.package(url: "https://github.com/kylef/PathKit.git", from: "0.9.0"), .package(url: "https://github.com/kylef/PathKit.git", from: "1.0.0"),
.package(url: "https://github.com/kylef/Spectre.git", from: "0.9.0") .package(url: "https://github.com/kylef/Spectre.git", from: "0.9.0")
], ],
targets: [ targets: [

View File

@@ -215,7 +215,8 @@ final class EnvironmentIncludeTemplateTests: XCTestCase {
override func setUp() { override func setUp() {
super.setUp() super.setUp()
let path = Path(#file) + ".." + "fixtures" let basePath: String = #file
let path = Path(basePath) + ".." + "fixtures"
let loader = FileSystemLoader(paths: [path]) let loader = FileSystemLoader(paths: [path])
environment = Environment(loader: loader) environment = Environment(loader: loader)
template = "" template = ""
@@ -291,7 +292,8 @@ final class EnvironmentBaseAndChildTemplateTests: XCTestCase {
override func setUp() { override func setUp() {
super.setUp() super.setUp()
let path = Path(#file) + ".." + "fixtures" let basePath: String = #file
let path = Path(basePath) + ".." + "fixtures"
let loader = FileSystemLoader(paths: [path]) let loader = FileSystemLoader(paths: [path])
environment = Environment(loader: loader) environment = Environment(loader: loader)
childTemplate = "" childTemplate = ""

View File

@@ -4,7 +4,10 @@ import Spectre
import XCTest import XCTest
final class IncludeTests: XCTestCase { final class IncludeTests: XCTestCase {
let path = Path(#file) + ".." + "fixtures" let path: Path = {
let basePath: String = #file
return Path(basePath) + ".." + "fixtures"
}()
lazy var loader = FileSystemLoader(paths: [path]) lazy var loader = FileSystemLoader(paths: [path])
lazy var environment = Environment(loader: loader) lazy var environment = Environment(loader: loader)

View File

@@ -4,7 +4,10 @@ import Stencil
import XCTest import XCTest
final class InheritanceTests: XCTestCase { final class InheritanceTests: XCTestCase {
let path = Path(#file) + ".." + "fixtures" let path: Path = {
let basePath: String = #file
return Path(basePath) + ".." + "fixtures"
}()
lazy var loader = FileSystemLoader(paths: [path]) lazy var loader = FileSystemLoader(paths: [path])
lazy var environment = Environment(loader: loader) lazy var environment = Environment(loader: loader)

View File

@@ -117,7 +117,8 @@ final class LexerTests: XCTestCase {
} }
func testPerformance() throws { func testPerformance() throws {
let path = Path(#file) + ".." + "fixtures" + "huge.html" let basePath: String = #file
let path = Path(basePath) + ".." + "fixtures" + "huge.html"
let content: String = try path.read() let content: String = try path.read()
measure { measure {

View File

@@ -5,7 +5,8 @@ import XCTest
final class TemplateLoaderTests: XCTestCase { final class TemplateLoaderTests: XCTestCase {
func testFileSystemLoader() { func testFileSystemLoader() {
let path = Path(#file) + ".." + "fixtures" let basePath: String = #file
let path = Path(basePath) + ".." + "fixtures"
let loader = FileSystemLoader(paths: [path]) let loader = FileSystemLoader(paths: [path])
let environment = Environment(loader: loader) let environment = Environment(loader: loader)