aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Yinhe <[email protected]>2015-01-15 11:17:14 +0100
committerBruce Yinhe <[email protected]>2015-01-15 11:17:14 +0100
commitbbea5be67137f5425ab08805b070e31a9df19605 (patch)
tree699f89471a855073b528505a3bb5a4950f2ca4e3
parentac2aa95d0f97e92cd7f587b21be5f9d27a360a00 (diff)
parent70f7c1745e8fb461566c57e77e4188052e84a18c (diff)
downloadotp-bbea5be67137f5425ab08805b070e31a9df19605.tar.gz
otp-bbea5be67137f5425ab08805b070e31a9df19605.tar.bz2
otp-bbea5be67137f5425ab08805b070e31a9df19605.zip
Merge branch 'richcarl/syntax_tools-fix-bad-error-format' into maint
OTP-12406 * richcarl/syntax_tools-fix-bad-error-format: fix bad format of error in epp_dodger:parse_file/3
-rw-r--r--lib/syntax_tools/src/epp_dodger.erl6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/syntax_tools/src/epp_dodger.erl b/lib/syntax_tools/src/epp_dodger.erl
index 7e12eab1b5..3ca7a8197e 100644
--- a/lib/syntax_tools/src/epp_dodger.erl
+++ b/lib/syntax_tools/src/epp_dodger.erl
@@ -88,7 +88,7 @@
%% This is a so-called Erlang I/O ErrorInfo structure; see the {@link
%% //stdlib/io} module for details.
--type errorinfo() :: term(). % {integer(), atom(), term()}.
+-type errorinfo() :: {integer(), atom(), term()}.
-type option() :: atom() | {atom(), term()}.
@@ -208,8 +208,8 @@ do_parse_file(DefEncoding, File, Parser, Options) ->
try Parser(Dev, 1, Options)
after ok = file:close(Dev)
end;
- {error, _} = Error ->
- Error
+ {error, Error} ->
+ {error, {0, file, Error}} % defer to file:format_error/1
end.
find_invalid_unicode([H|T]) ->