Merge branch 'master' into ruby-2.5

jruby · Feb 23, 2018 · 3a97ae7 · 3a97ae7
2 parents f9a47c6 + 7924a80
commit 3a97ae7
Showing 10 changed files with 23 additions and 19 deletions.
diff --git a/core/pom.rb b/core/pom.rb
@@ -52,7 +52,7 @@
   jar 'com.github.jnr:jffi:${jffi.version}'
   jar 'com.github.jnr:jffi:${jffi.version}:native'
 
-  jar 'org.jruby.joni:joni:2.1.14'
+  jar 'org.jruby.joni:joni:2.1.15'
   jar 'org.jruby.extras:bytelist:1.0.15'
   jar 'org.jruby.jcodings:jcodings:1.0.27'
   jar 'org.jruby:dirgra:0.3'

diff --git a/core/pom.xml b/core/pom.xml
@@ -173,7 +173,7 @@ DO NOT MODIFIY - GENERATED CODE
     <dependency>
       <groupId>org.jruby.joni</groupId>
       <artifactId>joni</artifactId>
-      <version>2.1.14</version>
+      <version>2.1.15</version>
     </dependency>
     <dependency>
       <groupId>org.jruby.extras</groupId>

diff --git a/core/src/main/java/org/jruby/RubyInteger.java b/core/src/main/java/org/jruby/RubyInteger.java
@@ -362,7 +362,7 @@ public RubyString chr(ThreadContext context) {
 
         Encoding enc;
 
-        if (0xff < i) {
+        if (i > 0xff) {
             enc = runtime.getDefaultInternalEncoding();
             if (enc == null) {
                 throw runtime.newRangeError(toString() + " out of char range");

diff --git a/core/src/main/java/org/jruby/RubyString.java b/core/src/main/java/org/jruby/RubyString.java
@@ -168,6 +168,7 @@ public Encoding getEncoding() {
 
     @Override
     public void setEncoding(Encoding encoding) {
+        modify();
         value.setEncoding(encoding);
     }
 
@@ -385,8 +386,8 @@ public RubyString(Ruby runtime, RubyClass rubyClass, ByteList value, Encoding en
 
     protected RubyString(Ruby runtime, RubyClass rubyClass, ByteList value, Encoding enc, int cr) {
         this(runtime, rubyClass, value);
-        value.setEncoding(enc);
         flags |= cr;
+        value.setEncoding(enc);
     }
 
     protected RubyString(Ruby runtime, RubyClass rubyClass, ByteList value, Encoding enc) {

diff --git a/core/src/main/java/org/jruby/lexer/LexingCommon.java b/core/src/main/java/org/jruby/lexer/LexingCommon.java
@@ -352,15 +352,12 @@ public int peekVariableName(int tSTRING_DVAR, int tSTRING_DBEG) throws IOExcepti
                 commandStart = true;
                 return tSTRING_DBEG;
             default:
-                // We did not find significant char after # so push it back to
-                // be processed as an ordinary string.
-                pushback(c);
                 return 0;
         }
 
-        pushback(c);
-
+        // We found #@, #$, #@@ but we don't know what at this point (check for valid chars).
         if (significant != -1 && Character.isAlphabetic(significant) || significant == '_') {
+            pushback(c);
             setValue("#" + significant);
             return tSTRING_DVAR;
         }

diff --git a/core/src/main/java/org/jruby/lexer/yacc/StringTerm.java b/core/src/main/java/org/jruby/lexer/yacc/StringTerm.java
@@ -87,6 +87,7 @@ private int endFound(RubyLexer lexer) throws IOException {
             }
 
             lexer.setValue("" + end);
+
             return RubyParser.tSTRING_END;
     }
 
@@ -118,14 +119,11 @@ public int parseString(RubyLexer lexer) throws IOException {
         if ((flags & STR_FUNC_EXPAND) != 0 && c == '#') {
             int token = lexer.peekVariableName(RubyParser.tSTRING_DVAR, RubyParser.tSTRING_DBEG);
 
-            if (token != 0) {
-                return token;
-            } else {
-                buffer.append(c);
-            }
-        } else {
-            lexer.pushback(c);
+            if (token != 0) return token;
+
+            buffer.append('#');  // not an expansion to variable so it is just a literal.
         }
+        lexer.pushback(c); // pushback API is deceptive here...we are just pushing index back one and not pushing c back necessarily.
 
         Encoding enc[] = new Encoding[1];
         enc[0] = lexer.getEncoding();

diff --git a/lib/pom.rb b/lib/pom.rb
@@ -27,7 +27,7 @@ def initialize( name, version, default_spec = true )
 default_gems =
   [
    ImportedGem.new( 'jruby-openssl', '0.9.21' ),
-   ImportedGem.new( 'jruby-readline', '1.2.1' ),
+   ImportedGem.new( 'jruby-readline', '1.2.2' ),
    ImportedGem.new( 'rake', '${rake.version}' ),
    ImportedGem.new( 'rdoc', '${rdoc.version}' ),
    ImportedGem.new( 'minitest', '${minitest.version}' ),

diff --git a/lib/pom.xml b/lib/pom.xml
@@ -47,7 +47,7 @@ DO NOT MODIFIY - GENERATED CODE
     <dependency>
       <groupId>rubygems</groupId>
       <artifactId>jruby-readline</artifactId>
-      <version>1.2.1</version>
+      <version>1.2.2</version>
       <type>gem</type>
       <scope>provided</scope>
       <exclusions>

diff --git a/lib/ruby/stdlib/date.rb b/lib/ruby/stdlib/date.rb
@@ -1948,5 +1948,4 @@ def to_datetime
 
   private_class_method :today
   public_class_method  :now
-
 end
diff --git a/spec/ruby/language/string_spec.rb b/spec/ruby/language/string_spec.rb
@@ -42,6 +42,15 @@
     "#@ip#@ip".should == 'xxxxxx'
   end
 
+  it "don't get confused by partial interpolation character sequences" do
+    "#@".should == '#@'
+    "#@ ".should == '#@ '
+    "#@@".should == '#@@'
+    "#@@ ".should == '#@@ '
+    "#$ ".should == '#$ '
+    "#\$".should == '#$'
+  end
+
   it "taints the result of interpolation when an interpolated value is tainted" do
     "#{"".taint}".tainted?.should be_true
Original file line number	Diff line number	Diff line change
		@@ -1948,5 +1948,4 @@ def to_datetime

		private_class_method :today
		public_class_method :now

		end