This repository has been archived by the owner on Dec 5, 2019. It is now read-only.
Update Madness to master #11
Open
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
| @@ -105,12 +105,12 @@ private func foldr<G: GeneratorType, Result>(inout generator: G, initial: Result | |||
| return generator.next().map { combine($0, foldr(&generator, initial, combine)) } ?? initial | |||
| } | |||
|
|
|||
| private func | <T, U> (left: Parser<T>.Function, right: String -> U) -> Parser<Either<T, U>>.Function { | |||
| return left | { (right($0), $0) } | |||
| private func | <C: CollectionType, T, U where C.Generator.Element: Equatable>(left: Parser<C, T>.Function, right: () -> U) -> Parser<C, Either<T, U>>.Function { | |||
There was a problem hiding this comment.
I know it would be better if the type of right was: (C, C.Index) -> U but then compiling takes endlessly.
ghost
mentioned this pull request
|
馃憤 this is very helpful, thank you. |
| (line(n)|? ++ followingLine(n)*) --> { ($0 ?? []) + flatMap($1, id) } | ||
| private let followingLine: Int -> Parser<String, [Node]>.Function = { n in (ignore(comment | br)+ ++ line(n)) } | ||
| private let lines: Int -> Parser<String, [Node]>.Function = { n in | ||
| { ($0 ?? []) + flatMap($1, id) } <^> (line(n)|? ++ followingLine(n)*) |
|
Spaces/tabs thing is the only thing I noticed. Thanks for the PR! 馃憤 |
|
Finally fixed indentation. Sorry that it took so long 馃槥. Now working on converting it to swift 2, but i will do that in another PR. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Now ogdl-swift is using an really old version of Madness. Meanwhile Madness made
Parsergeneric for allCollectionType's instead of onlyStringand this is a big change in the api, so i thought this PR would make it a bit easier to move to the next official release 馃槃.