From caf14050d5fe108dc65e9c8d8df84633e84f79c8 Mon Sep 17 00:00:00 2001
From: varobert <varobert@fca1b0fc-160b-0410-b1d3-a4f43f01ea2e>
Date: Wed, 4 Apr 2012 11:59:39 +0000
Subject: Better error messages for data symbols

git-svn-id: https://yquem.inria.fr/compcert/svn/compcert/trunk@1869 fca1b0fc-160b-0410-b1d3-a4f43f01ea2e
---
 checklink/Check.ml | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

(limited to 'checklink/Check.ml')

diff --git a/checklink/Check.ml b/checklink/Check.ml
index dfefbfbe..33914f22 100644
--- a/checklink/Check.ml
+++ b/checklink/Check.ml
@@ -2612,22 +2612,19 @@ let check_data (pv: (ident * unit globvar) list) (sfw: s_framework)
     match successes with
     | [] ->
         sfw
-        >>> sf_ef ^%= add_log (ERROR(
+        >>> sf_ef ^%=
+        add_log (ERROR(
           "No matching data segment among candidates [" ^
             (string_of_list
                (fun ndx -> sfw.ef.elf.e_symtab.(ndx).st_name)
                ", "
                ident_ndxes
             ) ^
-            "]\nErrors:\n" ^
+            "], Errors: [" ^
             string_of_list
-            (fun x ->
-              match x with
-              | OK(_) -> ""
-              | ERR(s) -> s ^ "\n"
-            )
-            ""
-            results
+            (function OK(_) -> "" | ERR(s) -> s)
+            ", "
+            (List.filter (function ERR(_) -> true | _ -> false) results)
         ))
     | [sfw] -> sfw
     | fws ->
-- 
cgit