Fixed all /*@i...@*/ tags (except 1).

[splint.git] / src / stateValue.c

diff --git a/src/stateValue.c b/src/stateValue.c
index eba7f26af8415d579618bd6ff2fa73240dca71a5..873ba4b4fc65edaf40a8bece9f2073789867bf13 100644 (file)
--- a/src/stateValue.c
+++ b/src/stateValue.c
@@ -1,6 +1,6 @@
 /*
-** LCLint - annotation-assisted static program checker
-** Copyright (C) 1994-2001 University of Virginia,
+** Splint - annotation-assisted static program checker
+** Copyright (C) 1994-2003 University of Virginia,
 **         Massachusetts Institute of Technology
 **
 ** This program is free software; you can redistribute it and/or modify it
@@ -17,24 +17,34 @@
 ** the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 ** MA 02111-1307, USA.
 **
-** For information on lclint: lclint-request@cs.virginia.edu
-** To report a bug: lclint-bug@cs.virginia.edu
-** For more information: http://lclint.cs.virginia.edu
+** For information on splint: info@splint.org
+** To report a bug: splint-bug@splint.org
+** For more information: http://www.splint.org
 */
 /*
 ** stateValue.c
 */
 
-# include "lclintMacros.nf"
-# include "llbasic.h"
+# include "splintMacros.nf"
+# include "basic.h"
 
 extern 
-stateValue stateValue_create (int value, stateInfo info) {
+/*@notnull@*/ stateValue stateValue_create (int value, stateInfo info) {
   stateValue sv = (stateValue) dmalloc (sizeof (*sv));
   
   sv->value = value;
   sv->info = info;
+  sv->implicit = FALSE;
+  return sv;
+}
+
+extern 
+/*@notnull@*/ stateValue stateValue_createImplicit (int value, stateInfo info) {
+  stateValue sv = (stateValue) dmalloc (sizeof (*sv));
   
+  sv->value = value;
+  sv->info = info;
+  sv->implicit = TRUE;
   return sv;
 }
 
@@ -42,6 +52,7 @@ stateValue stateValue_copy (stateValue s) {
   stateValue res;
   llassert (stateValue_isDefined (s));
   res = stateValue_create (s->value, stateInfo_copy (s->info));
+  res->implicit = s->implicit;
   return res;
 }
 
@@ -90,17 +101,17 @@ void stateValue_updateValueLoc (stateValue s, int value, fileloc loc)
            fileloc_unparse (loc)));
 
   s->value = value;
-  
-  if (fileloc_isDefined (loc)) {
-    s->info = stateInfo_updateLoc (s->info, loc);
-  }
+  s->info = stateInfo_updateLoc (s->info, SA_CHANGED, loc);
 }
                  
 void stateValue_update (stateValue res, stateValue val)
 {
   llassert (stateValue_isDefined (res));
+  llassert (stateValue_isDefined (val));
+
   res->value = val->value;
   res->info = stateInfo_update (res->info, val->info);
+
   DPRINTF (("update state: %s", stateValue_unparse (res)));
 }
                  
@@ -115,27 +126,46 @@ void stateValue_show (stateValue s, metaStateInfo msinfo)
          if (fileloc_isDefined (info->loc))
            {
              llgenindentmsg (message 
-                             ("State becomes %s",
-                              metaStateInfo_unparseValue (msinfo,
-                                                          stateValue_getValue (s))),
+                             ("State becomes %q",
+                              stateValue_unparseValue (s, msinfo)),
                              info->loc);
            }
        }
     }
 }
 
-/*@observer@*/ cstring stateValue_unparseValue (stateValue s, metaStateInfo msinfo)
+/*@only@*/ cstring stateValue_unparseValue (stateValue s, metaStateInfo msinfo)
 {
-  return metaStateInfo_unparseValue (msinfo,
-                                    stateValue_getValue (s));
+  if (stateValue_isImplicit (s))
+    {
+      return message ("implicitly %s",
+                     metaStateInfo_unparseValue (msinfo,
+                                                 stateValue_getValue (s)));
+    }
+  else
+    {
+      return cstring_copy (metaStateInfo_unparseValue (msinfo,
+                                                      stateValue_getValue (s)));
+    }
 }
 
 int stateValue_getValue (stateValue s)
 {
-  llassert (stateValue_isDefined (s));
+  if (!stateValue_isDefined (s))
+    {
+      llassert (stateValue_isDefined (s));
+      return stateValue_error;
+    }
+
   return s->value;
 }
 
+bool stateValue_isImplicit (stateValue s)
+{
+  llassert (stateValue_isDefined (s));
+  return s->implicit;
+}
+
 stateInfo stateValue_getInfo (stateValue s)
 {
   llassert (stateValue_isDefined (s));