Skip to content

Commit 9f15d60

Browse files
committed
Fixed default encoding for inline scripts.
1 parent 15584ba commit 9f15d60

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

core/src/main/java/org/jruby/Ruby.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2732,26 +2732,26 @@ private Node parseFileFromMainAndGetAST(InputStream in, String file, DynamicScop
27322732
private Node parseFileAndGetAST(InputStream in, String file, DynamicScope scope, int lineNumber, boolean isFromMain) {
27332733
ParserConfiguration parserConfig =
27342734
new ParserConfiguration(this, lineNumber, false, true, config);
2735-
setupSourceEncoding(parserConfig);
2735+
setupSourceEncoding(parserConfig, UTF8Encoding.INSTANCE);
27362736
return parser.parse(file, in, scope, parserConfig);
27372737
}
27382738

27392739
public Node parseInline(InputStream in, String file, DynamicScope scope) {
27402740
addEvalParseToStats();
27412741
ParserConfiguration parserConfig =
27422742
new ParserConfiguration(this, 0, false, true, false, config);
2743-
setupSourceEncoding(parserConfig);
2743+
setupSourceEncoding(parserConfig, getEncodingService().getConsoleEncoding());
27442744
return parser.parse(file, in, scope, parserConfig);
27452745
}
27462746

2747-
private void setupSourceEncoding(ParserConfiguration parserConfig) {
2747+
private void setupSourceEncoding(ParserConfiguration parserConfig, Encoding defaultEncoding) {
27482748
if (config.getSourceEncoding() != null) {
27492749
if (config.isVerbose()) {
27502750
config.getError().println("-K is specified; it is for 1.8 compatibility and may cause odd behavior");
27512751
}
27522752
parserConfig.setDefaultEncoding(getEncodingService().getEncodingFromString(config.getSourceEncoding()));
27532753
} else {
2754-
parserConfig.setDefaultEncoding(UTF8Encoding.INSTANCE);
2754+
parserConfig.setDefaultEncoding(defaultEncoding);
27552755
}
27562756
}
27572757

0 commit comments

Comments
 (0)