Fixed some splintme errors from the previous code change.

[splint.git] / src / functionClause.c

diff --git a/src/functionClause.c b/src/functionClause.c
index 32a761caf9a5c7660ba3116164494a79bf9e519f..a127ed45f31c12965949e4b15bbe72eda64f5f2e 100644 (file)
--- a/src/functionClause.c
+++ b/src/functionClause.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,17 +17,16 @@
 ** 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
 */
 /*
 ** functionClause.c
 */
 
-# include "lclintMacros.nf"
+# include "splintMacros.nf"
 # include "basic.h"
-# include "mtincludes.h"
 
 static /*@only@*/ /*@notnull@*/ /*@special@*/ functionClause  /*@i32 need special? @*/
 functionClause_alloc (functionClauseKind kind) /*@defines result->kind@*/
@@ -53,37 +52,33 @@ extern functionClause functionClause_createModifies (modifiesClause node) /*@*/
 }
 
 extern functionClause functionClause_createState (stateClause node) /*@*/ 
-{ 
-  functionClause res = functionClause_alloc (FCK_STATE);
-  res->val.state = node;
-  return res;
+{
+  if (stateClause_hasEmptyReferences (node) &&
+      (!stateClause_isMetaState (node) ) )
+    {
+      DPRINTF((message("functionClause_createState:: Returning functionClause_undefined" ) ));
+      stateClause_free (node);
+      return functionClause_undefined;
+    }
+  else
+    {
+      functionClause res = functionClause_alloc (FCK_STATE);
+      res->val.state = node;
+      return res;
+    }
 }
 
-extern functionClause functionClause_createEnsures (constraintList node) /*@*/ 
+extern functionClause functionClause_createEnsures (functionConstraint node) /*@*/ 
 { 
   functionClause res = functionClause_alloc (FCK_ENSURES);
-  res->val.ensures = node;
+  res->val.constraint = node;
   return res;
 }
 
-extern functionClause functionClause_createRequires (constraintList node) /*@*/ 
+extern functionClause functionClause_createRequires (functionConstraint node) /*@*/ 
 { 
   functionClause res = functionClause_alloc (FCK_REQUIRES);
-  res->val.requires = node;
-  return res;
-}
-
-extern functionClause functionClause_createMetaEnsures (metaStateConstraint node) /*@*/ 
-{ 
-  functionClause res = functionClause_alloc (FCK_MTENSURES);
-  res->val.mtconstraint = node;
-  return res;
-}
-
-extern functionClause functionClause_createMetaRequires (metaStateConstraint node) /*@*/ 
-{ 
-  functionClause res = functionClause_alloc (FCK_MTREQUIRES);
-  res->val.mtconstraint = node;
+  res->val.constraint = node;
   return res;
 }
 
@@ -112,18 +107,14 @@ extern functionClause functionClause_createWarn (warnClause node) /*@*/
     case FCK_STATE:
       return stateClause_unparse (p->val.state);
     case FCK_ENSURES:
-      return message ("ensures %q", constraintList_unparse (p->val.ensures));
+      return message ("ensures %q", functionConstraint_unparse (p->val.constraint));
     case FCK_REQUIRES:
-      return message ("requires %q", constraintList_unparse (p->val.requires));
-    case FCK_MTENSURES:
-      return message ("ensures %q", metaStateConstraint_unparse (p->val.mtconstraint));
-    case FCK_MTREQUIRES:
-      return message ("requires %q", metaStateConstraint_unparse (p->val.mtconstraint));
+      return message ("requires %q", functionConstraint_unparse (p->val.constraint));
     case FCK_DEAD:
-      BADBRANCH;
+      return cstring_makeLiteral ("<dead clause>");
     }
 
-  BADBRANCH;
+  BADBRANCHRET (cstring_undefined);
 }
 
 extern bool functionClause_matchKind (functionClause p, functionClauseKind kind) /*@*/
@@ -158,62 +149,42 @@ extern stateClause functionClause_takeState (functionClause fc)
   return res;
 }
 
-extern constraintList functionClause_getEnsures (functionClause node)
+extern functionConstraint functionClause_getEnsures (functionClause node)
 {
   llassert (functionClause_isDefined (node));
   llassert (node->kind == FCK_ENSURES);
 
-  return node->val.ensures;
+  return node->val.constraint;
 }
 
-extern constraintList functionClause_takeEnsures (functionClause fc)
+extern functionConstraint functionClause_takeEnsures (functionClause fc)
 {
-  constraintList res;
+  functionConstraint res;
   llassert (functionClause_isDefined (fc));
   llassert (fc->kind == FCK_ENSURES);
 
-  res = fc->val.ensures;
-  fc->val.ensures = NULL;
+  res = fc->val.constraint;
+  fc->val.constraint = NULL;
   fc->kind = FCK_DEAD;
   return res;
 }
 
-extern constraintList functionClause_getRequires (functionClause node)
+extern functionConstraint functionClause_getRequires (functionClause node)
 {
   llassert (functionClause_isDefined (node));
   llassert (node->kind == FCK_REQUIRES);
 
-  return node->val.requires;
+  return node->val.constraint;
 }
 
-extern constraintList functionClause_takeRequires (functionClause fc)
+extern functionConstraint functionClause_takeRequires (functionClause fc)
 {
-  constraintList res;
+  functionConstraint res;
   llassert (functionClause_isDefined (fc));
   llassert (fc->kind == FCK_REQUIRES);
 
-  res = fc->val.requires;
-  fc->val.requires = NULL;
-  fc->kind = FCK_DEAD;
-  return res;
-}
-
-extern metaStateConstraint functionClause_getMetaConstraint (functionClause node)
-{
-  llassert (functionClause_isDefined (node));
-  llassert (node->kind == FCK_MTENSURES || node->kind == FCK_MTREQUIRES);
-
-  return node->val.mtconstraint;
-}
-
-extern metaStateConstraint functionClause_takeMetaConstraint (functionClause fc)
-{
-  metaStateConstraint res;
-  llassert (functionClause_isDefined (fc));
-  llassert (fc->kind == FCK_MTENSURES || fc->kind == FCK_MTREQUIRES);
-
-  res = fc->val.mtconstraint;
-  fc->val.mtconstraint = NULL;
+  res = fc->val.constraint;
+  fc->val.constraint = NULL;
   fc->kind = FCK_DEAD;
   return res;
 }
@@ -258,6 +229,8 @@ extern void functionClause_free (/*@only@*/ functionClause node)
 {
   if (node != NULL)
     {
+      DPRINTF (("free: %s", functionClause_unparse (node)));
+
       switch (node->kind)
        {
        case FCK_GLOBALS:
@@ -273,14 +246,10 @@ extern void functionClause_free (/*@only@*/ functionClause node)
          stateClause_free (node->val.state);
          break;
        case FCK_ENSURES:
-         constraintList_free (node->val.ensures);
+         functionConstraint_free (node->val.constraint);
          break;
        case FCK_REQUIRES:
-         constraintList_free (node->val.requires);
-         break;
-       case FCK_MTENSURES:
-       case FCK_MTREQUIRES:
-         metaStateConstraint_free (node->val.mtconstraint);
+         functionConstraint_free (node->val.constraint);
          break;
        case FCK_DEAD:
          /* Nothing to release */