-
Notifications
You must be signed in to change notification settings - Fork 750
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
properly deprecate the options hash #1187
Merged
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -421,17 +421,29 @@ def reset! | |
# @option opts :continue | ||
# Continue the lex from the previous state (i.e. don't call #reset!) | ||
# | ||
# @note The use of `opts` has been deprecated. A warning is issued if run | ||
# with `$VERBOSE` set to true. | ||
def lex(string, opts={}, &b) | ||
unless opts.nil? | ||
warn 'The use of opts with Lexer.lex is deprecated' if $VERBOSE | ||
# @note The use of :continue => true has been deprecated. A warning is | ||
# issued if run with `$VERBOSE` set to true. | ||
# | ||
# @note The use of arbitrary `opts` has never been supported, but we | ||
# previously ignored them with no error. We now warn unconditionally. | ||
def lex(string, opts=nil, &b) | ||
if opts | ||
if (opts.keys - [:continue]).size > 0 | ||
# improper use of options hash | ||
warn('Improper use of Lexer#lex - this method does not receive options.' + | ||
' This will become an error in a future version.') | ||
end | ||
|
||
if opts[:continue] | ||
warn '`lex :continue => true` is deprecated, please use #continue_lex instead' | ||
return continue_lex(string, &b) | ||
end | ||
end | ||
|
||
return enum_for(:lex, string, opts) unless block_given? | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This was the culprit for the warning. |
||
return enum_for(:lex, string) unless block_given? | ||
|
||
Lexer.assert_utf8!(string) | ||
reset! unless opts[:continue] | ||
reset! | ||
|
||
continue_lex(string, &b) | ||
end | ||
|
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You can also use
Array#empty?
here: