Merge branch 'jruby-1_6' of jruby.org:jruby into jruby-1_6

jruby · May 20, 2011 · f6bcb56 · f6bcb56
2 parents 4d4b853 + 4b41260
commit f6bcb56
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 10 deletions.
diff --git a/spec/tags/1.8/ruby/core/string/scan_tags.txt b/spec/tags/1.8/ruby/core/string/scan_tags.txt
diff --git a/spec/tags/1.9/ruby/core/string/gsub_tags.txt b/spec/tags/1.9/ruby/core/string/gsub_tags.txt
diff --git a/spec/tags/1.9/ruby/core/string/scan_tags.txt b/spec/tags/1.9/ruby/core/string/scan_tags.txt
diff --git a/spec/tags/1.9/ruby/core/string/split_tags.txt b/spec/tags/1.9/ruby/core/string/split_tags.txt
diff --git a/src/org/jruby/RubyKernel.java b/src/org/jruby/RubyKernel.java
@@ -1297,7 +1297,8 @@ public static IRubyObject warn(ThreadContext context, IRubyObject recv, IRubyObj
 
         if (runtime.warningsEnabled()) {
             IRubyObject out = runtime.getGlobalVariables().get("$stderr");
-            RuntimeHelpers.invoke(context, out, "puts", message);
+            RuntimeHelpers.invoke(context, out, "write", message);
+            RuntimeHelpers.invoke(context, out, "write", runtime.getGlobalVariables().getDefaultSeparator());
         }
         return runtime.getNil();
     }

diff --git a/src/org/jruby/RubyString.java b/src/org/jruby/RubyString.java
@@ -4632,7 +4632,12 @@ public IRubyObject scan(ThreadContext context, IRubyObject arg, Block block) {
             tuFlags = regex.flags;
         } else {
             pattern = getStringPattern(runtime, enc, arg);
-            tuFlags = 0;
+            if (arg.isTaint()) {
+              tuFlags = RubyBasicObject.TAINTED_F; 
+            }
+            else {
+              tuFlags = 0;
+            }
         }
 
         int begin = value.getBegin();
@@ -4749,7 +4754,7 @@ public IRubyObject scan19(ThreadContext context, IRubyObject arg, Block block) {
             prepared = regexp.preparePattern(this);
         } else {
             regexp = null;
-            tuFlags = 0;
+            tuFlags = arg.isTaint() ? RubyBasicObject.TAINTED_F : 0;
             pattern = getStringPattern19(runtime, arg);
             prepared = RubyRegexp.preparePattern(runtime, pattern, this);
         }