-
-
Notifications
You must be signed in to change notification settings - Fork 925
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into truffle-head
Conflicts: core/src/main/java/org/jruby/truffle/nodes/RubyRootNode.java core/src/main/java/org/jruby/truffle/nodes/control/DoWhileNode.java core/src/main/java/org/jruby/truffle/nodes/control/WhileNode.java core/src/main/java/org/jruby/truffle/nodes/core/FixnumNodes.java
- 9.4.12.0
- 9.4.11.0
- 9.4.10.0
- 9.4.9.0
- 9.4.8.0
- 9.4.7.0
- 9.4.6.0
- 9.4.5.0
- 9.4.4.0
- 9.4.3.0
- 9.4.2.0
- 9.4.1.0
- 9.4.0.0
- 9.3.15.0
- 9.3.14.0
- 9.3.13.0
- 9.3.12.0
- 9.3.11.0
- 9.3.10.0
- 9.3.9.0
- 9.3.8.0
- 9.3.7.0
- 9.3.6.0
- 9.3.5.0
- 9.3.4.0
- 9.3.3.0
- 9.3.2.0
- 9.3.1.0
- 9.3.0.0
- 9.2.21.0
- 9.2.20.1
- 9.2.20.0
- 9.2.19.0
- 9.2.18.0
- 9.2.17.0
- 9.2.16.0
- 9.2.15.0
- 9.2.14.0
- 9.2.13.0
- 9.2.12.0
- 9.2.11.1
- 9.2.11.0
- 9.2.10.0
- 9.2.9.0
- 9.2.8.0
- 9.2.7.0
- 9.2.6.0
- 9.2.5.0
- 9.2.4.1
- 9.2.4.0
- 9.2.3.0
- 9.2.2.0
- 9.2.1.0
- 9.2.0.0
- 9.1.17.0
- 9.1.16.0
- 9.1.15.0
- 9.1.14.0
- 9.1.13.0
- 9.1.12.0
- 9.1.11.0
- 9.1.10.0
- 9.1.9.0
- 9.1.8.0
- 9.1.7.0
- 9.1.6.0
- 9.1.5.0
- 9.1.4.0
- 9.1.3.0
- 9.1.2.0
- 9.1.1.0
- 9.1.0.0
- 9.0.5.0
- 9.0.4.0
- 9.0.3.0
- 9.0.1.0
- 9.0.0.0
- 9.0.0.0.rc2
- 9.0.0.0.rc1
- 9.0.0.0.pre2
- 9.0.0.0.pre1
Showing
61 changed files
with
639 additions
and
3,054 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
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
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
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
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 |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| <factorypath> | ||
| <factorypathentry kind="VARJAR" id="M2_REPO/com/oracle/truffle/0.5/truffle-0.5.jar" enabled="true" runInBatchMode="false"/> | ||
| <factorypathentry kind="VARJAR" id="M2_REPO/com/oracle/truffle-dsl-processor/0.5/truffle-dsl-processor-0.5.jar" enabled="true" runInBatchMode="false"/> | ||
| </factorypath> |
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 |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <projectDescription> | ||
| <name>jruby-core</name> | ||
| <comment>JRuby is the effort to recreate the Ruby (http://www.ruby-lang.org) interpreter in Java. NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment> | ||
| <projects/> | ||
| <buildSpec> | ||
| <buildCommand> | ||
| <name>org.eclipse.jdt.core.javabuilder</name> | ||
| </buildCommand> | ||
| </buildSpec> | ||
| <natures> | ||
| <nature>org.eclipse.jdt.core.javanature</nature> | ||
| </natures> | ||
| </projectDescription> |
This file was deleted.
Oops, something went wrong.
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 |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| eclipse.preferences.version=1 | ||
| org.eclipse.jdt.apt.aptEnabled=true | ||
| org.eclipse.jdt.apt.genSrcDir=target/generated-sources | ||
| org.eclipse.jdt.apt.reconcileEnabled=true |
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
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 |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| eclipse.preferences.version=1 | ||
| editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true | ||
| sp_cleanup.add_default_serial_version_id=true | ||
| sp_cleanup.add_generated_serial_version_id=false | ||
| sp_cleanup.add_missing_annotations=false | ||
| sp_cleanup.add_missing_deprecated_annotations=true | ||
| sp_cleanup.add_missing_methods=false | ||
| sp_cleanup.add_missing_nls_tags=false | ||
| sp_cleanup.add_missing_override_annotations=true | ||
| sp_cleanup.add_missing_override_annotations_interface_methods=true | ||
| sp_cleanup.add_serial_version_id=false | ||
| sp_cleanup.always_use_blocks=true | ||
| sp_cleanup.always_use_parentheses_in_expressions=false | ||
| sp_cleanup.always_use_this_for_non_static_field_access=false | ||
| sp_cleanup.always_use_this_for_non_static_method_access=false | ||
| sp_cleanup.convert_functional_interfaces=false | ||
| sp_cleanup.convert_to_enhanced_for_loop=false | ||
| sp_cleanup.correct_indentation=false | ||
| sp_cleanup.format_source_code=false | ||
| sp_cleanup.format_source_code_changes_only=false | ||
| sp_cleanup.insert_inferred_type_arguments=false | ||
| sp_cleanup.make_local_variable_final=true | ||
| sp_cleanup.make_parameters_final=false | ||
| sp_cleanup.make_private_fields_final=true | ||
| sp_cleanup.make_type_abstract_if_missing_method=false | ||
| sp_cleanup.make_variable_declarations_final=false | ||
| sp_cleanup.never_use_blocks=false | ||
| sp_cleanup.never_use_parentheses_in_expressions=true | ||
| sp_cleanup.on_save_use_additional_actions=true | ||
| sp_cleanup.organize_imports=false | ||
| sp_cleanup.qualify_static_field_accesses_with_declaring_class=false | ||
| sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true | ||
| sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true | ||
| sp_cleanup.qualify_static_member_accesses_with_declaring_class=false | ||
| sp_cleanup.qualify_static_method_accesses_with_declaring_class=false | ||
| sp_cleanup.remove_private_constructors=true | ||
| sp_cleanup.remove_redundant_type_arguments=true | ||
| sp_cleanup.remove_trailing_whitespaces=true | ||
| sp_cleanup.remove_trailing_whitespaces_all=true | ||
| sp_cleanup.remove_trailing_whitespaces_ignore_empty=false | ||
| sp_cleanup.remove_unnecessary_casts=false | ||
| sp_cleanup.remove_unnecessary_nls_tags=false | ||
| sp_cleanup.remove_unused_imports=false | ||
| sp_cleanup.remove_unused_local_variables=false | ||
| sp_cleanup.remove_unused_private_fields=true | ||
| sp_cleanup.remove_unused_private_members=false | ||
| sp_cleanup.remove_unused_private_methods=true | ||
| sp_cleanup.remove_unused_private_types=true | ||
| sp_cleanup.sort_members=false | ||
| sp_cleanup.sort_members_all=false | ||
| sp_cleanup.use_anonymous_class_creation=false | ||
| sp_cleanup.use_blocks=false | ||
| sp_cleanup.use_blocks_only_for_return_and_throw=false | ||
| sp_cleanup.use_lambda=true | ||
| sp_cleanup.use_parentheses_in_expressions=false | ||
| sp_cleanup.use_this_for_non_static_field_access=false | ||
| sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true | ||
| sp_cleanup.use_this_for_non_static_method_access=false | ||
| sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true | ||
| sp_cleanup.use_type_arguments=false |
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
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
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
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
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
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
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
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
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
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
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
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
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
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 |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| package org.jruby.ir.operands; | ||
|
|
||
| import org.jruby.RubyComplex; | ||
| import org.jruby.ir.IRVisitor; | ||
| import org.jruby.runtime.ThreadContext; | ||
| import org.jruby.runtime.builtin.IRubyObject; | ||
|
|
||
| /** | ||
| * Represents a Complex literal. | ||
| */ | ||
| public class Complex extends ImmutableLiteral { | ||
| private ImmutableLiteral number; | ||
|
|
||
| public Complex(ImmutableLiteral number) { | ||
| super(OperandType.COMPLEX); | ||
|
|
||
| this.number = number; | ||
| } | ||
|
|
||
| @Override | ||
| public Object createCacheObject(ThreadContext context) { | ||
| return RubyComplex.newComplexRaw(context.runtime, | ||
| context.runtime.newFixnum(0), (IRubyObject) number.cachedObject(context)); | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| return number + "i"; | ||
| } | ||
|
|
||
| @Override | ||
| public void visit(IRVisitor visitor) { | ||
| visitor.Complex(this); | ||
| } | ||
|
|
||
| public Operand getNumber() { | ||
| return number; | ||
| } | ||
| } |
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
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
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 |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| package org.jruby.ir.operands; | ||
|
|
||
| import org.jruby.ir.IRVisitor; | ||
| import org.jruby.runtime.ThreadContext; | ||
|
|
||
| /** | ||
| * Literal Rational number. | ||
| */ | ||
| public class Rational extends ImmutableLiteral { | ||
| private final long numerator; | ||
| private final long denominator; | ||
|
|
||
| public Rational(long numerator, long denominator) { | ||
| super(OperandType.RATIONAL); | ||
|
|
||
| this.numerator = numerator; | ||
| this.denominator = denominator; | ||
| } | ||
|
|
||
| @Override | ||
| public Object createCacheObject(ThreadContext context) { | ||
| return context.runtime.newRational(numerator, denominator); | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| return "Rational:" + numerator + "/1"; | ||
| } | ||
|
|
||
| @Override | ||
| public void visit(IRVisitor visitor) { | ||
| visitor.Rational(this); | ||
| } | ||
|
|
||
| public double getNumerator() { | ||
| return numerator; | ||
| } | ||
|
|
||
| public double getDenominator() { | ||
| return denominator; | ||
| } | ||
| } |
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
30 changes: 0 additions & 30 deletions
30
core/src/main/java/org/jruby/truffle/nodes/debug/SafepointInstrument.java
This file was deleted.
Oops, something went wrong.
45 changes: 0 additions & 45 deletions
45
core/src/main/java/org/jruby/truffle/nodes/debug/SafepointProber.java
This file was deleted.
Oops, something went wrong.
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
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
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
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
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
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
2,133 changes: 0 additions & 2,133 deletions
2,133
jruby/core/src/main/java/org/jruby/java/addons/ClassJavaAddons.java
This file was deleted.
Oops, something went wrong.