X-Git-Url: http://andersk.mit.edu/gitweb/splint.git/blobdiff_plain/65f973be66947763bda2a1453692079800650d38..91b588dea2cd9d465b092f5a934ebf1638f79253:/src/constraintExprData.c

diff --git a/src/constraintExprData.c b/src/constraintExprData.c
index ab316a5..1ce4e37 100644
--- a/src/constraintExprData.c
+++ b/src/constraintExprData.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,16 +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
 */
 
 /*
 ** constraintExprData.c
 */
 
-# include "lclintMacros.nf"
+# include "splintMacros.nf"
 # include "basic.h"
 # include "cgrammar.h"
 # include "cgrammar_tokens.h"
@@ -134,55 +134,63 @@ constraintExprData constraintExprData_copyTerm (/*@observer@*/ constraintExprDat
   return ret;
 }
 
-constraintExprData constraintExprData_termSetTerm (/*@returned@*/  constraintExprData data,  /*@only@*/constraintTerm term)
+constraintExprData 
+constraintExprData_termSetTerm (/*@returned@*/ constraintExprData data,  
+				/*@only@*/ constraintTerm term)
 {
-  llassert (constraintExprData_isDefined(data));
+  llassert (constraintExprData_isDefined (data));
 
-  if (constraintTerm_isDefined(data->term) )
-    constraintTerm_free(data->term);
+  if (constraintTerm_isDefined (data->term))
+    {
+      constraintTerm_free (data->term);
+    }
 
   data->term = term;
   return data;
 }
 
-
-
-/*@observer@*/ constraintTerm constraintExprData_termGetTerm (/*@observer@*/ constraintExprData data)
+/*@exposed@*/ constraintTerm 
+constraintExprData_termGetTerm (/*@observer@*/ constraintExprData data)
 {
-  llassert (constraintExprData_isDefined(data));
-  /*@i22*/return data->term;
+  llassert (constraintExprData_isDefined (data));
+  return data->term;
 }
 
 
-constraintExprUnaryOpKind constraintExprData_unaryExprGetOp (/*@observer@*/ constraintExprData data)
+constraintExprUnaryOpKind 
+constraintExprData_unaryExprGetOp (/*@observer@*/ constraintExprData data)
 {
-  llassert (constraintExprData_isDefined(data));
+  llassert (constraintExprData_isDefined (data));
   return (data->unaryOp.unaryOp);
 }
 
 
-constraintExpr  constraintExprData_unaryExprGetExpr (/*@observer@*/ constraintExprData data)
+constraintExpr
+constraintExprData_unaryExprGetExpr (/*@observer@*/ constraintExprData data)
 {
   llassert (constraintExprData_isDefined (data));
   return (data->unaryOp.expr);
 }
 
-
-
-constraintExprData constraintExprData_unaryExprSetOp ( /*@returned@*/ constraintExprData data, constraintExprUnaryOpKind op)
+constraintExprData 
+constraintExprData_unaryExprSetOp (/*@returned@*/ constraintExprData data,
+				   constraintExprUnaryOpKind op)
 {
   llassert (constraintExprData_isDefined (data));
-  
   data->unaryOp.unaryOp = op;
   return data;
 }
 
-constraintExprData  constraintExprData_unaryExprSetExpr (constraintExprData data, /*@only@*/ constraintExpr expr)
+constraintExprData  
+constraintExprData_unaryExprSetExpr (constraintExprData data,
+				     /*@only@*/ constraintExpr expr)
 {
-  llassert (constraintExprData_isDefined(data));
-
-  if (constraintExpr_isDefined(data->unaryOp.expr) )
-    constraintExpr_free(data->unaryOp.expr);
+  llassert (constraintExprData_isDefined (data));
+  
+  if (constraintExpr_isDefined (data->unaryOp.expr))
+    {
+      constraintExpr_free (data->unaryOp.expr);
+    }
   
   data->unaryOp.expr = expr;
   return data;
@@ -192,55 +200,54 @@ constraintExprData  constraintExprData_unaryExprSetExpr (constraintExprData data
 ** binaryExpr stuff
 */
 
-constraintExprBinaryOpKind  constraintExprData_binaryExprGetOp (constraintExprData data)
+constraintExprBinaryOpKind constraintExprData_binaryExprGetOp (constraintExprData data)
 {
-  llassert (constraintExprData_isDefined(data));
-  
+  llassert (constraintExprData_isDefined (data));
   return (data->binaryOp.binaryOp);
 }
 
-
-constraintExpr  constraintExprData_binaryExprGetExpr1 (constraintExprData data)
+constraintExpr constraintExprData_binaryExprGetExpr1 (constraintExprData data)
 {
-  llassert (constraintExprData_isDefined(data));
-
-
+  llassert (constraintExprData_isDefined (data));
   return (data->binaryOp.expr1);
 }
 
-
-constraintExpr  constraintExprData_binaryExprGetExpr2 (constraintExprData data)
+constraintExpr constraintExprData_binaryExprGetExpr2 (constraintExprData data)
 {
   llassert (constraintExprData_isDefined(data));
-  /*@i22*/ return (data->binaryOp.expr2);
+  return (data->binaryOp.expr2);
 }
 
-
-constraintExprData  constraintExprData_binaryExprSetExpr1 (  /*@returned@*/ constraintExprData data, /*@only@*/ constraintExpr expr)
+constraintExprData 
+constraintExprData_binaryExprSetExpr1 (/*@returned@*/ constraintExprData data,
+				       /*@only@*/ constraintExpr expr)
 {
-  llassert (constraintExprData_isDefined(data));
+  llassert (constraintExprData_isDefined (data));
 
-  if (constraintExpr_isDefined(data->binaryOp.expr1) )
+  if (constraintExpr_isDefined (data->binaryOp.expr1))
     constraintExpr_free(data->binaryOp.expr1);
   
   data->binaryOp.expr1 = expr;
   return data;
 }
 
-constraintExprData  constraintExprData_binaryExprSetExpr2 (constraintExprData data, constraintExpr expr) 
+constraintExprData  
+constraintExprData_binaryExprSetExpr2 (constraintExprData data, constraintExpr expr) 
 {
-  llassert (constraintExprData_isDefined(data));
-  if (constraintExpr_isDefined(data->binaryOp.expr2) )
-    constraintExpr_free(data->binaryOp.expr2);
+  llassert (constraintExprData_isDefined (data));
 
+  if (constraintExpr_isDefined (data->binaryOp.expr2))
+    constraintExpr_free (data->binaryOp.expr2);
+  
   data->binaryOp.expr2 = expr;
   return data;
 }
 
-
-constraintExprData  constraintExprData_binaryExprSetOp (constraintExprData data, constraintExprBinaryOpKind op)
+constraintExprData  
+constraintExprData_binaryExprSetOp (constraintExprData data, 
+				    constraintExprBinaryOpKind op)
 {
-  llassert (constraintExprData_isDefined(data));
+  llassert (constraintExprData_isDefined (data));
   data->binaryOp.binaryOp = op;
   return data;
 }