Skip to content

NSRegularExpression: Make options: default to empty to match Darwin #1161

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 9, 2017

Conversation

spevans
Copy link
Contributor

@spevans spevans commented Aug 6, 2017

@ianpartridge
Copy link
Contributor

This looks good to me.

NSMatchingOptions and NSMatchingFlags need lifting inside NSRegularExpression too (and to lose their NS prefix). Would you be willing to open another PR to fix those?

https://developer.apple.com/documentation/foundation/nsregularexpression.matchingoptions
https://developer.apple.com/documentation/foundation/nsregularexpression.matchingflags

@spevans
Copy link
Contributor Author

spevans commented Aug 6, 2017

Do you mean renaming struct NSMatchingOptions to struct MatchingOptions and moving it inside an extension NSRegularExpression? And the same for NSMatchingFlags? I can do a PR for that

Do we also completely drop the NSMatchingOptions and NSMatchingFlags?

@ianpartridge
Copy link
Contributor

Yes that's right. The various APIs that use them will need updating too (including the ones you added default parameters too in this PR).

@ianpartridge
Copy link
Contributor

@swift-ci please test

@ianpartridge
Copy link
Contributor

Looks like CI bot isn't working - I'll try again in the morning.

@alblue
Copy link
Contributor

alblue commented Aug 7, 2017

@swift-ci please test

@spevans
Copy link
Contributor Author

spevans commented Aug 7, 2017

It looks like the Jenkins CI jobs for Foundation arent listed on the ci.swift.org servers anymore (In the pull request tab)

@ianpartridge
Copy link
Contributor

@shahmishal the CI bot for Foundation doesn't seem to be working - can you advise?

@alblue
Copy link
Contributor

alblue commented Aug 7, 2017

There was a mail sent to https://lists.swift.org/pipermail/swift-users/Week-of-Mon-20170731/006034.html (and others):

— ci.swift.org is back online, but we’re still working on restoring pull request testing. We expect full functionality by tomorrow.

I suspect the Foundation jobs are part of this restoration process.

@shahmishal
Copy link
Member

@swift-ci please test

@ianpartridge
Copy link
Contributor

@swift-ci please test and merge

@spevans
Copy link
Contributor Author

spevans commented Aug 8, 2017

Looks like the builds that ended up testing on 8 threads all took too along and were aborted by timeout

@ianpartridge
Copy link
Contributor

@swift-ci please test and merge

@swift-ci swift-ci merged commit 3de37f7 into swiftlang:master Aug 9, 2017
@spevans spevans deleted the pr_nsregular_expression branch September 19, 2017 15:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants