* src/SDCCast.c (createIvalStruct): fixed bug 1466761

git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@5037 4a8a32a2-be11-0410-ad9d-d568d2c75423

diff --git a/ChangeLog b/ChangeLog
index fec45713ca072677644e0dd96074defe3d8d820c..1a673ab0ae1ef052ca7a91988591419ca55ca6d4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-02-22 Maarten Brock <sourceforge.brock AT dse.nl>
+
+       * src/SDCCast.c (createIvalStruct): fixed bug 1466761
+
 2008-02-21 Borut Razem <borut.razem AT siol.net>
 
        * support/regression/Makefile.in,

diff --git a/src/SDCCast.c b/src/SDCCast.c
index 702d6ec19582a493dbc4acbc28ed4f9cc874f4f8..fa33a799f7b93e287c1a908182b69952222ff75e 100644 (file)
--- a/src/SDCCast.c
+++ b/src/SDCCast.c
@@ -998,10 +998,14 @@ createIvalStruct (ast * sym, sym_link * type, initList * ilist, ast *rootValue)
 
     }
 
-  if (iloop) {
-    werrorfl (sym->opval.val->sym->fileDef, sym->opval.val->sym->lineDef,
-              W_EXCESS_INITIALIZERS, "struct",
-              sym->opval.val->sym->name);
+  if (iloop)
+    {
+      if (IS_AST_VALUE (sym))
+        werrorfl (sym->opval.val->sym->fileDef, sym->opval.val->sym->lineDef,
+                  W_EXCESS_INITIALIZERS, "struct",
+                  sym->opval.val->sym->name);
+      else
+        werrorfl (sym->filename, sym->lineno, E_INIT_COUNT);
   }
 
   return rast;