From 94ffa8407566de48f55036ce705924d7ee111d25 Mon Sep 17 00:00:00 2001
From: Hans Bolinder <hasse@erlang.org>
Date: Mon, 1 Nov 2010 14:29:21 +0100
Subject: Improve formating of Yecc error messages

The formating of Yecc's error messages has been improved.
(Thanks to Joe Armstrong.)
---
 lib/parsetools/include/yeccpre.hrl |  2 +-
 lib/parsetools/test/yecc_SUITE.erl | 12 ++++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

(limited to 'lib/parsetools')

diff --git a/lib/parsetools/include/yeccpre.hrl b/lib/parsetools/include/yeccpre.hrl
index 39dea0552d..80a3afbdb6 100644
--- a/lib/parsetools/include/yeccpre.hrl
+++ b/lib/parsetools/include/yeccpre.hrl
@@ -167,7 +167,7 @@ yecctoken2string({char,_,C}) -> io_lib:write_char(C);
 yecctoken2string({var,_,V}) -> io_lib:format("~s", [V]);
 yecctoken2string({string,_,S}) -> io_lib:write_unicode_string(S);
 yecctoken2string({reserved_symbol, _, A}) -> io_lib:write(A);
-yecctoken2string({_Cat, _, Val}) -> io_lib:write(Val);
+yecctoken2string({_Cat, _, Val}) -> io_lib:format("~p",[Val]);
 yecctoken2string({dot, _}) -> "'.'";
 yecctoken2string({'$end', _}) ->
     [];
diff --git a/lib/parsetools/test/yecc_SUITE.erl b/lib/parsetools/test/yecc_SUITE.erl
index 93949a074a..8153be7e61 100644
--- a/lib/parsetools/test/yecc_SUITE.erl
+++ b/lib/parsetools/test/yecc_SUITE.erl
@@ -46,7 +46,7 @@
          bugs/1, 
              otp_5369/1, otp_6362/1, otp_7945/1, otp_8483/1, otp_8486/1,
          improvements/1,
-             otp_7292/1, otp_7969/1]).
+             otp_7292/1, otp_7969/1, otp_8919/1]).
 
 % Default timetrap timeout (set in init_per_testcase).
 -define(default_timeout, ?t:minutes(1)).
@@ -1541,7 +1541,7 @@ otp_8486(Config) when is_list(Config) ->
     ok.
 
 improvements(suite) ->
-    [otp_7292, otp_7969].
+    [otp_7292, otp_7969, otp_8919].
 
 otp_7292(doc) ->
     "OTP-7292. Header declarations for edoc.";
@@ -1773,6 +1773,14 @@ otp_7969(Config) when is_list(Config) ->
     ?line {error,{{1,11},erl_parse,_}} = erl_parse:parse_and_scan({F6, []}),
     ok.
 
+otp_8919(doc) ->
+    "OTP-8919. Improve formating of Yecc error messages.";
+otp_8919(suite) -> [];
+otp_8919(Config) when is_list(Config) ->
+    {error,{1,Mod,Mess}} = erl_parse:parse([{cat,1,"hello"}]),
+    "syntax error before: \"hello\"" = lists:flatten(Mod:format_error(Mess)),
+    ok.
+
 yeccpre_size() ->
     yeccpre_size(default_yeccpre()).
 
-- 
cgit v1.2.3