From 4fcdb57172562af4a07ac9593a54d3f326b3fce8 Mon Sep 17 00:00:00 2001
From: johanknol <johanknol@4a8a32a2-be11-0410-ad9d-d568d2c75423>
Date: Tue, 30 Oct 2001 14:13:23 +0000
Subject: [PATCH] a beauty patch from bug #476062

git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@1468 4a8a32a2-be11-0410-ad9d-d568d2c75423
---
 src/SDCCsymt.c         | 6 ++++++
 support/Util/SDCCerr.c | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/SDCCsymt.c b/src/SDCCsymt.c
index 3a461610..da4212bd 100644
--- a/src/SDCCsymt.c
+++ b/src/SDCCsymt.c
@@ -549,8 +549,14 @@ mergeSpec (sym_link * dest, sym_link * src, char *name)
   sym_link *symlink=dest;
 
   if (!IS_SPEC(dest) || !IS_SPEC(src)) {
+#if 0
     werror (E_INTERNAL_ERROR, __FILE__, __LINE__, "cannot merge declarator");
     exit (1);
+#else
+    werror (E_SYNTAX_ERROR, yytext);
+    // the show must go on
+    return newIntLink();
+#endif
   }
 
   if (SPEC_NOUN(src)) {
diff --git a/support/Util/SDCCerr.c b/support/Util/SDCCerr.c
index 8287a867..0b45800a 100644
--- a/support/Util/SDCCerr.c
+++ b/support/Util/SDCCerr.c
@@ -52,7 +52,7 @@ struct
 { E_DUPLICATE, ERROR_LEVEL_ERROR,
    "Duplicate symbol '%s', symbol IGNORED" },
 { E_SYNTAX_ERROR, ERROR_LEVEL_ERROR,
-   "Syntax Error Declaration ignored" },
+   "Syntax error, declaration ignored at '%s'" },
 { E_CONST_EXPECTED, ERROR_LEVEL_ERROR,
    "Constant Expected Found Variable" },
 { E_OUT_OF_MEM, ERROR_LEVEL_ERROR,
-- 
2.30.2