diff options
| author | Hans Bolinder <[email protected]> | 2013-09-03 08:10:33 +0200 |
|---|---|---|
| committer | Hans Bolinder <[email protected]> | 2013-09-03 08:10:33 +0200 |
| commit | 1de23e3a31b77db4c9dca952644b764bd37e2e8f (patch) | |
| tree | 9eed394935b8c5172e8c1e1b20649e5a2ebb0d0e /lib/parsetools/src/leex.erl | |
| parent | 2f1007e60d1a0817e5d80e46c3ab21501d1f714b (diff) | |
| parent | 298ff42f5f80a603306a007540d1c75a013bcf81 (diff) | |
| download | otp-1de23e3a31b77db4c9dca952644b764bd37e2e8f.tar.gz otp-1de23e3a31b77db4c9dca952644b764bd37e2e8f.tar.bz2 otp-1de23e3a31b77db4c9dca952644b764bd37e2e8f.zip | |
Merge branch 'hb/parsetools/unicode_bugfix/OTP-11286' into maint
* hb/parsetools/unicode_bugfix/OTP-11286:
Fix a Unicode filename bug affecting Leex and Yecc
Diffstat (limited to 'lib/parsetools/src/leex.erl')
| -rw-r--r-- | lib/parsetools/src/leex.erl | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/lib/parsetools/src/leex.erl b/lib/parsetools/src/leex.erl index e531b78a5b..7039aea1ae 100644 --- a/lib/parsetools/src/leex.erl +++ b/lib/parsetools/src/leex.erl @@ -1645,10 +1645,14 @@ output_encoding_comment(File, #leex{encoding = Encoding}) -> output_file_directive(File, Filename, Line) -> io:fwrite(File, <<"-file(~ts, ~w).\n">>, - [format_filename(Filename), Line]). + [format_filename(Filename, File), Line]). -format_filename(Filename) -> - io_lib:write_string(filename:flatten(Filename)). +format_filename(Filename0, File) -> + Filename = filename:flatten(Filename0), + case lists:keyfind(encoding, 1, io:getopts(File)) of + {encoding, unicode} -> io_lib:write_string(Filename); + _ -> io_lib:write_string_as_latin1(Filename) + end. quote($^) -> "\\^"; quote($.) -> "\\."; |