*** empty log message ***

diff --git a/src/Headers/herald.last b/src/Headers/herald.last
index df1ba27ad25d8fd96e9c68071fb03ec5c5e8c71d..36662b4a90c029c6d7646809439b392389b3418f 100644 (file)
--- a/src/Headers/herald.last
+++ b/src/Headers/herald.last
@@ -1,7 +1,7 @@
 /* herald.h - created automatically by gmake updateversion */
 /*@constant observer char *LCL_VERSION;@*/
-# define LCL_VERSION "LCLint 3.0.0.8 --- 19 July 2001"
+# define LCL_VERSION "LCLint 3.0.0.9 --- 23 July 2001"
 /*@constant observer char *LCL_PARSE_VERSION;@*/
-# define LCL_PARSE_VERSION "LCLint 3.0.0.8"
+# define LCL_PARSE_VERSION "LCLint 3.0.0.9"
 /*@constant observer char *LCL_COMPILE;@*/
 # define LCL_COMPILE "Compiled using gcc -Wall -g on Linux paisley 2.4.3-12 #1 Fri Jun 8 13:35:30 EDT 2001 i686 unknown by evans"

diff --git a/src/clabstract.c b/src/clabstract.c
index fd2c8a7d9cf616d3c5acc70dcd747d1e4930dd89..1be63e86a6599c38d146d202c27b12e1f7cb2a4a 100644 (file)
--- a/src/clabstract.c
+++ b/src/clabstract.c
@@ -1236,6 +1236,7 @@ void checkConstant (qtype t, idDecl id)
   reflectStorageClass (e);
   resetStorageClass ();
 
+  DPRINTF (("Constant: %s", uentry_unparseFull (e)));
   usymtab_supGlobalEntry (e);
 }
 

diff --git a/src/uentry.c b/src/uentry.c
index 58c4827071529e7f811574f313bb711abc2f67c7..5f0f416e727def9bb4d12659f53c48c1ac945c37 100644 (file)
--- a/src/uentry.c
+++ b/src/uentry.c
@@ -9360,7 +9360,7 @@ uentry_checkDecl (void)
 void
 uentry_mergeDefinition (uentry old, /*@only@*/ uentry unew)
 {
-  fileloc olddef = uentry_whereDeclared (old);
+  fileloc olddef = uentry_whereDeclared (old); 
   fileloc unewdef = uentry_whereDeclared (unew);
   bool mustConform;
   bool wasForward;
@@ -9445,7 +9445,8 @@ uentry_mergeDefinition (uentry old, /*@only@*/ uentry unew)
     }
   else
     {
-      if (!uentry_isExtern (unew) && !uentry_isForward (old)
+      if (!uentry_isExtern (unew) 
+         && !uentry_isForward (old)
          && !fileloc_equal (olddef, unewdef)
          && !fileloc_isUndefined (olddef)
          && !fileloc_isUndefined (unewdef)
@@ -9515,7 +9516,7 @@ uentry_mergeDefinition (uentry old, /*@only@*/ uentry unew)
                }
              else
                {
-                 uentry_setDefined (old, unewdef);
+                 uentry_setDeclared (old, unewdef); /* evans 2001-07-23 was setDefined */
                }
            }
        }
@@ -9526,7 +9527,14 @@ uentry_mergeDefinition (uentry old, /*@only@*/ uentry unew)
            uentry_unparseFull (unew)));
 
   uentry_mergeConstraints (old, unew);
+  DPRINTF (("uentry merge: %s / %s",
+           uentry_unparseFull (old),
+           uentry_unparseFull (unew)));
+
   uentry_checkConformance (old, unew, mustConform, FALSE);
+  DPRINTF (("uentry merge: %s / %s",
+           uentry_unparseFull (old),
+           uentry_unparseFull (unew)));
 
   old->used = old->used || unew->used;
   old->uses = filelocList_append (old->uses, unew->uses);
@@ -9541,6 +9549,8 @@ uentry_mergeDefinition (uentry old, /*@only@*/ uentry unew)
                                          fileloc_undefined);
     }
 
+  DPRINTF (("here: %s", uentry_unparseFull (old)));
+
   /*
   ** No redeclaration errors for functions here, since we
   ** don't know if this is the definition of the function.
@@ -9632,6 +9642,7 @@ uentry_mergeDefinition (uentry old, /*@only@*/ uentry unew)
       uentry_checkName (old);
     }
 
+  DPRINTF (("After: %s", uentry_unparseFull (old)));
   llassert (!ctype_isUndefined (old->utype));
 }
 
@@ -9684,6 +9695,8 @@ static void uentry_updateInto (/*@unique@*/ uentry unew, uentry old)
   llassert (uentry_isValid (unew));
   llassert (uentry_isValid (old));
 
+  DPRINTF (("Update into: %s / %s", uentry_unparseFull (unew), uentry_unparseFull (old)));
+
   unew->ukind = old->ukind;
   llassert (cstring_equal (unew->uname, old->uname));
   unew->utype = old->utype;
@@ -9721,6 +9734,8 @@ static void uentry_updateInto (/*@unique@*/ uentry unew, uentry old)
       unew->whereDeclared = fileloc_copy (old->whereDeclared);
     }
 
+  DPRINTF (("Update into: %s / %s", uentry_unparseFull (unew), uentry_unparseFull (old)));
+
   unew->sref = sRef_saveCopy (old->sref); /* Memory leak! */
   unew->used = old->used;
   unew->lset = FALSE;