Xcode 7.2.1 / Swift 2.1 #115
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mdiep
commented
Oct 12, 2017
| @@ -1,5 +1,9 @@ | |||
| // Copyright (c) 2014 Rob Rix. All rights reserved. | |||
|
|
|||
| public struct ResultResult<T, Error : ErrorType> { | |||
| public typealias t = Result<T, Error> | |||
| } | |||
There was a problem hiding this comment.
Also, this sucks. But it's necessary for now.
robrix
approved these changes
Oct 12, 2017
| case let .Success(tree, sourcePos): | ||
| return .Success(tree, sourcePos) | ||
| case let .Failure(right): | ||
| return .Failure(Error.withReason("no alternative matched:", sourcePos)(left, right)) |
There was a problem hiding this comment.
Result is much better here, nice 👍
| @@ -1,5 +1,9 @@ | |||
| // Copyright (c) 2014 Rob Rix. All rights reserved. | |||
|
|
|||
| public struct ResultResult<T, Error : ErrorType> { | |||
| public typealias t = Result<T, Error> | |||
| } | |||
| @@ -76,12 +72,12 @@ final class AlternationTests: XCTestCase { | |||
|
|
|||
| // MARK: - Fixtures | |||
|
|
|||
| private let alternation = %"x" <|> (%"y" --> { _, _, _, _, _ in 1 }) | |||
| private let alternation = %"x" <|> %"y" | |||
| }, | ||
| "DVTSourceControlWorkspaceBlueprintIdentifierKey" : "16056085-48A1-4F20-BAB0-335120B8B6C5", | ||
| "DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : { | ||
| "9A760A1EBAC1979D46EF016B1BE84D98E53C16FF" : "Madness\/Carthage\/Checkouts\/Prelude\/", | ||
| "7FCD68358D0D5A67F26F2A5E7B31EB3EF0CB2C00" : "Madness\/", | ||
| "840BFB2A2F183FC5B01E0B21BB0D3D8EF3F6803F" : "Madness\/Carthage\/Checkouts\/Assertions\/", | ||
| "D5FA66743146831DA2A20C0EAE4583EF424D9041" : "Madness\/Carthage\/Checkouts\/Either\/" | ||
| "D5FA66743146831DA2A20C0EAE4583EF424D9041" : "Madness\/Carthage\/Checkouts\/Either\/", |
There was a problem hiding this comment.
Does it matter?
Does anything matter?
There was a problem hiding this comment.
Ugh. This whole file should be ignored. I'll do that.
Yeah IMO this was gross anyway 👍 |
robrix
approved these changes
Oct 13, 2017
| @@ -5,3 +5,4 @@ xcuserdata | |||
| *.pbxuser | |||
| *.xcuserdatad | |||
| *.xccheckout | |||
| *.xcscmblueprint | |||
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This updates the code to Swift 7.2.1 / Swift 2.1—the earliest version of Xcode that seems to run on High Sierra.
This removes https://github.com/robrix/Prelude, https://github.com/robrix/Either, and https://github.com/antitypical/Assertions, but adds https://github.com/antitypical/Result. This makes it easier to upgrade, since the dependencies don't need to be updated. But it's also in line with where I'd like Madness to go.
There's one small casualty of this: the removal of
<|>that returns a parser ofEither<x, y>. But that can easily be added on top of the other<|>variant.I'll leave this open for a day in case anyone wants to review these PRs. But if no one does, I'll carry on alone. 👊