Skip to content
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

Fnmatch extglob support #2275

Merged
merged 2 commits into from Dec 18, 2014
Merged

Fnmatch extglob support #2275

merged 2 commits into from Dec 18, 2014

Conversation

jc00ke
Copy link
Contributor

@jc00ke jc00ke commented Dec 4, 2014

Closes #721

@jc00ke
Copy link
Contributor Author

@jc00ke jc00ke commented Dec 4, 2014

Ugh, sorry for the "trailing white space removal" noise 😦

@@ -466,6 +466,84 @@ private static int push_globs(POSIX posix, String cwd, List<ByteList> ary, byte[
return glob_helper(posix, cwd, pattern, pbegin, pend, -1, pflags, glob_caller, new GlobArgs(push_pattern, ary));
}

public static ArrayList<String> braces(String pattern, int flags, ArrayList<String> patterns) {
Copy link
Contributor Author

@jc00ke jc00ke Dec 4, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If I can swap String pattern for ByteList pattern then I can ditch spath above. Need some guidance on String -> ByteList though.

Thanks @jbr for expanding these.
@zzak
Copy link

@zzak zzak commented Dec 18, 2014

It would be nice w/o the whitespace, but I'd like to test this patch out

@jc00ke
Copy link
Contributor Author

@jc00ke jc00ke commented Dec 18, 2014

@zzak I can redo this PR if you & @headius think. Not a big deal on my end.

@headius
Copy link
Member

@headius headius commented Dec 18, 2014

@jc00ke If you can, please do remove the whitespace. Should be simple enough to reset the commit and only add -p the relevant lines, plus force push.

@headius
Copy link
Member

@headius headius commented Dec 18, 2014

Alternatively I could just remove it manually when I merge PR. Testing locally now.

@jc00ke
Copy link
Contributor Author

@jc00ke jc00ke commented Dec 18, 2014

I'll fix it real quick.

@headius
Copy link
Member

@headius headius commented Dec 18, 2014

I confirmed that the two MRI tests for FNM_EXTGLOB are good too, ruby/test_fnmatch.rb in test_extglob and test_unmatched_encoding. So I'm satisfied that this is good to merge (sans whitespace noise).

@jc00ke
Copy link
Contributor Author

@jc00ke jc00ke commented Dec 18, 2014

@headius whitespace removal begone! 😉

headius added a commit that referenced this issue Dec 18, 2014
@headius headius merged commit 8930f98 into jruby:master Dec 18, 2014
1 check was pending
@zzak
Copy link

@zzak zzak commented Dec 18, 2014

🎉 now to test it ;)

@jc00ke
Copy link
Contributor Author

@jc00ke jc00ke commented Dec 18, 2014

Do work @zzak!

@jc00ke jc00ke deleted the fnmatch-extglob branch Dec 18, 2014
headius added a commit that referenced this issue Dec 18, 2014
@headius headius added this to the JRuby 9.0.0.0-pre1 milestone Dec 18, 2014
@headius headius self-assigned this Dec 18, 2014
@headius
Copy link
Member

@headius headius commented Dec 18, 2014

Thanks for the help, all :-)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants