Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 04f85bef6aea
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5ed06d4deba8
Choose a head ref
  • 5 commits
  • 45 files changed
  • 1 contributor

Commits on Feb 16, 2015

  1. Copy the full SHA
    a85d0a0 View commit details
  2. Copy the full SHA
    0227c2b View commit details
  3. Copy the full SHA
    d5a07b3 View commit details
  4. Copy the full SHA
    7b014d0 View commit details
  5. Copy the full SHA
    5ed06d4 View commit details
Showing with 2 additions and 336 deletions.
  1. +1 −1 core/src/main/java/org/jruby/Ruby.java
  2. 0 {ext/ripper → core}/src/main/java/org/jruby/ext/ripper/ByteListLexerSource.java
  3. 0 {ext/ripper → core}/src/main/java/org/jruby/ext/ripper/GetsLexerSource.java
  4. 0 {ext/ripper → core}/src/main/java/org/jruby/ext/ripper/HeredocTerm.java
  5. 0 {ext/ripper → core}/src/main/java/org/jruby/ext/ripper/LexerSource.java
  6. 0 {ext/ripper → core}/src/main/java/org/jruby/ext/ripper/Position.java
  7. 0 {ext/ripper → core}/src/main/java/org/jruby/ext/ripper/Ripper19Parser.java
  8. 0 {ext/ripper → core}/src/main/java/org/jruby/ext/ripper/Ripper19Parser.y
  9. 0 {ext/ripper → core}/src/main/java/org/jruby/ext/ripper/Ripper19YyTables.java
  10. 0 {ext/ripper → core}/src/main/java/org/jruby/ext/ripper/RipperLexer.java
  11. 0 {ext/ripper → core}/src/main/java/org/jruby/ext/ripper/RipperLibrary.java
  12. 0 {ext/ripper → core}/src/main/java/org/jruby/ext/ripper/RipperParser.java
  13. 0 {ext/ripper → core}/src/main/java/org/jruby/ext/ripper/RipperParserState.java
  14. 0 {ext/ripper → core}/src/main/java/org/jruby/ext/ripper/RubyRipper.java
  15. 0 {ext/ripper → core}/src/main/java/org/jruby/ext/ripper/StrTerm.java
  16. 0 {ext/ripper → core}/src/main/java/org/jruby/ext/ripper/StringTerm.java
  17. 0 {ext/ripper → core}/src/main/java/org/jruby/ext/ripper/SyntaxException.java
  18. 0 {ext/ripper → core}/src/main/java/org/jruby/ext/ripper/Token.java
  19. 0 {ext/ripper → core}/src/main/java/org/jruby/ext/ripper/Tokens.java
  20. 0 {ext/ripper → core}/src/main/java/org/jruby/ext/ripper/Warnings.java
  21. 0 {ext/ripper → core}/src/main/java/org/jruby/ext/ripper/YyTables.java
  22. 0 {ext/ripper → core}/src/main/java/org/jruby/ext/ripper/skeleton.parser
  23. +0 −3 ext/.gitignore
  24. +0 −17 ext/.project
  25. +0 −2 ext/.settings/org.eclipse.core.resources.prefs
  26. +0 −4 ext/.settings/org.eclipse.m2e.core.prefs
  27. +0 −17 ext/pom.rb
  28. +0 −30 ext/pom.xml
  29. +0 −26 ext/ripper/.classpath
  30. +0 −23 ext/ripper/.project
  31. +0 −3 ext/ripper/.settings/org.eclipse.core.resources.prefs
  32. +0 −5 ext/ripper/.settings/org.eclipse.jdt.core.prefs
  33. +0 −4 ext/ripper/.settings/org.eclipse.m2e.core.prefs
  34. +0 −30 ext/ripper/License.txt
  35. +0 −21 ext/ripper/Mavenfile
  36. +0 −7 ext/ripper/Rakefile
  37. +0 −18 ext/ripper/nb-configuration.xml
  38. +0 −108 ext/ripper/pom.xml
  39. +0 −15 ext/ripper/ripper.gemspec
  40. +1 −2 lib/pom.rb
  41. 0 {ext/ripper/lib → lib/ruby/stdlib}/ripper.rb
  42. 0 {ext/ripper/lib → lib/ruby/stdlib}/ripper/core.rb
  43. 0 {ext/ripper/lib → lib/ruby/stdlib}/ripper/filter.rb
  44. 0 {ext/ripper/lib → lib/ruby/stdlib}/ripper/lexer.rb
  45. 0 {ext/ripper/lib → lib/ruby/stdlib}/ripper/sexp.rb
2 changes: 1 addition & 1 deletion core/src/main/java/org/jruby/Ruby.java
Original file line number Diff line number Diff line change
@@ -1758,12 +1758,12 @@ private void initBuiltins() {
addLazyBuiltin("ffi-internal.jar", "ffi-internal", "org.jruby.ext.ffi.FFIService");
addLazyBuiltin("tempfile.jar", "tempfile", "org.jruby.ext.tempfile.TempfileLibrary");
addLazyBuiltin("fcntl.rb", "fcntl", "org.jruby.ext.fcntl.FcntlLibrary");
addLazyBuiltin("yecht.jar", "yecht", "YechtService");
addLazyBuiltin("pathname.jar", "pathname", "org.jruby.ext.pathname.PathnameLibrary");

addLazyBuiltin("mathn/complex.jar", "mathn/complex", "org.jruby.ext.mathn.Complex");
addLazyBuiltin("mathn/rational.jar", "mathn/rational", "org.jruby.ext.mathn.Rational");
addLazyBuiltin("psych.jar", "psych", "org.jruby.ext.psych.PsychLibrary");
addLazyBuiltin("ripper.jar", "ripper", "org.jruby.ext.ripper.RipperLibrary");
addLazyBuiltin("coverage.jar", "coverage", "org.jruby.ext.coverage.CoverageLibrary");

// TODO: implement something for these?
3 changes: 0 additions & 3 deletions ext/.gitignore

This file was deleted.

17 changes: 0 additions & 17 deletions ext/.project

This file was deleted.

2 changes: 0 additions & 2 deletions ext/.settings/org.eclipse.core.resources.prefs

This file was deleted.

4 changes: 0 additions & 4 deletions ext/.settings/org.eclipse.m2e.core.prefs

This file was deleted.

17 changes: 0 additions & 17 deletions ext/pom.rb

This file was deleted.

30 changes: 0 additions & 30 deletions ext/pom.xml

This file was deleted.

26 changes: 0 additions & 26 deletions ext/ripper/.classpath

This file was deleted.

23 changes: 0 additions & 23 deletions ext/ripper/.project

This file was deleted.

3 changes: 0 additions & 3 deletions ext/ripper/.settings/org.eclipse.core.resources.prefs

This file was deleted.

5 changes: 0 additions & 5 deletions ext/ripper/.settings/org.eclipse.jdt.core.prefs

This file was deleted.

4 changes: 0 additions & 4 deletions ext/ripper/.settings/org.eclipse.m2e.core.prefs

This file was deleted.

30 changes: 0 additions & 30 deletions ext/ripper/License.txt

This file was deleted.

21 changes: 0 additions & 21 deletions ext/ripper/Mavenfile

This file was deleted.

7 changes: 0 additions & 7 deletions ext/ripper/Rakefile

This file was deleted.

18 changes: 0 additions & 18 deletions ext/ripper/nb-configuration.xml

This file was deleted.

108 changes: 0 additions & 108 deletions ext/ripper/pom.xml

This file was deleted.

15 changes: 0 additions & 15 deletions ext/ripper/ripper.gemspec

This file was deleted.

3 changes: 1 addition & 2 deletions lib/pom.rb
Original file line number Diff line number Diff line change
@@ -21,8 +21,7 @@ def version
default_gems =
[
ImportedGem.new( 'jruby-openssl', '0.9.6', true ),
ImportedGem.new( 'jruby-readline', '1.0.dev-SNAPSHOT', false ),
ImportedGem.new( 'jruby-ripper', '2.1.0.dev-SNAPSHOT', false ),
ImportedGem.new( 'jruby-readline', '1.0', false ),
ImportedGem.new( 'rake', 'rake.version', true ),
ImportedGem.new( 'rdoc', 'rdoc.version', true ),
ImportedGem.new( 'json', 'json.version', true ),
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.