Whoops violated shaky assumption between 1.8/1.9 behavior in dnodes

jruby · Oct 21, 2011 · 854daad · 854daad
1 parent e19e8f0
commit 854daad
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/org/jruby/parser/ParserSupport.java b/src/org/jruby/parser/ParserSupport.java
@@ -1625,7 +1625,7 @@ public Node newRegexpNode(ISourcePosition position, Node contents, RegexpNode en
                 if (fragment instanceof StrNode) {
                     ByteList frag = ((StrNode) fragment).getValue();
                     regexpFragmentCheck(end, frag);
-                    encoding = frag.getEncoding();
+                    if (!lexer.isOneEight()) encoding = frag.getEncoding();
                 }
             }
 
@@ -1635,7 +1635,7 @@ public Node newRegexpNode(ISourcePosition position, Node contents, RegexpNode en
         // EvStrNode: #{val}: no fragment check, but at least set encoding
         ByteList empty = ByteList.create("");
         regexpFragmentCheck(end, empty);
-        encoding = empty.getEncoding();
+        if (!lexer.isOneEight()) encoding = empty.getEncoding();
         return new DRegexpNode(position, options, encoding).add(contents);
     }