Skip to content
Permalink
Browse files
Merge branch 'master' into truffle-head
  • Loading branch information
chrisseaton committed Jan 30, 2015
2 parents ec5b7a3 + 0a6a2b9 commit 6ee6976f32f972ec2345b82ce106f560b774ace8
Showing with 758 additions and 149 deletions.
  1. +1 −1 bin/ast
  2. 0 bin/jruby.bat
  3. BIN bin/jruby.dll
  4. BIN bin/jruby.exe
  5. 0 bin/jrubyd.bat
  6. BIN bin/jrubyw.exe
  7. +1 −1 core/pom.xml
  8. +4 −3 core/src/main/java/org/jruby/RubyRegexp.java
  9. +1 −0 core/src/main/java/org/jruby/ir/IRScope.java
  10. +3 −1 core/src/main/java/org/jruby/lexer/yacc/RubyLexer.java
  11. +2 −0 core/src/main/java/org/jruby/util/cli/Options.java
  12. +1 −0 core/src/main/ruby/jruby/truffle/core.rb
  13. +6 −0 core/src/main/ruby/jruby/truffle/core/rubinius/api/shims/rubinius.rb
  14. +593 −0 core/src/main/ruby/jruby/truffle/core/rubinius/kernel/common/enumerator.rb
  15. +0 −5 lib/pom.xml
  16. +1 −1 maven/jruby-dist/pom.xml
  17. +1 −6 maven/jruby-jars/pom.xml
  18. 0 spec/mspec/bin/mkspec.bat
  19. 0 spec/mspec/bin/mspec-ci.bat
  20. 0 spec/mspec/bin/mspec-run.bat
  21. 0 spec/mspec/bin/mspec-tag.bat
  22. 0 spec/mspec/bin/mspec.bat
  23. +2 −0 spec/truffle/spec-wrapper
  24. +3 −1 spec/truffle/spec-wrapper.bat
  25. +0 −12 spec/truffle/tags/core/enumerator/each_tags.txt
  26. +0 −5 spec/truffle/tags/core/enumerator/each_with_index_tags.txt
  27. +0 −4 spec/truffle/tags/core/enumerator/each_with_object_tags.txt
  28. +0 −3 spec/truffle/tags/core/enumerator/enum_for_tags.txt
  29. +0 −1 spec/truffle/tags/core/enumerator/enumerator_tags.txt
  30. +0 −1 spec/truffle/tags/core/enumerator/feed_tags.txt
  31. +0 −5 spec/truffle/tags/core/enumerator/generator/each_tags.txt
  32. +0 −2 spec/truffle/tags/core/enumerator/generator/initialize_tags.txt
  33. +0 −9 spec/truffle/tags/core/enumerator/initialize_tags.txt
  34. +0 −12 spec/truffle/tags/core/enumerator/inject_tags.txt
  35. +0 −1 spec/truffle/tags/core/enumerator/inspect_tags.txt
  36. +0 −2 spec/truffle/tags/core/enumerator/lazy/initialize_tags.txt
  37. +0 −1 spec/truffle/tags/core/enumerator/lazy/lazy_tags.txt
  38. +0 −6 spec/truffle/tags/core/enumerator/new_tags.txt
  39. +0 −3 spec/truffle/tags/core/enumerator/rewind_tags.txt
  40. +0 −3 spec/truffle/tags/core/enumerator/size_tags.txt
  41. +0 −3 spec/truffle/tags/core/enumerator/to_enum_tags.txt
  42. +0 −13 spec/truffle/tags/core/enumerator/with_index_tags.txt
  43. +0 −4 spec/truffle/tags/core/enumerator/with_object_tags.txt
  44. +0 −3 spec/truffle/tags/core/enumerator/yielder/append_tags.txt
  45. +0 −2 spec/truffle/tags/core/enumerator/yielder/initialize_tags.txt
  46. +0 −2 spec/truffle/tags/core/enumerator/yielder/yield_tags.txt
  47. +1 −0 spec/truffle/tags/core/struct/to_s_tags.txt
  48. +1 −0 spec/truffle/tags/core/time/wday_tags.txt
  49. +3 −0 spec/truffle/tags/language/break_tags.txt
  50. +2 −0 spec/truffle/tags/language/file_tags.txt
  51. +5 −0 spec/truffle/tags/language/predefined/data_tags.txt
  52. +5 −0 spec/truffle/tags/language/predefined_tags.txt
  53. +25 −1 spec/truffle/truffle.mspec
  54. +12 −0 test/pom.rb
  55. +4 −7 test/pom.xml
  56. +1 −1 truffle/pom.xml
  57. +20 −15 truffle/src/main/java/org/jruby/truffle/nodes/core/ArrayNodes.java
  58. +20 −0 truffle/src/main/java/org/jruby/truffle/nodes/core/FileNodes.java
  59. +2 −2 truffle/src/main/java/org/jruby/truffle/nodes/core/HashNodes.java
  60. +9 −0 truffle/src/main/java/org/jruby/truffle/nodes/core/IONodes.java
  61. +8 −0 truffle/src/main/java/org/jruby/truffle/nodes/core/KernelNodes.java
  62. +14 −1 truffle/src/main/java/org/jruby/truffle/nodes/core/ModuleNodes.java
  63. +3 −3 truffle/src/main/java/org/jruby/truffle/nodes/core/RangeNodes.java
  64. +4 −1 truffle/src/main/java/org/jruby/truffle/nodes/core/RegexpNodes.java
  65. +0 −2 truffle/src/main/java/org/jruby/truffle/runtime/subsystems/ObjectSpaceManager.java
@@ -193,7 +193,7 @@ def ir_setup(root)

builder = org.jruby.ir.IRBuilder

scope = builder.new(manager).build_root(root)
scope = builder.build_root(manager, root)
passes = manager.get_compiler_passes(scope)
[scope, passes]
end
0 bin/jruby.bat 100644 → 100755
Empty file.
0 bin/jruby.dll 100644 → 100755
Empty file.
0 bin/jruby.exe 100644 → 100755
Empty file.
0 bin/jrubyd.bat 100644 → 100755
Empty file.
0 bin/jrubyw.exe 100644 → 100755
Empty file.
@@ -532,7 +532,7 @@
<artifactId>maven-shade-plugin</artifactId>
<executions>
<execution>
<id>pack lib/jruby.jar</id>
<id>create lib/jruby.jar</id>
<phase>package</phase>
<goals>
<goal>shade</goal>
@@ -71,6 +71,7 @@
import org.jruby.util.Sprintf;
import org.jruby.util.StringSupport;
import org.jruby.util.TypeConverter;
import org.jruby.util.cli.Options;
import org.jruby.util.io.EncodingUtils;
import org.jruby.util.collections.WeakValuedMap;

@@ -1248,7 +1249,7 @@ public IRubyObject initialize_m19(IRubyObject arg) {

@JRubyMethod(name = "initialize", visibility = Visibility.PRIVATE)
public IRubyObject initialize_m19(IRubyObject arg0, IRubyObject arg1) {
if (arg0 instanceof RubyRegexp) {
if (arg0 instanceof RubyRegexp && Options.PARSER_WARN_FLAGS_IGNORED.load()) {
getRuntime().getWarnings().warn(ID.REGEXP_IGNORED_FLAGS, "flags ignored");
return initializeByRegexp19((RubyRegexp)arg0);
}
@@ -1259,8 +1260,8 @@ public IRubyObject initialize_m19(IRubyObject arg0, IRubyObject arg1) {

@JRubyMethod(name = "initialize", visibility = Visibility.PRIVATE)
public IRubyObject initialize_m19(IRubyObject arg0, IRubyObject arg1, IRubyObject arg2) {
if (arg0 instanceof RubyRegexp) {
getRuntime().getWarnings().warn(ID.REGEXP_IGNORED_FLAGS, "flags ignored");
if (arg0 instanceof RubyRegexp && Options.PARSER_WARN_FLAGS_IGNORED.load()) {
getRuntime().getWarnings().warn(ID.REGEXP_IGNORED_FLAGS, "flags ignored");
return initializeByRegexp19((RubyRegexp)arg0);
}

@@ -239,6 +239,7 @@ public boolean equals(Object other) {
}

protected void addChildScope(IRScope scope) {
if (lexicalChildren == null) lexicalChildren = new ArrayList<>();
lexicalChildren.add(scope);
}

@@ -819,7 +819,9 @@ private int hereDocumentIdentifier() throws IOException {
}

private void arg_ambiguous() {
if (warnings.isVerbose()) warnings.warning(ID.AMBIGUOUS_ARGUMENT, getPosition(), "Ambiguous first argument; make sure.");
if (warnings.isVerbose() && Options.PARSER_WARN_AMBIGUOUS_ARGUMENTS.load()) {
warnings.warning(ID.AMBIGUOUS_ARGUMENT, getPosition(), "Ambiguous first argument; make sure.");
}
}


@@ -65,6 +65,8 @@ public class Options {
public static final Option<Boolean> PARSER_WARN_LOCAL_SHADOWING = bool(PARSER, "parser.warn.shadowing_local", true, "Warn about shadowing local variables.");
public static final Option<Boolean> PARSER_WARN_REGEX_CONDITION = bool(PARSER, "parser.warn.regex_condition", true, "Warn about regex literals in conditions.");
public static final Option<Boolean> PARSER_WARN_ARGUMENT_PREFIX = bool(PARSER, "parser.warn.argument_prefix", true, "Warn about splat operators being interpreted as argument prefixes.");
public static final Option<Boolean> PARSER_WARN_AMBIGUOUS_ARGUMENTS = bool(PARSER, "parser.warn.ambiguous_argument", true, "Warn about ambiguous arguments.");
public static final Option<Boolean> PARSER_WARN_FLAGS_IGNORED = bool(PARSER, "parser.warn.flags_ignored", true, "Warn about ignored regex flags being ignored.");

public static final Option<CompileMode> COMPILE_MODE = enumeration(COMPILER, "compile.mode", CompileMode.class, CompileMode.JIT, "Set compilation mode. JIT = at runtime; FORCE = before execution.");
public static final Option<Boolean> COMPILE_DUMP = bool(COMPILER, "compile.dump", false, "Dump to console all bytecode generated at runtime.");
@@ -32,6 +32,7 @@
require_relative 'core/rubinius/kernel/bootstrap/type'

# Load common (ordered according to Rubinius' load_order.txt)
require_relative 'core/rubinius/kernel/common/enumerator'
require_relative 'core/rubinius/kernel/common/enumerable'
require_relative 'core/rubinius/kernel/common/undefined'
require_relative 'core/rubinius/kernel/common/type'
@@ -12,6 +12,12 @@ def self.mathn_loaded?
false
end

module Fiber

ENABLED = true

end

end

class PrimitiveFailure < StandardError

0 comments on commit 6ee6976

Please sign in to comment.