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: 8f973b7c6c1f
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8aa9c0f6280d
Choose a head ref
12 contributors

Commits on Feb 15, 2015

  1. Merge branch 'master' into truffle-kwargs

    @chrisseaton
    chrisseaton committed Feb 15, 2015
    Copy the full SHA
    37a1eda View commit details

  2. [Truffle] Tag a couple of failing time specs.

    @chrisseaton
    chrisseaton committed Feb 15, 2015
    Copy the full SHA
    8085764 View commit details

Commits on Feb 20, 2015

  1. Merge branch 'master' into truffle-kwargs 

    Conflicts:
	truffle/src/main/java/org/jruby/truffle/nodes/dispatch/UnresolvedDispatchNode.java
	truffle/src/main/java/org/jruby/truffle/runtime/core/CoreLibrary.java
    @chrisseaton
    chrisseaton committed Feb 20, 2015
    Copy the full SHA
    59f6b7b View commit details

  2. [Truffle] Always give Assumptions names.

    @chrisseaton
    chrisseaton committed Feb 20, 2015
    Copy the full SHA
    613810f View commit details

Commits on Feb 27, 2015

  1. Merge branch 'master' into truffle-kwargs 

    Conflicts:
	truffle/src/main/java/org/jruby/truffle/runtime/subsystems/SafepointManager.java
    @chrisseaton
    chrisseaton committed Feb 27, 2015
    Copy the full SHA
    29ff529 View commit details

Commits on Mar 3, 2015

  1. Merge branch 'master' into truffle-kwargs 

    Conflicts:
	truffle/src/main/java/org/jruby/truffle/nodes/core/IONodes.java
	truffle/src/main/java/org/jruby/truffle/nodes/dispatch/DispatchHeadNode.java
	truffle/src/main/java/org/jruby/truffle/nodes/dispatch/DispatchNode.java
	truffle/src/main/java/org/jruby/truffle/nodes/dispatch/UncachedDispatchNode.java
	truffle/src/main/java/org/jruby/truffle/nodes/dispatch/UnresolvedDispatchNode.java
    @chrisseaton
    chrisseaton committed Mar 3, 2015
    Copy the full SHA
    041619f View commit details

Commits on Mar 5, 2015

  1. Merge branch 'master' into truffle-kwargs

    @chrisseaton
    chrisseaton committed Mar 5, 2015
    Copy the full SHA
    25d21b2 View commit details

Commits on Mar 8, 2015

  1. Merge branch 'master' into truffle-kwargs 

    Conflicts:
	truffle/src/main/java/org/jruby/truffle/nodes/dispatch/DispatchNode.java
	truffle/src/main/java/org/jruby/truffle/nodes/dispatch/UnresolvedDispatchNode.java
    @chrisseaton
    chrisseaton committed Mar 8, 2015
    Copy the full SHA
    fb82903 View commit details

Commits on Mar 10, 2015

  1. Merge branch 'master' into truffle-kwargs 

    Conflicts:
	truffle/src/main/java/org/jruby/truffle/runtime/methods/Arity.java
	truffle/src/main/java/org/jruby/truffle/translator/BodyTranslator.java
    @chrisseaton
    chrisseaton committed Mar 10, 2015
    Copy the full SHA
    a8f49a0 View commit details

Commits on Mar 12, 2015

  1. Merge branch 'master' into truffle-kwargs 

    Conflicts:
	truffle/src/main/java/org/jruby/truffle/nodes/core/ArrayAllocationSite.java
	truffle/src/main/java/org/jruby/truffle/runtime/subsystems/SafepointManager.java
    @chrisseaton
    chrisseaton committed Mar 12, 2015
    Copy the full SHA
    0dbd174 View commit details

  2. Fix warning.

    @headius
    headius committed Mar 12, 2015
    Copy the full SHA
    94bda8d View commit details

Commits on Mar 13, 2015

  1. Merge branch 'master' into truffle-kwargs

    @chrisseaton
    chrisseaton committed Mar 13, 2015
    Copy the full SHA
    2604aee View commit details

Commits on Mar 15, 2015

  1. Merge branch 'master' into truffle-kwargs 

    Conflicts:
	truffle/src/main/java/org/jruby/truffle/nodes/RubyCallNode.java
    @chrisseaton
    chrisseaton committed Mar 15, 2015
    Copy the full SHA
    ae474b3 View commit details

Commits on Mar 16, 2015

  1. Compat fixes for String#inspect wrt dummy UTF encodings. 

    See #2581.
    @headius
    headius committed Mar 16, 2015
    Copy the full SHA
    af940b1 View commit details

Commits on Mar 17, 2015

  1. Use JDK8 for these three...they are affected by JVM+Travis issues.

    @headius
    headius committed Mar 17, 2015
    Copy the full SHA
    297c953 View commit details

  2. Merge branch 'master' into truffle-kwargs

    @chrisseaton
    chrisseaton committed Mar 17, 2015
    Copy the full SHA
    44060f3 View commit details

  3. Revert "Use JDK8 for these three...they are affected by JVM+Travis is… 

    …sues."

This reverts commit 297c953.
    @headius
    headius committed Mar 17, 2015
    Copy the full SHA
    df6bae2 View commit details

  4. Try turning off sudo:false to fix build issues.

    @headius
    headius committed Mar 17, 2015
    Copy the full SHA
    14d1d29 View commit details

Commits on Mar 18, 2015

  1. correct (Java) equals/hashCode semantics for JavaAccessibleObject + m… 

    …inor tweaks

- return concrete types from getValue
- also re-implemented (inherited) toJava conversion
    @kares
    kares committed Mar 18, 2015
    Copy the full SHA
    d7217ca View commit details

  2. align JavaField's value/static_value conversions and return values + … 

    …test functionality
    @kares
    kares committed Mar 18, 2015
    Copy the full SHA
    1337fbe View commit details

  3. move (and tune) error logic from CallableSelector into the invoker im… 

    …pl where it's used
    @kares
    kares committed Mar 18, 2015
    Copy the full SHA
    015d9b4 View commit details

  4. non need to cast intValue to (int)

    @kares
    kares committed Mar 18, 2015
    Copy the full SHA
    1c5c4a3 View commit details

  5. after several concurrency fixes in Java integration - un-comment a mu… 

    …lti-threaded test
    @kares
    kares committed Mar 18, 2015
    Copy the full SHA
    ee0113e View commit details

  6. guess name-class hash-map size without internal resizing (currently <… 

    …= 48 elements)
    @kares
    kares committed Mar 18, 2015
    Copy the full SHA
    03acf55 View commit details

  7. move getArity/getParameterTypes into base class as finals + help used… 

    … methods to JIT
    @kares
    kares committed Mar 18, 2015
    Copy the full SHA
    ebc2422 View commit details

  8. more base-class sharing between JavaCallable method/constructor impl … 

    …+ minor tweaks
    @kares
    kares committed Mar 18, 2015
    Copy the full SHA
    0de8bdf View commit details

  9. add a factory onto ClassValue since we're be instantiating the same (… 

    …based on opt)

- JavaSupport internals now no longer deal with ClassValue impl constructors
    @kares
    kares committed Mar 18, 2015
    Copy the full SHA
    cfa0011 View commit details

  10. loadPaths list generics - easier to guess for JavaEmbedUtils consumers

    @kares
    kares committed Mar 18, 2015
    Copy the full SHA
    99a4c30 View commit details

  11. one JRubyMethod with 2 names is enough to have

    @kares
    kares committed Mar 18, 2015
    Copy the full SHA
    b997129 View commit details

  12. move Java.method_missing into native

    @kares
    kares committed Mar 18, 2015
    Copy the full SHA
    bf85781 View commit details

  13. update CallableSelector's (Map) cache internals - so we can easily re… 

    …factor further
    @kares
    kares committed Mar 18, 2015
    Copy the full SHA
    07e87cc View commit details

  14. a slight Java integration (mostly bootstrap internals) cleanup

    @kares
    kares committed Mar 18, 2015
    Copy the full SHA
    9902ebd View commit details

  15. cleanup the constructor search - keeping redundant ~ 'intended' code … 

    …as comments
    @kares
    kares committed Mar 18, 2015
    Copy the full SHA
    411086d View commit details

  16. re-factored candidate matching loops - for more readability and less … 

    …implicit iterator use
    @kares
    kares committed Mar 18, 2015
    Copy the full SHA
    b5c5e2b View commit details

  17. do not do equals on Class objects (just compare by identity) + remove… 

    … unused imports
    @kares
    kares committed Mar 18, 2015
    Copy the full SHA
    3635300 View commit details

  18. in case there's an exact parameter match - do not proceed with argume… 

    …nt matching

... towards fixing #2595
    @kares
    kares committed Mar 18, 2015
    Copy the full SHA
    6521ee4 View commit details

  19. calculate 'sofisticated' type preference when ambiguous callables fou… 

    …nd (fixes #2595)
    @kares
    kares committed Mar 18, 2015
    4
    Copy the full SHA
    adeb887 View commit details

  20. Merge branch 'master' into truffle-kwargs

    @chrisseaton
    chrisseaton committed Mar 18, 2015
    Copy the full SHA
    2c15c8c View commit details

  21. implements strict base64 encoding 

    apparently the respective tests were excluded.

Sponsored by Lookout Inc.
    @mkristian
    mkristian committed Mar 18, 2015
    Copy the full SHA
    13ff7bf View commit details

  22. [Truffle] Adding raiseIfFrozenSelf to Array#{map!,collect!}.

    @bjfish
    bjfish committed Mar 18, 2015
    Copy the full SHA
    f6e1f92 View commit details

  23. [Truffle] Bulk adding some returnsEnumeratorIfNoBlock to Array methods.

    @bjfish
    bjfish committed Mar 18, 2015
    Copy the full SHA
    dc09be9 View commit details

Commits on Mar 19, 2015

  1. Merge pull request #2722 from bjfish/truffle_array_map_frozen 

    [Truffle] Adding raiseIfFrozenSelf to Array#{map!,collect!}.
    @chrisseaton
    chrisseaton committed Mar 19, 2015
    Copy the full SHA
    b03e121 View commit details

  2. [Truffle] Adding args to to_enum call in returnsEnumeratorIfNoBlock a… 

    …nnotation.
    @bjfish
    bjfish committed Mar 19, 2015
    Copy the full SHA
    7c4336a View commit details

  3. create usual bin archive as well one where jar files are pack200 comp… 

    …ressed

added bin/unpack200.sh which can be used to unpack all the jar files after
extracting the archive
    @mkristian
    mkristian committed Mar 19, 2015
    Copy the full SHA
    d580ce3 View commit details

  4. added check of file size of distribtion artifacts 

    granularity is 1M so if things fail is either because natural growth or
something happened again which let the filesize explode.
    @mkristian
    mkristian committed Mar 19, 2015
    Copy the full SHA
    e366b85 View commit details

  5. [build] generated pom.xml

    @mkristian
    mkristian committed Mar 19, 2015
    Copy the full SHA
    8ae788d View commit details

  6. consolidated overall amount of artifacts 

    no more jruby-core:noasm and jruby-core:complete attached artifacts, they
were too complicated to be used properly.

the jruby-core will have the asm + jnr-jffi (which uses asm) shaded into the jar

no need for maven/jruby-noasm anymore

added bin/jruby200.sh which is bin/jruby in jruby-bin200.tar.gz and this
script will unpack all jars and then replace itself with bin/jruby.bash. i.e.
the first call of bin/jruby will first finish the installation and then
execute bin/jruby.bash. any further bin/jruby execution is as usual.

the patch also reduces the total amount of distributed artifacts by a couple
of MB
    @mkristian
    mkristian committed Mar 19, 2015
    4
    Copy the full SHA
    bd59418 View commit details

  7. [build] cleanup

    @mkristian
    mkristian committed Mar 19, 2015
    Copy the full SHA
    74e8a0e View commit details

  8. move maven/jruby-stdlib/ into lib/

    @mkristian
    mkristian committed Mar 19, 2015
    Copy the full SHA
    f381ec5 View commit details

  9. do not attache bin200.tar.gz archive, i.e. do not deploy it

    @mkristian
    mkristian committed Mar 19, 2015
    Copy the full SHA
    aa596f4 View commit details
Showing with 4,568 additions and 3,694 deletions.
  1. +5 −0 bin/jruby200.sh
  2. +10 −28 core/pom.rb
  3. +22 −458 core/pom.xml
  4. +1 −1 core/src/main/java/org/jruby/RubyGenerator.java
  5. +19 −21 core/src/main/java/org/jruby/RubyObject.java
  6. +5 −40 core/src/main/java/org/jruby/RubyString.java
  7. +16 −0 core/src/main/java/org/jruby/ast/ArgsNode.java
  8. +8 −10 core/src/main/java/org/jruby/ir/runtime/IRRuntimeHelpers.java
  9. +261 −249 core/src/main/java/org/jruby/java/dispatch/CallableSelector.java
  10. +66 −9 core/src/main/java/org/jruby/java/invokers/RubyToJavaInvoker.java
  11. +3 −3 core/src/main/java/org/jruby/java/proxies/ConcreteJavaProxy.java
  12. +24 −24 core/src/main/java/org/jruby/java/proxies/MapJavaProxy.java
  13. +55 −39 core/src/main/java/org/jruby/javasupport/Java.java
  14. +40 −18 core/src/main/java/org/jruby/javasupport/JavaAccessibleObject.java
  15. +15 −12 core/src/main/java/org/jruby/javasupport/JavaArray.java
  16. +92 −44 core/src/main/java/org/jruby/javasupport/JavaCallable.java
  17. +82 −71 core/src/main/java/org/jruby/javasupport/JavaClass.java
  18. +81 −117 core/src/main/java/org/jruby/javasupport/JavaConstructor.java
  19. +10 −10 core/src/main/java/org/jruby/javasupport/JavaEmbedUtils.java
  20. +55 −70 core/src/main/java/org/jruby/javasupport/JavaField.java
  21. +33 −63 core/src/main/java/org/jruby/javasupport/JavaMethod.java
  22. +9 −9 core/src/main/java/org/jruby/javasupport/JavaObject.java
  23. +0 −1 core/src/main/java/org/jruby/javasupport/JavaSupport.java
  24. +33 −69 core/src/main/java/org/jruby/javasupport/JavaSupportImpl.java
  25. +209 −205 core/src/main/java/org/jruby/runtime/Helpers.java
  26. +22 −23 core/src/main/java/org/jruby/util/CodegenUtils.java
  27. +97 −42 core/src/main/java/org/jruby/util/Pack.java
  28. +32 −3 core/src/main/java/org/jruby/util/collections/ClassValue.java
  29. +1 −2 core/src/main/ruby/jruby/java.rb
  30. +1 −8 core/src/main/ruby/jruby/java/java_module.rb
  31. +3 −3 core/src/test/java/org/jruby/runtime/EventHookTest.java
  32. +0 −6 jruby.bnd.template
  33. +88 −16 lib/pom.rb
  34. +99 −32 lib/pom.xml
  35. BIN {maven/jruby-noasm → lib}/src/empty.jar
  36. +0 −17 maven/.project
  37. +0 −2 maven/.settings/org.eclipse.core.resources.prefs
  38. +0 −4 maven/.settings/org.eclipse.m2e.core.prefs
  39. +0 −23 maven/jruby-complete/.project
  40. +0 −2 maven/jruby-complete/.settings/org.eclipse.core.resources.prefs
  41. +0 −4 maven/jruby-complete/.settings/org.eclipse.m2e.core.prefs
  42. +1 −7 maven/jruby-complete/pom.rb
  43. +0 −29 maven/jruby-complete/pom.xml
  44. +0 −17 maven/jruby-dist/.project
  45. +0 −2 maven/jruby-dist/.settings/org.eclipse.core.resources.prefs
  46. +0 −4 maven/jruby-dist/.settings/org.eclipse.m2e.core.prefs
  47. +30 −47 maven/jruby-dist/pom.rb
  48. +32 −70 maven/jruby-dist/pom.xml
  49. +39 −0 maven/jruby-dist/src/main/assembly/bin.xml
  50. +45 −0 maven/jruby-dist/src/main/assembly/bin200.xml
  51. +9 −12 maven/jruby-dist/src/main/assembly/{jruby.xml → common.xml}
  52. +4 −4 maven/jruby-jars/Mavenfile
  53. +7 −2 maven/jruby-jars/pom.xml
  54. +0 −26 maven/jruby-noasm/.classpath
  55. +0 −23 maven/jruby-noasm/.project
  56. +0 −2 maven/jruby-noasm/.settings/org.eclipse.core.resources.prefs
  57. +0 −5 maven/jruby-noasm/.settings/org.eclipse.jdt.core.prefs
  58. +0 −4 maven/jruby-noasm/.settings/org.eclipse.m2e.core.prefs
  59. +0 −39 maven/jruby-noasm/pom.rb
  60. +0 −69 maven/jruby-noasm/pom.xml
  61. +0 −3 maven/jruby-noasm/src/it/integrity/invoker.properties
  62. +0 −164 maven/jruby-noasm/src/it/integrity/pom.xml
  63. +0 −45 maven/jruby-noasm/src/it/integrity/verify.bsh
  64. +0 −35 maven/jruby-noasm/src/it/settings.xml
  65. +0 −26 maven/jruby-stdlib/.classpath
  66. +0 −23 maven/jruby-stdlib/.project
  67. +0 −2 maven/jruby-stdlib/.settings/org.eclipse.core.resources.prefs
  68. +0 −5 maven/jruby-stdlib/.settings/org.eclipse.jdt.core.prefs
  69. +0 −4 maven/jruby-stdlib/.settings/org.eclipse.m2e.core.prefs
  70. +0 −101 maven/jruby-stdlib/pom.rb
  71. +0 −126 maven/jruby-stdlib/pom.xml
  72. BIN maven/jruby-stdlib/src/empty.jar
  73. +0 −12 maven/jruby-stdlib/src/main/resources/META-INF/MANIFEST.MF
  74. +4 −4 maven/jruby/src/it/integrity/pom.xml
  75. +1 −1 maven/jruby/src/it/integrity/verify.bsh
  76. +0 −2 maven/pom.rb
  77. +4 −17 maven/pom.xml
  78. +0 −6 spec/truffle/tags/core/array/collect_tags.txt
  79. +0 −6 spec/truffle/tags/core/array/concat_tags.txt
  80. +0 −2 spec/truffle/tags/core/array/delete_if_tags.txt
  81. +0 −1 spec/truffle/tags/core/array/delete_tags.txt
  82. +0 −19 spec/truffle/tags/core/array/join_tags.txt
  83. +0 −4 spec/truffle/tags/core/array/map_tags.txt
  84. +0 −19 spec/truffle/tags/core/array/multiply_tags.txt
  85. +0 −13 spec/truffle/tags/core/array/pop_tags.txt
  86. +0 −7 spec/truffle/tags/core/array/reject_tags.txt
  87. +0 −1 spec/truffle/tags/core/array/rindex_tags.txt
  88. +0 −7 spec/truffle/tags/core/array/select_tags.txt
  89. +0 −10 spec/truffle/tags/core/array/shift_tags.txt
  90. +0 −5 spec/truffle/tags/core/array/sort_by_tags.txt
  91. +0 −1 spec/truffle/tags/core/integer/downto_tags.txt
  92. +0 −1 spec/truffle/tags/core/integer/upto_tags.txt
  93. +0 −1 spec/truffle/tags/core/kernel/loop_tags.txt
  94. +0 −1 spec/truffle/tags/core/objectspace/each_object_tags.txt
  95. +0 −1 spec/truffle/tags/core/range/each_tags.txt
  96. +0 −1 spec/truffle/tags/core/range/step_tags.txt
  97. +0 −3 spec/truffle/tags/core/string/append_tags.txt
  98. +0 −3 spec/truffle/tags/core/string/chop_tags.txt
  99. +0 −2 spec/truffle/tags/core/string/chr_tags.txt
  100. +0 −3 spec/truffle/tags/core/string/concat_tags.txt
  101. +1 −2 spec/truffle/tags/core/string/delete_tags.txt
  102. +0 −1 spec/truffle/tags/core/string/dump_tags.txt
  103. +0 −1 spec/truffle/tags/core/string/each_byte_tags.txt
  104. +0 −3 spec/truffle/tags/core/string/element_reference_tags.txt
  105. +0 −2 spec/truffle/tags/core/string/element_set_tags.txt
  106. +0 −4 spec/truffle/tags/core/string/end_with_tags.txt
  107. +0 −2 spec/truffle/tags/core/string/force_encoding_tags.txt
  108. +0 −2 spec/truffle/tags/core/string/gsub_tags.txt
  109. +0 −4 spec/truffle/tags/core/string/insert_tags.txt
  110. +0 −3 spec/truffle/tags/core/string/replace_tags.txt
  111. +0 −2 spec/truffle/tags/core/string/reverse_tags.txt
  112. +0 −4 spec/truffle/tags/core/string/slice_tags.txt
  113. +0 −2 spec/truffle/tags/core/string/split_tags.txt
  114. +25 −20 test/check_versions.sh
  115. +8 −0 test/jruby/test_base64_strangeness.rb
  116. +95 −26 test/jruby/test_higher_javasupport.rb
  117. +0 −1 test/mri/excludes/TestBase64.rb
  118. +15 −0 test/mri/excludes/TestM17NComb.rb
  119. +89 −25 tool/jt.rb
  120. +4 −0 tool/truffle-findbugs-exclude.xml
  121. +24 −0 tool/truffle-missing-copyright-info.rb
  122. +2 −2 truffle/README.md
  123. +0 −13 truffle/pom.rb
  124. +0 −114 truffle/pom.xml
  125. +2 −2 truffle/src/main/java/org/jruby/truffle/TruffleBridgeImpl.java
  126. +0 −13 truffle/src/main/java/org/jruby/truffle/nodes/CoreSourceSection.java
  127. +183 −1 truffle/src/main/java/org/jruby/truffle/nodes/RubyCallNode.java
  128. +0 −4 truffle/src/main/java/org/jruby/truffle/nodes/RubyNode.java
  129. +0 −1 truffle/src/main/java/org/jruby/truffle/nodes/RubyTypes.java
  130. +9 −0 truffle/src/main/java/org/jruby/truffle/nodes/coerce/ToAryNode.java
  131. +4 −0 truffle/src/main/java/org/jruby/truffle/nodes/core/ArrayGuards.java
  132. +1,350 −180 truffle/src/main/java/org/jruby/truffle/nodes/core/ArrayNodes.java
  133. +0 −20 truffle/src/main/java/org/jruby/truffle/nodes/core/CoreMethodNode.java
  134. +1 −7 truffle/src/main/java/org/jruby/truffle/nodes/core/CoreMethodNodeManager.java
  135. +3 −1 truffle/src/main/java/org/jruby/truffle/nodes/core/FixnumNodes.java
  136. +4 −1 truffle/src/main/java/org/jruby/truffle/nodes/core/HashNodes.java
  137. +0 −2 truffle/src/main/java/org/jruby/truffle/nodes/core/IONodes.java
  138. +2 −2 truffle/src/main/java/org/jruby/truffle/nodes/core/IntegerNodes.java
  139. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/core/KernelNodes.java
  140. +4 −4 truffle/src/main/java/org/jruby/truffle/nodes/core/ModuleNodes.java
  141. +48 −15 truffle/src/main/java/org/jruby/truffle/nodes/core/MutexNodes.java
  142. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/core/ObjectSpaceNodes.java
  143. +2 −2 truffle/src/main/java/org/jruby/truffle/nodes/core/RangeNodes.java
  144. +12 −1 truffle/src/main/java/org/jruby/truffle/nodes/core/ReturnEnumeratorIfNoBlockNode.java
  145. +26 −0 truffle/src/main/java/org/jruby/truffle/nodes/core/StringGuards.java
  146. +278 −192 truffle/src/main/java/org/jruby/truffle/nodes/core/StringNodes.java
  147. +1 −1 ...fle/src/main/java/org/jruby/truffle/nodes/core/{PrimitiveNodes.java → TrufflePrimitiveNodes.java}
  148. +12 −1 truffle/src/main/java/org/jruby/truffle/nodes/dispatch/CachedBoxedDispatchNode.java
  149. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/dispatch/CachedDispatchNode.java
  150. +4 −0 truffle/src/main/java/org/jruby/truffle/nodes/dispatch/DispatchNode.java
  151. +12 −0 truffle/src/main/java/org/jruby/truffle/nodes/literal/HashLiteralNode.java
  152. +33 −0 truffle/src/main/java/org/jruby/truffle/nodes/methods/MarkerNode.java
  153. +10 −1 truffle/src/main/java/org/jruby/truffle/nodes/methods/arguments/CheckArityNode.java
  154. +34 −0 truffle/src/main/java/org/jruby/truffle/nodes/methods/arguments/OptionalKeywordArgMissingNode.java
  155. +39 −14 truffle/src/main/java/org/jruby/truffle/nodes/methods/arguments/ReadKeywordArgumentNode.java
  156. +22 −1 truffle/src/main/java/org/jruby/truffle/nodes/methods/arguments/ReadKeywordRestArgumentNode.java
  157. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/methods/arguments/ReadOptionalArgumentNode.java
  158. +35 −0 truffle/src/main/java/org/jruby/truffle/nodes/methods/arguments/UnknownArgumentErrorNode.java
  159. +1 −2 truffle/src/main/java/org/jruby/truffle/nodes/objects/DefineOrGetClassNode.java
  160. +0 −2 truffle/src/main/java/org/jruby/truffle/nodes/respondto/RespondToNode.java
  161. +3 −3 truffle/src/main/java/org/jruby/truffle/nodes/rubinius/EncodingPrimitiveNodes.java
  162. +2 −3 truffle/src/main/java/org/jruby/truffle/nodes/rubinius/ObjectPrimitiveNodes.java
  163. +9 −0 truffle/src/main/java/org/jruby/truffle/nodes/rubinius/RandomPrimitiveNodes.java
  164. +172 −28 truffle/src/main/java/org/jruby/truffle/nodes/rubinius/StringPrimitiveNodes.java
  165. +30 −4 truffle/src/main/java/org/jruby/truffle/runtime/RubyArguments.java
  166. +2 −0 truffle/src/main/java/org/jruby/truffle/runtime/RubyContext.java
  167. +5 −3 truffle/src/main/java/org/jruby/truffle/runtime/backtrace/DebugBacktraceFormatter.java
  168. +8 −4 truffle/src/main/java/org/jruby/truffle/runtime/backtrace/MRIBacktraceFormatter.java
  169. +30 −35 truffle/src/main/java/org/jruby/truffle/runtime/core/CoreLibrary.java
  170. +9 −5 truffle/src/main/java/org/jruby/truffle/runtime/core/RubyBasicObject.java
  171. +10 −13 truffle/src/main/java/org/jruby/truffle/runtime/core/RubyClass.java
  172. +2 −2 truffle/src/main/java/org/jruby/truffle/runtime/core/RubyModule.java
  173. +0 −43 truffle/src/main/java/org/jruby/truffle/runtime/core/RubyMutex.java
  174. +15 −7 truffle/src/main/java/org/jruby/truffle/runtime/core/RubyRegexp.java
  175. +14 −11 truffle/src/main/java/org/jruby/truffle/runtime/core/RubyString.java
  176. +61 −4 truffle/src/main/java/org/jruby/truffle/runtime/methods/Arity.java
  177. +10 −0 truffle/src/main/java/org/jruby/truffle/runtime/methods/SharedMethodInfo.java
  178. +1 −2 truffle/src/main/java/org/jruby/truffle/runtime/subsystems/ObjectSpaceManager.java
  179. +2 −2 truffle/src/main/java/org/jruby/truffle/translator/BodyTranslator.java
  180. +11 −2 truffle/src/main/java/org/jruby/truffle/translator/LoadArgumentsTranslator.java
  181. +3 −3 truffle/src/main/java/org/jruby/truffle/translator/MethodTranslator.java
  182. +1 −1 truffle/src/main/java/org/jruby/truffle/translator/ModuleTranslator.java
  183. +10 −5 truffle/src/main/java/org/jruby/truffle/translator/Translator.java
  184. +5 −0 truffle/src/main/ruby/core/rubinius/bootstrap/string.rb
  185. +63 −0 truffle/src/main/ruby/core/rubinius/common/array.rb
  186. +19 −0 truffle/src/main/ruby/core/rubinius/common/string.rb
5 changes: 5 additions & 0 deletions bin/jruby200.sh
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/bin/sh
find . -name '*.pack.gz' | sed 's/\(.*\).pack.gz/\1.pack.gz \1.jar/' | xargs -L1 unpack200 --remove-pack-file
cp bin/jruby.bash bin/jruby
bin/jruby.bash $@
exit
38 changes: 10 additions & 28 deletions core/pom.rb
View file
Original file line number Diff line number Diff line change
@@ -52,7 +52,7 @@

jar 'org.jruby.joni:joni:2.1.5'
jar 'org.jruby.extras:bytelist:1.0.12'
jar 'org.jruby.jcodings:jcodings:1.0.12'
jar 'org.jruby.jcodings:jcodings:1.0.13-SNAPSHOT'
jar 'org.jruby:dirgra:0.2'

jar 'com.headius:invokebinder:1.5'
@@ -253,33 +253,15 @@
'outputFile' => '${jruby.basedir}/lib/jruby.jar',
'transformers' => [ { '@implementation' => 'org.apache.maven.plugins.shade.resource.ManifestResourceTransformer',
'mainClass' => 'org.jruby.Main' } ] )
end

[ :osgi, :dist, :'jruby-jars', :main, :all, :complete, :release, :jruby_complete_jar_extended ].each do |name|
profile name do
plugin :shade do
execute_goals( 'shade',
:id => 'pack jruby-core-noasm.jar',
:phase => 'package',
'shadedArtifactAttached' => 'true',
'shadedClassifierName' => 'noasm',
'artifactSet' => {
'includes' => [ 'com.github.jnr:jnr-ffi',
'org.ow2.asm:*' ]
},
'relocations' => [ { 'pattern' => 'org.objectweb',
'shadedPattern' => 'org.jruby.org.objectweb' } ] )
execute_goals( 'shade',
:id => 'pack jruby-core-complete.jar',
:phase => 'package',
'shadedArtifactAttached' => 'true',
'shadedClassifierName' => 'complete',
'relocations' => [ { 'pattern' => 'org.objectweb',
'shadedPattern' => 'org.jruby.org.objectweb' } ],
'transformers' => [ { '@implementation' => 'org.apache.maven.plugins.shade.resource.ManifestResourceTransformer',
'mainClass' => 'org.jruby.Main' } ] )
end
end
execute_goals( 'shade',
:id => 'shade the asm classes',
:phase => 'verify',
'artifactSet' => {
'includes' => [ 'com.github.jnr:jnr-ffi',
'org.ow2.asm:*' ]
},
'relocations' => [ { 'pattern' => 'org.objectweb',
'shadedPattern' => 'org.jruby.org.objectweb' } ] )
end

profile 'jruby.bash' do
Loading