Lots of changes. Code is mostly annotated. Still lots of breaken stuff though.

[splint.git] / src / constraintExprData.c

diff --git a/src/constraintExprData.c b/src/constraintExprData.c
index cdcbb63cd929498d325ca4657663e5ed6f206b49..fcf748c7a2f30691bf29b8c40af66de18a4a7b98 100644 (file)
--- a/src/constraintExprData.c
+++ b/src/constraintExprData.c
@@ -12,6 +12,13 @@
 # include "exprNodeSList.h"
 
 
+void constraintExprData_freeBinaryExpr (/*@only@*/constraintExprData data)
+{
+  constraintExpr_free (data->binaryOp.expr1);
+  constraintExpr_free (data->binaryOp.expr2);
+  free(data);  
+}
+
 constraintExprData constraintExprData_copyBinaryExpr(constraintExprData data)
 {
  constraintExprData ret;
@@ -23,6 +30,12 @@ constraintExprData constraintExprData_copyBinaryExpr(constraintExprData data)
   return ret;
 }
 
+void constraintExprData_freeUnaryExpr (/*@only@*/constraintExprData data)
+{
+  constraintExpr_free (data->unaryOp.expr);
+  free(data);  
+}
+
 constraintExprData constraintExprData_copyUnaryExpr(constraintExprData data)
 {
  constraintExprData ret;
@@ -35,6 +48,13 @@ constraintExprData constraintExprData_copyUnaryExpr(constraintExprData data)
   return ret;
 }
 
+void constraintExprData_freeTerm (/*@only@*/constraintExprData data)
+{
+  constraintTerm_free (data->term);
+  free(data);  
+}
+
+
 constraintExprData constraintExprData_copyTerm (constraintExprData data)
 {
  constraintExprData ret;
@@ -67,18 +87,18 @@ constraintExprData constraintExprData_copyTerm (constraintExprData data)
 //   return ret;
 // }
 
-constraintExprData constraintExprData_termSetTerm (/*@reldef@*/ constraintExprData data, constraintTerm term)
+/*@reldef@*/ constraintExprData constraintExprData_termSetTerm (/*@reldef@*/ /*@returned@*/  constraintExprData data,  /*@only@*/constraintTerm term)
 {
   /*@-uniondef@*/
   llassert (constraintExprData_isDefined(data));
   /*@=uniondef@*/
-  data->term = constraintTerm_copy(term);
+  data->term = term;
   return data;
 }
 
 
 
-constraintTerm constraintExprData_termGetTerm (/*@observer@*/ constraintExprData data)
+/*@observer@*/ constraintTerm constraintExprData_termGetTerm (/*@observer@*/ constraintExprData data)
 {
   llassert (constraintExprData_isDefined(data));
   /*@i22*/return data->term;
@@ -110,10 +130,10 @@ constraintExpr  constraintExprData_unaryExprGetExpr (constraintExprData data)
   return data;
 }
 
-constraintExprData  constraintExprData_unaryExprSetExpr (constraintExprData data, constraintExpr expr)
+constraintExprData  constraintExprData_unaryExprSetExpr (constraintExprData data, /*@only@*/ constraintExpr expr)
 {
   llassert (constraintExprData_isDefined(data));
-  data->unaryOp.expr = constraintExpr_copy(expr);
+  data->unaryOp.expr = expr;
   return data;
 }
 
@@ -141,17 +161,17 @@ constraintExpr  constraintExprData_binaryExprGetExpr2 (constraintExprData data)
 }
 
 
- constraintExprData  constraintExprData_binaryExprSetExpr1 ( /*@reldef@*/ /*@returned@*/ constraintExprData data, constraintExpr expr)
+constraintExprData  constraintExprData_binaryExprSetExpr1 ( /*@reldef@*/ /*@returned@*/ constraintExprData data, /*@only@*/ constraintExpr expr)
 {
   llassert (constraintExprData_isDefined(data));
-  data->binaryOp.expr1 = constraintExpr_copy(expr);
+  data->binaryOp.expr1 = expr;
   return data;
 }
 
 constraintExprData  constraintExprData_binaryExprSetExpr2 (/*@returned@*/ /*@reldef@*/ constraintExprData data, constraintExpr expr) 
 {
   llassert (constraintExprData_isDefined(data));
-  data->binaryOp.expr2 = constraintExpr_copy(expr);
+  data->binaryOp.expr2 = expr;
   return data;
 }