aboutsummaryrefslogtreecommitdiffstats
path: root/lib/parsetools/src/leex.erl
diff options
context:
space:
mode:
authorHans Bolinder <[email protected]>2016-09-29 08:29:11 +0200
committerHans Bolinder <[email protected]>2016-09-29 08:29:11 +0200
commit2b1d54c48ea4e72876e02b1380553105138c842c (patch)
treeb941c6e48de40333f8c221fd061c629bf07b203b /lib/parsetools/src/leex.erl
parentc0d124562fb4de88e823513df025647d0f6c41fd (diff)
parent8bde09c998c68265361155aa8ed188aa0e2a4a44 (diff)
downloadotp-2b1d54c48ea4e72876e02b1380553105138c842c.tar.gz
otp-2b1d54c48ea4e72876e02b1380553105138c842c.tar.bz2
otp-2b1d54c48ea4e72876e02b1380553105138c842c.zip
Merge branch 'maint'
* maint: parsetools: Correct handling of Unicode in Leex Don't report error for shutdown exit tuple
Diffstat (limited to 'lib/parsetools/src/leex.erl')
-rw-r--r--lib/parsetools/src/leex.erl4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/parsetools/src/leex.erl b/lib/parsetools/src/leex.erl
index 15d42a4d9c..602e47404d 100644
--- a/lib/parsetools/src/leex.erl
+++ b/lib/parsetools/src/leex.erl
@@ -1586,6 +1586,8 @@ out_dfa_graph(St, DFA, DF) ->
case file:open(St#leex.gfile, [write]) of
{ok,Gfile} ->
try
+ %% Set the same encoding as infile:
+ set_encoding(St, Gfile),
io:fwrite(Gfile, "digraph DFA {~n", []),
out_dfa_states(Gfile, DFA, DF),
out_dfa_edges(Gfile, DFA),
@@ -1621,7 +1623,7 @@ out_dfa_edges(File, DFA) ->
foreach(fun (T) ->
Crs = orddict:fetch(T, Tdict),
Edgelab = dfa_edgelabel(Crs),
- io:fwrite(File, " ~b -> ~b [label=\"~s\"];~n",
+ io:fwrite(File, " ~b -> ~b [label=\"~ts\"];~n",
[S,T,Edgelab])
end, sort(orddict:fetch_keys(Tdict)))
end, DFA).