@@ -2732,26 +2732,26 @@ private Node parseFileFromMainAndGetAST(InputStream in, String file, DynamicScop
2732
2732
private Node parseFileAndGetAST (InputStream in , String file , DynamicScope scope , int lineNumber , boolean isFromMain ) {
2733
2733
ParserConfiguration parserConfig =
2734
2734
new ParserConfiguration (this , lineNumber , false , true , config );
2735
- setupSourceEncoding (parserConfig );
2735
+ setupSourceEncoding (parserConfig , UTF8Encoding . INSTANCE );
2736
2736
return parser .parse (file , in , scope , parserConfig );
2737
2737
}
2738
2738
2739
2739
public Node parseInline (InputStream in , String file , DynamicScope scope ) {
2740
2740
addEvalParseToStats ();
2741
2741
ParserConfiguration parserConfig =
2742
2742
new ParserConfiguration (this , 0 , false , true , false , config );
2743
- setupSourceEncoding (parserConfig );
2743
+ setupSourceEncoding (parserConfig , getEncodingService (). getConsoleEncoding () );
2744
2744
return parser .parse (file , in , scope , parserConfig );
2745
2745
}
2746
2746
2747
- private void setupSourceEncoding (ParserConfiguration parserConfig ) {
2747
+ private void setupSourceEncoding (ParserConfiguration parserConfig , Encoding defaultEncoding ) {
2748
2748
if (config .getSourceEncoding () != null ) {
2749
2749
if (config .isVerbose ()) {
2750
2750
config .getError ().println ("-K is specified; it is for 1.8 compatibility and may cause odd behavior" );
2751
2751
}
2752
2752
parserConfig .setDefaultEncoding (getEncodingService ().getEncodingFromString (config .getSourceEncoding ()));
2753
2753
} else {
2754
- parserConfig .setDefaultEncoding (UTF8Encoding . INSTANCE );
2754
+ parserConfig .setDefaultEncoding (defaultEncoding );
2755
2755
}
2756
2756
}
2757
2757
0 commit comments