-
-
Notifications
You must be signed in to change notification settings - Fork 925
Comparing changes
Open a pull request
base repository: jruby/jruby
base: c5313a0f0b88
head repository: jruby/jruby
compare: ba1883374939
- 13 commits
- 16 files changed
- 2 contributors
Commits on Dec 16, 2017
-
Update the MRI ripper spec excludes
First, this ignores the entire file that relies on the MRI file structure, as it seems unlikely that any of those tests will ever be applicable. Second, it adds the test_sexp.rb file which was absent from the index for some unknown reason. It also introduces a couple of excludes for failing tests in that file. Third, it clears the excludes for a couple of tests that are currently passing, and updates the description for one of the excludes.
Configuration menu - View commit details
-
Copy full SHA for 8b6fb5e - Browse repository at this point
Copy the full SHA 8b6fb5eView commit details -
Return false on tokadd_mbchar failure
Otherwise, an invalid byte sequence inside an identifier causes Ripper to continuously parse the same invalid byte sequence over and over.
Configuration menu - View commit details
-
Copy full SHA for 935adf2 - Browse repository at this point
Copy the full SHA 935adf2View commit details -
Call tokadd_mbchar from tokenAddMBC
They are identical (after fixing tokadd_mbchar)
Configuration menu - View commit details
-
Copy full SHA for 707c950 - Browse repository at this point
Copy the full SHA 707c950View commit details -
Configuration menu - View commit details
-
Copy full SHA for dbfea8c - Browse repository at this point
Copy the full SHA dbfea8cView commit details -
Use current scope in is_id_var
Otherwise, it doesn't recognize variables introduced in the block (parameters), resulting in vcall nodes instead of var_ref
Configuration menu - View commit details
-
Copy full SHA for 9a978da - Browse repository at this point
Copy the full SHA 9a978daView commit details -
Rework Ripper scope variable analysis
The previous implementation called assignable on a bunch of things that were unlikely to be strings, while only supporting string arguments. This changes the logic so that it relies on getting the identifier value from the lexer instead. In addition, this inlines the logic from assignable in all cases where the implementation is known, and splits the cases for identifiers and constants, as they have very little to do with each other. Given that the parser has inlined the definition of MRI's user_varaible and keyword variable, it seems to make sense to also inline the assignable actions. While inlining the assignable implementation, it seamed to make sense to also inline is_id_var (and remove its unused argument).
Configuration menu - View commit details
-
Copy full SHA for 68aa0d6 - Browse repository at this point
Copy the full SHA 68aa0d6View commit details -
Add command-args-state begin to Ripper
The corresponding construct was in the main parser, and allowed it correctly parse "m x do; end", where Ripper would fail and assign the block to x rather than m.
Configuration menu - View commit details
-
Copy full SHA for 93dd144 - Browse repository at this point
Copy the full SHA 93dd144View commit details -
Reset the cmd-args-state from Ripper push-local-scope
It seems like MRI is doing this.
Configuration menu - View commit details
-
Copy full SHA for 162fa52 - Browse repository at this point
Copy the full SHA 162fa52View commit details -
Clear command-args-state in brace blocks
It might not be important, but MRI seems to do this.
Configuration menu - View commit details
-
Copy full SHA for f92ca05 - Browse repository at this point
Copy the full SHA f92ca05View commit details -
Rework handling of heredoc end
Instead of ending the heredoc before emitting the final string content part, this instead just emits the final string content part and positions the cursor right before the end marker, such that the next call to the heredoc term should end the heredoc using the early return. The motivation for doing this was that with ripper the final string content of a heredoc wouldn't be dispatched to any token handler, but instead just propagated. The old behavior was clearly wrong for this corner-case, but this approach might have other problems.
Configuration menu - View commit details
-
Copy full SHA for 64fa14c - Browse repository at this point
Copy the full SHA 64fa14cView commit details -
Configuration menu - View commit details
-
Copy full SHA for 5d83209 - Browse repository at this point
Copy the full SHA 5d83209View commit details -
Dispatch on_magic_comment for Ripper
As an added bonus, the parsing of magic comment key values no longer stops at the first unrecognized key, and thus writing # -*- warn_past_scope: true; coding: ISO-8859-1 -*- will now apply the encoding even if JRuby doesn't support the magic comment attribute warn_past_scope.
Configuration menu - View commit details
-
Copy full SHA for f12cd27 - Browse repository at this point
Copy the full SHA f12cd27View commit details
Commits on Dec 18, 2017
-
Merge pull request #4900 from grddev/ripper-fixes-9.1
Improve compatibility with MRI's Ripper for JRuby 9.1
Configuration menu - View commit details
-
Copy full SHA for ba18833 - Browse repository at this point
Copy the full SHA ba18833View commit details
This comparison is taking too long to generate.
Unfortunately it looks like we can’t render this comparison for you right now. It might be too big, or there might be something weird with your repository.
You can try running this command locally to see the comparison on your machine:
git diff c5313a0f0b88...ba1883374939