]> andersk Git - splint.git/blobdiff - src/constraintGeneration.c
Fixed bugs in the constant removal code for binary expressions.
[splint.git] / src / constraintGeneration.c
index 389f1ff631ad336454fe86e0871e924f6050c829..19d3d138f93e457f43c0cd826c456724ff3ec7e1 100644 (file)
@@ -8,40 +8,35 @@
 # include <ctype.h> /* for isdigit */
 # include "lclintMacros.nf"
 # include "basic.h"
-# include "cgrammar.h"
+
 # include "cgrammar_tokens.h"
 
 # include "exprChecks.h"
-# include "aliasChecks.h"
 # include "exprNodeSList.h"
 
-# include "exprData.i"
-# include "exprDataQuite.i"
+//# include "exprDataQuite.i"
+
+/*@access exprNode @*/
 
-extern void forLoopHeuristics( exprNode e, exprNode forPred, exprNode forBody);
 
-bool /*@alt void@*/ exprNode_generateConstraints (/*@temp@*/ exprNode e);
-static bool exprNode_handleError( exprNode p_e);
+static bool exprNode_handleError(/*@dependent@*/ exprNode p_e);
 
 //static cstring exprNode_findConstraints ( exprNode p_e);
-static bool exprNode_isMultiStatement(exprNode p_e);
-static bool exprNode_multiStatement (exprNode p_e);
-bool exprNode_exprTraverse (exprNode e, bool definatelv, bool definaterv,  fileloc sequencePoint);
+static bool exprNode_isMultiStatement(/*@dependent@*/ exprNode p_e);
+static void  exprNode_multiStatement (/*@dependent@*/ exprNode p_e);
+
 //static void exprNode_constraintPropagateUp (exprNode p_e);
-constraintList exprNode_traversRequiresConstraints (exprNode e);
-constraintList exprNode_traversEnsuresConstraints (exprNode e);
 
-constraintList exprNode_traversTrueEnsuresConstraints (exprNode e);
-constraintList exprNode_traversFalseEnsuresConstraints (exprNode e);
+static constraintList exprNode_traversTrueEnsuresConstraints (/*@dependent@*/ exprNode p_e);
+static constraintList exprNode_traversFalseEnsuresConstraints (/*@dependent@*/ exprNode p_e);
 
-extern constraintList reflectChanges (constraintList pre2, constraintList post1);
+static exprNode makeDataTypeConstraints (/*@returned@*/ exprNode p_e);
 
-void mergeResolve (exprNode parent, exprNode child1, exprNode child2);
-exprNode makeDataTypeConstraints (exprNode e);
-constraintList constraintList_makeFixedArrayConstraints (sRefSet s);
-constraintList checkCall (exprNode fcn, exprNodeList arglist);
+static void checkArgumentList (/*@out@*/ exprNode p_temp, exprNodeList p_arglist, fileloc p_sequencePoint) /*@modifies p_temp @*/;
 
-void checkArgumentList (exprNode temp, exprNodeList arglist, fileloc sequencePoint);
+static  constraintList checkCall (/*@dependent@*/ exprNode p_fcn, exprNodeList p_arglist);
+
+//constraintList constraintList_makeFixedArrayConstraints (sRefSet s);
 
 //bool exprNode_testd()
 //{
@@ -54,7 +49,7 @@ void checkArgumentList (exprNode temp, exprNodeList arglist, fileloc sequencePoi
   */
 //}
 
-bool exprNode_isUnhandled (exprNode e)
+static bool exprNode_isUnhandled (/*@dependent@*/ /*@obsever@*/ exprNode e)
 {
   llassert( exprNode_isDefined(e) );
   switch (e->kind)
@@ -71,7 +66,6 @@ bool exprNode_isUnhandled (exprNode e)
     case XPR_VAARG:
     case XPR_ITERCALL:
     case XPR_ITER:
-    case XPR_CAST:
     case XPR_GOTO:
     case XPR_CONTINUE:
     case XPR_BREAK:
@@ -80,7 +74,7 @@ bool exprNode_isUnhandled (exprNode e)
     case XPR_TOK:
     case XPR_FTDEFAULT:
     case XPR_DEFAULT:
-    case XPR_SWITCH:
+      //    case XPR_SWITCH:
     case XPR_FTCASE:
     case XPR_CASE:
       //    case XPR_INIT:
@@ -113,15 +107,10 @@ bool exprNode_handleError( exprNode e)
    return FALSE;
 }
 
-bool /*@alt void@*/ exprNode_generateConstraints (/*@temp@*/ exprNode e)
+bool /*@alt void@*/ exprNode_generateConstraints (/*@dependent@*/ exprNode e)
 {
   if (exprNode_isError (e) )
     return FALSE;
-  
-  e->requiresConstraints = constraintList_makeNew();
-  e->ensuresConstraints = constraintList_makeNew();
-  e->trueEnsuresConstraints = constraintList_makeNew();
-  e->falseEnsuresConstraints = constraintList_makeNew();
 
   if (exprNode_isUnhandled (e) )
     {
@@ -146,7 +135,7 @@ bool /*@alt void@*/ exprNode_generateConstraints (/*@temp@*/ exprNode e)
       loc = exprNode_getNextSequencePoint(e); 
       exprNode_exprTraverse(e, FALSE, FALSE, loc);
       
-      //    llassert(FALSE);
+      fileloc_free(loc);
       return FALSE;
     }
   
@@ -154,14 +143,14 @@ bool /*@alt void@*/ exprNode_generateConstraints (/*@temp@*/ exprNode e)
     constraintList c;
 
     c = constraintList_makeFixedArrayConstraints (e->uses);
-  e->requiresConstraints = reflectChanges (e->requiresConstraints, c);
+    e->requiresConstraints = constraintList_reflectChangesFreePre (e->requiresConstraints, c);
   
   //  e->ensuresConstraints = constraintList_mergeEnsures(c, e->ensuresConstraints);
   
+    constraintList_free(c);
   }    
 
-  /*  printf ("%s", (message ("%s", constraintList_printDetailed (e->requiresConstraints) ) ) );
-      printf ("%s", (message ("%s", constraintList_printDetailed (e->ensuresConstraints) ) ) ); */
+  DPRINTF ( (message ("e->requiresConstraints %s", constraintList_printDetailed (e->requiresConstraints) ) ) );
   return FALSE;
 }
 
@@ -185,6 +174,7 @@ if (exprNode_handleError (e) != NULL)
     case XPR_BLOCK:
     case XPR_STMT:
     case XPR_STMTLIST:
+    case XPR_SWITCH:
       return TRUE;
     default:
       return FALSE;
@@ -192,19 +182,18 @@ if (exprNode_handleError (e) != NULL)
 
 }
 
-bool exprNode_stmt (exprNode e)
+static void exprNode_stmt ( /*@dependent@*/ exprNode e)
 {
   exprNode snode;
   fileloc loc;
-  bool notError;
-  char * s;
+  cstring s;
   
   if (exprNode_isError(e) )
     {
-      return FALSE;
+      return; // FALSE;
     }
-  e->requiresConstraints = constraintList_makeNew();
-  e->ensuresConstraints  = constraintList_makeNew();
+  /*e->requiresConstraints = constraintList_makeNew();
+    e->ensuresConstraints  = constraintList_makeNew(); */
   //  e = makeDataTypeConstraints(e);
   
  
@@ -214,13 +203,21 @@ bool exprNode_stmt (exprNode e)
   
   if (e->kind == XPR_INIT)
     {
+      constraintList tempList;
       DPRINTF (("Init") );
       DPRINTF ( (message ("%s ", exprNode_unparse (e)) ) );
       loc = exprNode_getNextSequencePoint(e); /* reduces to an expression */
-      notError = exprNode_exprTraverse (e, FALSE, FALSE, loc);
+      exprNode_exprTraverse (e, FALSE, FALSE, loc);
+      fileloc_free(loc);
+
+      tempList = e->requiresConstraints;
       e->requiresConstraints = exprNode_traversRequiresConstraints(e);
+      constraintList_free(tempList);
+
+      tempList = e->ensuresConstraints;
       e->ensuresConstraints  = exprNode_traversEnsuresConstraints(e);
-      return notError;
+      constraintList_free(tempList);
+      return; // notError;
     }
   
   if (e->kind != XPR_STMT)
@@ -232,8 +229,8 @@ bool exprNode_stmt (exprNode e)
        {
          return exprNode_multiStatement (e );
        }
-      BPRINTF( (message ("Ignoring non-statement %s", exprNode_unparse(e) ) ) );
-      return TRUE;
+      DPRINTF( (message ("Ignoring non-statement %s", exprNode_unparse(e) ) ) );
+      return; //TRUE;
       //      llassert(FALSE);
     }
  
@@ -248,43 +245,56 @@ bool exprNode_stmt (exprNode e)
   
   if (exprNode_isMultiStatement (snode))
     {
-      bool temp;
-      
-      temp = exprNode_multiStatement (snode);
-      exprNode_copyConstraints (e, snode);
-      return temp;
+       exprNode_multiStatement (snode);
+      (void) exprNode_copyConstraints (e, snode);
+      return;
     }
   
   loc = exprNode_getNextSequencePoint(e); /* reduces to an expression */
-  notError = exprNode_exprTraverse (snode, FALSE, FALSE, loc);
+  //notError = 
+  exprNode_exprTraverse (snode, FALSE, FALSE, loc);
+
+  fileloc_free(loc);
+
+  constraintList_free (e->requiresConstraints);
   e->requiresConstraints = exprNode_traversRequiresConstraints(snode);
   //  printf ("For: %s \n", exprNode_unparse (e) );
   // printf ("%s\n", constraintList_print(e->requiresConstraints) );
+
+  constraintList_free (e->ensuresConstraints);
   e->ensuresConstraints  = exprNode_traversEnsuresConstraints(snode);
   // printf ("Ensures that:\n %s\n", constraintList_print(e->ensuresConstraints) );
   //  llassert(notError);
-  return notError;
+
+  DPRINTF ( (message ("smtlist constraints are: pre: %s \n and \t post %s\n",
+                     constraintList_print(e->requiresConstraints),
+                     constraintList_print(e->ensuresConstraints) ) ) );
+
+  return; // notError;
   
 }
 
 
-bool exprNode_stmtList  (exprNode e)
+static void exprNode_stmtList  (/*@dependent@*/ exprNode e)
 {
   exprNode stmt1, stmt2;
   if (exprNode_isError (e) )
     {
-      return FALSE;
+      return; // FALSE;
     }
 
-  e->requiresConstraints = constraintList_makeNew();
-  e->ensuresConstraints  = constraintList_makeNew();
+  /*
+    e->requiresConstraints = constraintList_makeNew();
+    e->ensuresConstraints  = constraintList_makeNew();
+  */
   //  e = makeDataTypeConstraints(e);
   
   /*Handle case of stmtList with only one statement:
    The parse tree stores this as stmt instead of stmtList*/
   if (e->kind != XPR_STMTLIST)
     {
-      return exprNode_stmt(e);
+      exprNode_stmt(e);
+      return;
     }
   llassert (e->kind == XPR_STMTLIST);
   DPRINTF(( "STMTLIST:") );
@@ -300,51 +310,82 @@ bool exprNode_stmtList  (exprNode e)
   DPRINTF(("\nstmt after stmtList call " ));
 
   exprNode_stmt (stmt2);
-  mergeResolve (e, stmt1, stmt2 );
+  exprNode_mergeResolve (e, stmt1, stmt2 );
   
   DPRINTF ( (message ("smtlist constraints are: pre: %s \n and \t post %s\n",
                      constraintList_print(e->requiresConstraints),
                      constraintList_print(e->ensuresConstraints) ) ) );
-  return TRUE;
+  return; // TRUE;
 }
 
-fileloc testKill (exprNode e)
+static exprNode doIf (/*@returned@*/  exprNode e, /*@dependent@*/ exprNode test, /*@dependent@*/ exprNode body)
 {
-  llassert (exprNode_isDefined(e) );
-  return e->loc;
-}
+  constraintList temp;
 
-exprNode doIf (exprNode e, exprNode test, exprNode body)
-{
   DPRINTF ((message ("doIf: %s ", exprNode_unparse(e) ) ) );
 
   llassert(exprNode_isDefined(test) );
-  llassert(e);
-  llassert(body);
+  llassert (exprNode_isDefined (e) );
+  llassert (exprNode_isDefined (body) );
+
   
+      DPRINTF((message ("ensures constraints for %s are %s", exprNode_unparse(e), constraintList_printDetailed(e->ensuresConstraints) ) ));
+
+      DPRINTF((message ("Requires constraints for %s are %s", exprNode_unparse(e), constraintList_printDetailed(e->ensuresConstraints) ) ));
+      
+      DPRINTF((message ("trueEnsures constraints for %s are %s", exprNode_unparse(e), constraintList_printDetailed(e->trueEnsuresConstraints) ) ));
+
+      DPRINTF((message ("falseEnsures constraints for %s are %s", exprNode_unparse(e), constraintList_printDetailed(e->falseEnsuresConstraints) ) ));
+
+
+
+      DPRINTF((message ("ensures constraints for %s are %s", exprNode_unparse(test), constraintList_printDetailed(test->ensuresConstraints) ) ));
+
+      DPRINTF((message ("Requires constraints for %s are %s", exprNode_unparse(test), constraintList_printDetailed(test->ensuresConstraints) ) ));
+      
+      DPRINTF((message ("trueEnsures constraints for %s are %s", exprNode_unparse(test), constraintList_printDetailed(test->trueEnsuresConstraints) ) ));
+
+      DPRINTF((message ("falseEnsures constraints for %s are %s", exprNode_unparse(test), constraintList_printDetailed(test->falseEnsuresConstraints) ) ));
+
+
+
+      temp = test->trueEnsuresConstraints;
+      test->trueEnsuresConstraints =  exprNode_traversTrueEnsuresConstraints(test);
+      constraintList_free(temp);
+
+  temp = test->ensuresConstraints;
   test->ensuresConstraints = exprNode_traversEnsuresConstraints (test);
+  constraintList_free(temp);
+
+  temp = test->requiresConstraints;
   test->requiresConstraints = exprNode_traversRequiresConstraints (test);
-  
-  test->trueEnsuresConstraints =  exprNode_traversTrueEnsuresConstraints(test);
+  constraintList_free(temp);
 
-  test->trueEnsuresConstraints = constraintList_substitute(test->trueEnsuresConstraints, test->ensuresConstraints);
+
+  test->trueEnsuresConstraints = constraintList_substituteFreeTarget(test->trueEnsuresConstraints, test->ensuresConstraints);
   
   DPRINTF ((message ("doIf: test ensures %s ", constraintList_print(test->ensuresConstraints) ) ) );
     
   DPRINTF ((message ("doIf: test true ensures %s ", constraintList_print(test->trueEnsuresConstraints) ) ) );
-    
-  e->requiresConstraints = reflectChanges (body->requiresConstraints, test->trueEnsuresConstraints);
-  e->requiresConstraints = reflectChanges (e->requiresConstraints,
+  
+  constraintList_free(e->requiresConstraints);
+  e->requiresConstraints = constraintList_reflectChanges(body->requiresConstraints, test->trueEnsuresConstraints);
+
+  e->requiresConstraints = constraintList_reflectChangesFreePre (e->requiresConstraints,
                                           test->ensuresConstraints);
+  temp = e->requiresConstraints;
   e->requiresConstraints = constraintList_mergeRequires (e->requiresConstraints, test->requiresConstraints);
-  
-#warning bad
+  constraintList_free(temp);
+
+
+//drl possible problem : warning bad
+  constraintList_free(e->ensuresConstraints);
   e->ensuresConstraints = constraintList_copy (test->ensuresConstraints);
   
   if (exprNode_mayEscape (body) )
     {
       DPRINTF (( message("doIf: the if statement body %s returns or exits", exprNode_unparse(body) ) ));
-      e->ensuresConstraints = constraintList_mergeEnsures (e->ensuresConstraints,
+      e->ensuresConstraints = constraintList_mergeEnsuresFreeFirst (e->ensuresConstraints,
                                                        test->falseEnsuresConstraints);
     }
   
@@ -364,47 +405,62 @@ exprNode doIf (exprNode e, exprNode test, exprNode body)
 */
 
 
-exprNode doIfElse (/*@returned@*/ exprNode e, exprNode p, exprNode trueBranch, exprNode falseBranch)
+static exprNode doIfElse (/*@returned@*/ exprNode e, /*@dependent@*/ exprNode p, /*@dependent@*/ exprNode trueBranch, /*@dependent@*/ exprNode falseBranch)
 {
   
-    constraintList c1, cons, t, f;
+    constraintList c1, cons, t, t2, f, f2;
+
+  DPRINTF ((message ("doIfElse: %s ", exprNode_unparse(e) ) ) );
     
     // do requires clauses
     c1 = constraintList_copy (p->ensuresConstraints);
     
-    t = reflectChanges (trueBranch->requiresConstraints, p->trueEnsuresConstraints);
-    t = reflectChanges (t, p->ensuresConstraints);
+    t = constraintList_reflectChanges(trueBranch->requiresConstraints, p->trueEnsuresConstraints);
+    t = constraintList_reflectChangesFreePre (t, p->ensuresConstraints);
 
-    //    e->requiresConstraints = constraintList_copy (cons);
-    
-    cons = reflectChanges (falseBranch->requiresConstraints, p->falseEnsuresConstraints);
-    cons  = reflectChanges (cons, c1);
+    cons = constraintList_reflectChanges(falseBranch->requiresConstraints, p->falseEnsuresConstraints);
+    cons  = constraintList_reflectChangesFreePre (cons, c1);
 
-    e->requiresConstraints = constraintList_mergeRequires (t, cons);
-    e->requiresConstraints = constraintList_mergeRequires (e->requiresConstraints, p->requiresConstraints);
+    constraintList_free(e->requiresConstraints);
+    e->requiresConstraints = constraintList_mergeRequiresFreeFirst (t, cons);
+    e->requiresConstraints = constraintList_mergeRequiresFreeFirst (e->requiresConstraints, p->requiresConstraints);
     
     // do ensures clauses
     // find the  the ensures lists for each subbranch
     t = constraintList_mergeEnsures (p->trueEnsuresConstraints, trueBranch->ensuresConstraints);
+    t2 = t;
     t = constraintList_mergeEnsures (p->ensuresConstraints, t);
-    
+    constraintList_free(t2);
+
     f = constraintList_mergeEnsures (p->falseEnsuresConstraints, falseBranch->ensuresConstraints);
+    f2 = f;
     f = constraintList_mergeEnsures (p->ensuresConstraints, f);
+    constraintList_free(f2);
     
     // find ensures for whole if/else statement
     
+    constraintList_free(e->ensuresConstraints);
+
     e->ensuresConstraints = constraintList_logicalOr (t, f);
     
+    constraintList_free(t);
+    constraintList_free(f);
+    constraintList_free(cons);
+    constraintList_free(c1);
+
+    DPRINTF ((message ("doIfElse: if requires %q ", constraintList_print(e->requiresConstraints) ) ) );
+    DPRINTF ((message ("doIfElse: if ensures %q ", constraintList_print(e->ensuresConstraints) ) ) );
+    
     return e;
 }
 
-exprNode doWhile (exprNode e, exprNode test, exprNode body)
+static exprNode doWhile (/*@returned@*/ exprNode e, /*@dependent@*/ exprNode test, /*@dependent@*/ exprNode body)
 {
   DPRINTF ((message ("doWhile: %s ", exprNode_unparse(e) ) ) );
   return doIf (e, test, body);
 }
 
-constraintList constraintList_makeFixedArrayConstraints (sRefSet s)
+/*@only@*/ constraintList constraintList_makeFixedArrayConstraints (/*@observer@*/ sRefSet s)
 {
   constraintList ret;
   constraint con;
@@ -415,16 +471,16 @@ constraintList constraintList_makeFixedArrayConstraints (sRefSet s)
       //    llassert (el);
     if (sRef_isFixedArray(el) )
       {
-       int s;
+       long int size;
        DPRINTF( (message("%s is a fixed array",
                          sRef_unparse(el)) ) );
        //if (el->kind == SK_DERIVED)
          //  break; //hack until I find the real problem
-       s = sRef_getArraySize(el);
+       size = sRef_getArraySize(el);
        DPRINTF( (message("%s is a fixed array with size %d",
-                         sRef_unparse(el), s) ) );
-       con = constraint_makeSRefSetBufferSize (el, (s - 1));
-       //con = constraint_makeSRefWriteSafeInt (el, (s - 1));
+                         sRef_unparse(el), (int)size) ) );
+       con = constraint_makeSRefSetBufferSize (el, (size - 1));
+       //con = constraint_makeSRefWriteSafeInt (el, (size - 1));
        ret = constraintList_add(ret, con);
       }
     else
@@ -453,19 +509,19 @@ constraintList constraintList_makeFixedArrayConstraints (sRefSet s)
     return ret;
 }
 
-exprNode makeDataTypeConstraints (exprNode e)
+exprNode makeDataTypeConstraints (/*@returned@*/ exprNode e)
 {
   constraintList c;
   DPRINTF(("makeDataTypeConstraints"));
 
   c = constraintList_makeFixedArrayConstraints (e->uses);
   
-  e->ensuresConstraints = constraintList_addList (e->ensuresConstraints, c);
+  e->ensuresConstraints = constraintList_addListFree (e->ensuresConstraints, c);
  
  return e;
 }
 
-void doFor (exprNode e, exprNode forPred, exprNode forBody)
+static void doFor (/*@dependent@*/ exprNode e, /*@dependent@*/ exprNode forPred, /*@dependent@*/ exprNode forBody)
 {
   exprNode init, test, inc;
   //merge the constraints: modle as if statement
@@ -483,16 +539,19 @@ void doFor (exprNode e, exprNode forPred, exprNode forBody)
          return;
        }
 
-      forLoopHeuristics(e, forPred, forBody);
+      exprNode_forLoopHeuristics(e, forPred, forBody);
       
-      e->requiresConstraints = reflectChanges (forBody->requiresConstraints, test->ensuresConstraints);
-      e->requiresConstraints = reflectChanges (e->requiresConstraints, test->trueEnsuresConstraints);
-      e->requiresConstraints = reflectChanges (e->requiresConstraints, forPred->ensuresConstraints);
+      constraintList_free(e->requiresConstraints);
+      e->requiresConstraints = constraintList_reflectChanges(forBody->requiresConstraints, test->ensuresConstraints);
+      e->requiresConstraints = constraintList_reflectChangesFreePre (e->requiresConstraints, test->trueEnsuresConstraints);
+      e->requiresConstraints = constraintList_reflectChangesFreePre (e->requiresConstraints, forPred->ensuresConstraints);
 
       if (!forBody->canBreak)
        {
-         e->ensuresConstraints = constraintList_addList(e->ensuresConstraints, forPred->ensuresConstraints);
-         e->ensuresConstraints = constraintList_addList(e->ensuresConstraints, test->falseEnsuresConstraints);
+         e->ensuresConstraints = constraintList_addListFree(e->ensuresConstraints, constraintList_copy(forPred->ensuresConstraints) );
+         e->ensuresConstraints = constraintList_addListFree(e->ensuresConstraints,constraintList_copy( test->falseEnsuresConstraints));
+         //      forPred->ensuresConstraints = constraintList_undefined;
+         //      test->falseEnsuresConstraints = constraintList_undefined;
        }
       else
        {
@@ -501,29 +560,258 @@ void doFor (exprNode e, exprNode forPred, exprNode forBody)
       
 }
 
-exprNode doSwitch (/*@returned@*/ exprNode e)
+static void exprNode_doGenerateConstraintSwitch ( exprNode switchExpr,
+                                                 exprNode body, constraintList * currentRequires, constraintList *
+                                                 currentEnsures,  constraintList * savedRequires, constraintList *
+                                                 savedEnsures)
+{
+  exprNode stmt, stmtList;
+
+  DPRINTF(( message("exprNode_doGenerateConstraintSwitch: (switch %s) %s",
+                   exprNode_unparse(switchExpr), exprNode_unparse(body)
+                   ) ));
+
+  if (exprNode_isError(body) )
+    {
+      return;
+    }
+
+  if (body->kind != XPR_STMTLIST )
+    {
+      DPRINTF((message("exprNode_doGenerateConstraintSwitch: non
+stmtlist: %s",
+                      exprNode_unparse(body) )
+              ));
+      //      llassert(body->kind == XPR_STMT );
+      stmt = body;
+      stmtList = exprNode_undefined;
+    }
+    else
+      {
+       stmt     = exprData_getPairB(body->edata);
+       stmtList = exprData_getPairA(body->edata);
+      }
+
+  DPRINTF((message("exprNode_doGenerateConstraintSwitch: stmtlist: %s
+stmt: %s",
+                  exprNode_unparse(stmtList), exprNode_unparse(stmt) )
+          ));
+
+
+  exprNode_doGenerateConstraintSwitch (switchExpr, stmtList, currentRequires, currentEnsures,
+                                      savedRequires, savedEnsures );
+
+  if (exprNode_isError(stmt) )
+    return;
+
+  exprNode_stmt(stmt);
+  //, FALSE, FALSE, exprNode_getfileloc(stmt) );
+
+  if (! exprNode_isCaseMarker(stmt) )
+    {
+
+      constraintList temp;
+
+      DPRINTF (( message("Got normal statement %s (requires %s ensures %s)", exprNode_unparse(stmt),
+                        constraintList_unparse(stmt->requiresConstraints), constraintList_unparse(stmt->ensuresConstraints) ) ));
+
+      temp = constraintList_reflectChanges (stmt->requiresConstraints,
+                                           *currentEnsures);
+
+            *currentRequires = constraintList_mergeRequiresFreeFirst
+             (*currentRequires,
+              temp);
+
+           constraintList_free(temp);
+
+                 *currentEnsures = constraintList_mergeEnsuresFreeFirst
+                   (*currentEnsures,
+                    stmt->ensuresConstraints);
+                 DPRINTF(( message("returning from exprNode_doGenerateConstraintSwitch: (switch %s) %s currentRequires:"
+                                   "%s currentEnsures:%s",
+                                   exprNode_unparse(switchExpr), exprNode_unparse(body),
+                                   constraintList_print(*currentRequires), constraintList_print(*currentEnsures)
+                                   ) ));
+                 return;
+    }
+
+  if (exprNode_isCaseMarker(stmt) && exprNode_mustEscape(stmtList) )
+    {
+      // merge current and saved constraint with Logical Or...
+      // make a constraint for ensures
+
+      constraintList temp;
+      constraint con;
+
+      DPRINTF (( message("Got case marker") ));
+
+      if (constraintList_isUndefined(*savedEnsures) &&
+         constraintList_isUndefined(*savedRequires) )
+       {
+         *savedEnsures  = constraintList_copy(*currentEnsures);
+         *savedRequires = constraintList_copy(*currentRequires);
+       }
+             else
+              {
+                DPRINTF (( message("Doing logical or") ));
+                temp = constraintList_logicalOr (*savedEnsures, *currentEnsures);
+                constraintList_free (*savedEnsures);
+                *savedEnsures = temp;
+
+                *savedRequires = constraintList_mergeRequiresFreeFirst (*savedRequires, *currentRequires);
+              }
+
+      con = constraint_makeEnsureEqual (switchExpr, exprData_getSingle
+                                       (stmt->edata), exprNode_getfileloc(stmt) );
+
+
+      constraintList_free(*currentEnsures);
+      *currentEnsures = constraintList_makeNew();
+      *currentEnsures = constraintList_add(*currentEnsures, con);
+
+      constraintList_free(*currentRequires);
+      *currentRequires = constraintList_makeNew();
+      DPRINTF(( message("exprNode_doGenerateConstraintSwitch: (switch %s) %s savedRequires:"
+                       "%s savedEnsures:%s",
+                       exprNode_unparse(switchExpr), exprNode_unparse(body),
+                       constraintList_print(*savedRequires), constraintList_print(*savedEnsures)
+                       ) ));
+
+    }
+
+  else if (exprNode_isCaseMarker(stmt) )
+    //prior case has no break.
+    {
+      // We don't do anything to the sved constraints because the case hasn't ended
+      //The new ensures constraints for the case will be:
+      // the constraint for the case statement (CASE_LABEL == SWITCH_EXPR) logicalOr currentEnsures
+
+      constraintList temp;
+      constraint con;
+
+      constraintList ensuresTemp;
+
+      DPRINTF (( message("Got case marker with no prior break") ));
+
+      con = constraint_makeEnsureEqual (switchExpr, exprData_getSingle
+                                       (stmt->edata), exprNode_getfileloc(stmt) );
+
+      ensuresTemp = constraintList_makeNew();
+
+      ensuresTemp = constraintList_add (ensuresTemp, con);
+
+      if (exprNode_isError(stmtList) )
+       {
+         constraintList_free(*currentEnsures);
+         *currentEnsures = constraintList_copy(ensuresTemp);
+       }
+            else
+             {
+
+               temp = constraintList_logicalOr (*currentEnsures, ensuresTemp);
+
+               constraintList_free(*currentEnsures);
+               constraintList_free(ensuresTemp);
+
+               *currentEnsures = temp;
+             }
+      constraintList_free(*currentRequires);
+
+      *currentRequires = constraintList_makeNew();
+    }
+
+  DPRINTF(( message("returning from exprNode_doGenerateConstraintSwitch: (switch %s) %s currentRequires:"
+                   "%s currentEnsures:%s",
+                   exprNode_unparse(switchExpr), exprNode_unparse(body),
+                   constraintList_print(*currentRequires), constraintList_print(*currentEnsures)
+                   ) ));
+  return;
+
+}
+
+
+static void exprNode_generateConstraintSwitch ( exprNode switchStmt)
+{
+  constraintList constraintsRequires;
+  constraintList constraintsEnsures;
+  constraintList lastRequires;
+  constraintList lastEnsures;
+
+  exprNode body;
+  exprNode switchExpr;
+
+  switchExpr = exprData_getPairA(switchStmt->edata);
+  body = exprData_getPairB(switchStmt->edata);
+
+  //*@i22*/
+  if ( body->kind == XPR_BLOCK)
+    body = exprData_getSingle(body->edata);
+
+  constraintsRequires = constraintList_undefined;
+  constraintsEnsures = constraintList_undefined;
+
+  lastRequires = constraintList_makeNew();
+  lastEnsures = constraintList_makeNew();
+
+
+  exprNode_doGenerateConstraintSwitch (switchExpr, body, &lastRequires, &lastEnsures, &constraintsRequires, &constraintsEnsures);
+
+  // merge current and saved constraint with Logical Or...
+  // make a constraint for ensures
+
+  constraintList_free(switchStmt->requiresConstraints);
+  constraintList_free(switchStmt->ensuresConstraints);
+
+  if (constraintList_isDefined(constraintsEnsures) && constraintList_isDefined(constraintsRequires) )
+    {
+      switchStmt->ensuresConstraints = constraintList_logicalOr(constraintsEnsures, lastEnsures);
+      switchStmt->requiresConstraints =   constraintList_mergeRequires(constraintsRequires, lastRequires);
+      constraintList_free (constraintsRequires);
+      constraintList_free (constraintsEnsures);
+    }
+    else
+      {
+       switchStmt->ensuresConstraints =    constraintList_copy(lastEnsures);
+       switchStmt->requiresConstraints =   constraintList_copy(lastRequires);
+      }
+
+  constraintList_free (lastRequires);
+  constraintList_free (lastEnsures);
+
+  DPRINTF(( (message(" exprNode_generateConstraintSwitch returning requires: %s and ensures %s",
+                    constraintList_print( switchStmt->requiresConstraints),
+                    constraintList_print( switchStmt->ensuresConstraints)
+                    )
+            ) ));
+}
+
+static exprNode doSwitch (/*@returned@*/ exprNode e)
 {
   exprNode body;
   exprData data;
 
   data = e->edata;
-  llassert(FALSE);
-  //DPRINTF (( message ("doSwitch for: switch (%s) %s", 
-  //        exprNode_unparse (exprData_getPairA (data)),
-  //                exprNode_unparse (exprData_getPairB (data))) ));
+  //  llassert(FALSE);
+  DPRINTF (( message ("doSwitch for: switch (%s) %s",
+                     exprNode_unparse (exprData_getPairA (data)),
+                     exprNode_unparse (exprData_getPairB (data))) ));
 
   body = exprData_getPairB (data);
-  
-  // exprNode_generateConstraints(body);
-  
-  // e->requiresConstraints = constraintList_copy ( body->requiresConstraints );
-  //e->ensuresConstraints = constraintList_copy ( body->ensuresConstraints );
-  
+
+  exprNode_generateConstraints(body);
+
+  exprNode_generateConstraintSwitch (e);
+
+  //  e->requiresConstraints = constraintList_copy (body->requiresConstraints );
+  // e->ensuresConstraints = constraintList_copy (body->ensuresConstraints );
+
   return e;
 }
 
 
-bool exprNode_multiStatement (exprNode e)
+
+
+void exprNode_multiStatement (/*@dependent@*/ exprNode e)
 {
   
   bool ret;
@@ -532,12 +820,15 @@ bool exprNode_multiStatement (exprNode e)
   exprNode p, trueBranch, falseBranch;
   exprNode forPred, forBody;
   exprNode test;
+
+  constraintList temp;
+
   //  constraintList t, f;
-  e->requiresConstraints = constraintList_makeNew();
+  /*e->requiresConstraints = constraintList_makeNew();
   e->ensuresConstraints = constraintList_makeNew();
   e->trueEnsuresConstraints = constraintList_makeNew();
   e->falseEnsuresConstraints = constraintList_makeNew();
-
+  */
   //  e = makeDataTypeConstraints(e);
 
   DPRINTF((message ("exprNode_multistatement Analysising %s %s at", exprNode_unparse( e),
@@ -545,7 +836,7 @@ bool exprNode_multiStatement (exprNode e)
   
   if (exprNode_handleError (e))
     {
-      return FALSE;
+      return; // FALSE;
     }
 
   data = e->edata;
@@ -577,8 +868,13 @@ bool exprNode_multiStatement (exprNode e)
       exprNode_generateConstraints (exprData_getTripleInc (data) );
     
       if (!exprNode_isError(test) )
-       test->trueEnsuresConstraints =  exprNode_traversTrueEnsuresConstraints(test);
-
+       {
+         constraintList temp2;
+         temp2 = test->trueEnsuresConstraints;
+         test->trueEnsuresConstraints =  exprNode_traversTrueEnsuresConstraints(test);
+         constraintList_free(temp2);
+       }
+      
       exprNode_generateConstraints (exprData_getTripleInc (data));
       break;
 
@@ -606,7 +902,6 @@ bool exprNode_multiStatement (exprNode e)
                             FALSE, FALSE, exprNode_loc(e1));
 
       exprNode_generateConstraints (e2);
-
       e = doIf (e, e1, e2);
   
       
@@ -626,11 +921,21 @@ bool exprNode_multiStatement (exprNode e)
       exprNode_generateConstraints (trueBranch);
       exprNode_generateConstraints (falseBranch);
 
+      temp = p->ensuresConstraints;
       p->ensuresConstraints = exprNode_traversEnsuresConstraints (p);
+      constraintList_free(temp);
+
+      temp = p->requiresConstraints;
       p->requiresConstraints = exprNode_traversRequiresConstraints (p);
-      
+      constraintList_free(temp);
+
+      temp = p->trueEnsuresConstraints;
       p->trueEnsuresConstraints =  exprNode_traversTrueEnsuresConstraints(p);
+      constraintList_free(temp);
+
+      temp = p->falseEnsuresConstraints;
       p->falseEnsuresConstraints =  exprNode_traversFalseEnsuresConstraints(p);
+      constraintList_free(temp);
 
           e = doIfElse (e, p, trueBranch, falseBranch);
       DPRINTF( ("Done IFELSE") );
@@ -652,7 +957,11 @@ bool exprNode_multiStatement (exprNode e)
     case XPR_BLOCK:
       //      ret = message ("{ %s }",
                     exprNode_generateConstraints (exprData_getSingle (data));
+
+                    constraintList_free(e->requiresConstraints);
                     e->requiresConstraints = constraintList_copy ( (exprData_getSingle (data))->requiresConstraints );
+
+                    constraintList_free(e->ensuresConstraints);
                     e->ensuresConstraints = constraintList_copy ( (exprData_getSingle (data))->ensuresConstraints );
                     //      e->constraints = (exprData_getSingle (data))->constraints;
       break;
@@ -662,16 +971,17 @@ bool exprNode_multiStatement (exprNode e)
       break;
     case XPR_STMT:
     case XPR_STMTLIST:
-      return exprNode_stmtList (e);
+      exprNode_stmtList (e);
+      return ;
       /*@notreached@*/
       break;
     default:
       ret=FALSE;
     }
-  return ret;
+  return; // ret;
 }
 
-bool lltok_isBoolean_Op (lltok tok)
+static bool lltok_isBoolean_Op (lltok tok)
 {
   /*this should really be a switch statement but
     I don't want to violate the abstraction
@@ -716,13 +1026,13 @@ bool lltok_isBoolean_Op (lltok tok)
 }
 
 
-void exprNode_booleanTraverse (exprNode e, bool definatelv, bool definaterv,  fileloc sequencePoint)
+static void exprNode_booleanTraverse (/*@dependent@*/ exprNode e, /*@unused@*/ bool definatelv, /*@unused@*/ bool definaterv,  fileloc sequencePoint)
 {
  constraint cons;
 exprNode t1, t2;
 exprData data;
 lltok tok;
-constraintList tempList;
+constraintList tempList, temp;
 data = e->edata;
 
 tok = exprData_getOpTok (data);
@@ -732,6 +1042,8 @@ t1 = exprData_getOpA (data);
 t2 = exprData_getOpB (data);
 
 
+ tempList = constraintList_undefined;
 /* arithmetic tests */
 
 if (lltok_isEq_Op (tok) )
@@ -783,40 +1095,50 @@ if (lltok_isLe_Op (tok) )
 
 /*Logical operations */
 
+
  if (lltok_isAnd_Op (tok) )
    
    {
      //true ensures 
      tempList = constraintList_copy (t1->trueEnsuresConstraints);
      tempList = constraintList_addList (tempList, t2->trueEnsuresConstraints);
-     e->trueEnsuresConstraints = constraintList_addList(e->trueEnsuresConstraints, tempList);
+     e->trueEnsuresConstraints = constraintList_addListFree(e->trueEnsuresConstraints, tempList);
      
       //false ensures: fens t1 or tens t1 and fens t2
      tempList = constraintList_copy (t1->trueEnsuresConstraints);
      tempList = constraintList_addList (tempList, t2->falseEnsuresConstraints);
+     temp = tempList;
      tempList = constraintList_logicalOr (tempList, t1->falseEnsuresConstraints);
-      e->falseEnsuresConstraints =constraintList_addList(e->falseEnsuresConstraints, tempList);
-      
+     constraintList_free (temp);
+     
+     /* evans - was constraintList_addList - memory leak detected by lclint */
+     e->falseEnsuresConstraints =constraintList_addListFree (e->falseEnsuresConstraints, tempList);
    }
-  if (lltok_isOr_Op (tok) )
-    {
+ else if (lltok_isOr_Op (tok) )
+  {
       //false ensures 
       tempList = constraintList_copy (t1->falseEnsuresConstraints);
       tempList = constraintList_addList (tempList, t2->falseEnsuresConstraints);
-      e->falseEnsuresConstraints = constraintList_addList(e->falseEnsuresConstraints, tempList);
+      e->falseEnsuresConstraints = constraintList_addListFree(e->falseEnsuresConstraints, tempList);
       
       //true ensures: tens t1 or fens t1 and tens t2
       tempList = constraintList_copy (t1->falseEnsuresConstraints);
       tempList = constraintList_addList (tempList, t2->trueEnsuresConstraints);
-      tempList = constraintList_logicalOr (tempList, t1->trueEnsuresConstraints);
-      e->trueEnsuresConstraints =constraintList_addList(e->trueEnsuresConstraints, tempList);
       
+      temp = tempList;
+      tempList = constraintList_logicalOr (tempList, t1->trueEnsuresConstraints);
+      constraintList_free(temp);
+
+      e->trueEnsuresConstraints = constraintList_addListFree(e->trueEnsuresConstraints, tempList);
+      tempList = constraintList_undefined;
     }
-  
+ else
+    {
+      DPRINTF((message("%s is not a boolean operation", lltok_unparse(tok) ) ));
+    } 
 }
 
-bool exprNode_exprTraverse (exprNode e, bool definatelv, bool definaterv,  fileloc sequencePoint)
+void exprNode_exprTraverse (exprNode e, bool definatelv, bool definaterv,  /*@observer@*/ /*@temp@*/ fileloc sequencePoint)
 {
   exprNode t1, t2, fcn;
   lltok tok;
@@ -824,22 +1146,24 @@ bool exprNode_exprTraverse (exprNode e, bool definatelv, bool definaterv,  filel
   exprData data;
   constraint cons;
 
+  constraintList temp;
+
   if (exprNode_isError(e) )
     {
-      return FALSE;
+      return; // FALSE;
     }
   
   DPRINTF((message ("exprNode_exprTraverset Analysising %s %s at", exprNode_unparse( e),
                    fileloc_unparse(exprNode_getfileloc(e) ) ) ) );
   
-  e->requiresConstraints = constraintList_makeNew();
+  /*e->requiresConstraints = constraintList_makeNew();
   e->ensuresConstraints = constraintList_makeNew();
   e->trueEnsuresConstraints = constraintList_makeNew();;
   e->falseEnsuresConstraints = constraintList_makeNew();;
-  
+  */
   if (exprNode_isUnhandled (e) )
      {
-       return FALSE;
+       return; // FALSE;
      }
    //   e = makeDataTypeConstraints (e);
  
@@ -849,8 +1173,6 @@ bool exprNode_exprTraverse (exprNode e, bool definatelv, bool definaterv,  filel
   
   switch (e->kind)
     {
-
-      
     case XPR_WHILEPRED:
       t1 = exprData_getSingle (data);
       exprNode_exprTraverse (t1,  definatelv, definaterv, sequencePoint);
@@ -881,7 +1203,7 @@ bool exprNode_exprTraverse (exprNode e, bool definatelv, bool definaterv,  filel
        
       //      cons = constraint_makeEnsureMinReadAtMost (t1, t2, sequencePoint);
       // e->ensuresConstraints = constraintList_add(e->ensuresConstraints, cons);
-       
+      
       exprNode_exprTraverse (exprData_getPairA (data), FALSE, TRUE, sequencePoint);
       exprNode_exprTraverse (exprData_getPairB (data), FALSE, TRUE, sequencePoint);
       
@@ -893,25 +1215,44 @@ bool exprNode_exprTraverse (exprNode e, bool definatelv, bool definaterv,  filel
       //    e->constraints = constraintList_exprNodemerge (exprData_getUopNode (e->edata), exprNode_undefined);
       break;
     case XPR_INIT:
-     /*   //t1 = exprData_getInitId (data); */
-      t2 = exprData_getInitNode (data);
-      //exprNode_exprTraverse (t1, TRUE, FALSE, sequencePoint ); 
-      
-      exprNode_exprTraverse (t2, definatelv, TRUE, sequencePoint );
-
-      /* this test is nessecary because some expressions generate a null expression node.  function pointer do that -- drl */
+      {
+       /*      
+       idDecl t;
+       
+       uentry ue;
+       exprNode lhs;
+
+       t = exprData_getInitId (data); 
+       ue = usymtab_lookup (idDecl_observeId (t));
+       lhs = exprNode_createId (ue);
+       */
+       t2 = exprData_getInitNode (data);
+
+       /*      DPRINTF(( (message("initialization: %s = %s",
+                          exprNode_unparse(lhs),
+                          exprNode_unparse(t2)
+                          )
+                  ) ));        */
+       
+       //exprNode_exprTraverse (t1, TRUE, FALSE, sequencePoint ); 
+       
+       exprNode_exprTraverse (t2, definatelv, TRUE, sequencePoint );
+       
+       /* this test is nessecary because some expressions generate a null expression node.  function pointer do that -- drl */
         if ( (!exprNode_isError (e))  &&  (!exprNode_isError(t2)) )
-       {
-         cons =  constraint_makeEnsureEqual (e, t2, sequencePoint);
-         e->ensuresConstraints = constraintList_add(e->ensuresConstraints, cons);
-       }
+         {
+           cons =  constraint_makeEnsureEqual (e, t2, sequencePoint);
+           e->ensuresConstraints = constraintList_add(e->ensuresConstraints, cons);
+         }
+      }
       
       break;
     case XPR_ASSIGN:
       t1 = exprData_getOpA (data);
       t2 = exprData_getOpB (data);
       exprNode_exprTraverse (t1, TRUE, definaterv, sequencePoint ); 
-      lltok_unparse (exprData_getOpTok (data));
+      //lltok_unparse (exprData_getOpTok (data));
+
       exprNode_exprTraverse (t2, definatelv, TRUE, sequencePoint );
 
       /* this test is nessecary because some expressions generate a null expression node.  function pointer do that -- drl */
@@ -924,18 +1265,38 @@ bool exprNode_exprTraverse (exprNode e, bool definatelv, bool definaterv,  filel
     case XPR_OP:
       t1 = exprData_getOpA (data);
       t2 = exprData_getOpB (data);
-      
-       exprNode_exprTraverse (t1, definatelv, definaterv, sequencePoint );
       tok = exprData_getOpTok (data);
-      exprNode_exprTraverse (t2, definatelv, definaterv, sequencePoint );
+      
+
+      if (tok.tok == ADD_ASSIGN)
+       {
+         exprNode_exprTraverse (t1, TRUE, definaterv, sequencePoint );
+         exprNode_exprTraverse (t2, definatelv, TRUE, sequencePoint );
 
+         cons = constraint_makeAddAssign (t1, t2,  sequencePoint );
+         e->ensuresConstraints = constraintList_add(e->ensuresConstraints, cons);
+       }
+      else if (tok.tok == SUB_ASSIGN)
+       {
+         exprNode_exprTraverse (t1, TRUE, definaterv, sequencePoint );
+         exprNode_exprTraverse (t2, definatelv, TRUE, sequencePoint );
+
+         cons = constraint_makeSubtractAssign (t1, t2,  sequencePoint );
+         e->ensuresConstraints = constraintList_add(e->ensuresConstraints, cons);
+       }
+      else
+       {
+         exprNode_exprTraverse (t1, definatelv, definaterv, sequencePoint );
+         exprNode_exprTraverse (t2, definatelv, definaterv, sequencePoint );
+       }
+      
       if (lltok_isBoolean_Op (tok) )
        exprNode_booleanTraverse (e, definatelv, definaterv, sequencePoint);
 
       //      e->constraints  = constraintList_exprNodemerge (exprData_getOpA (data), exprData_getOpB (data));
       break;
     case XPR_SIZEOFT:
-      ctype_unparse (qtype_getType (exprData_getType (data) ) );
+      //drl possible problem : warning make sure the case can be ignored..
       
       break;
       
@@ -948,23 +1309,25 @@ bool exprNode_exprTraverse (exprNode e, bool definatelv, bool definaterv,  filel
       fcn = exprData_getFcn(data);
       
       exprNode_exprTraverse (fcn, definatelv, definaterv, sequencePoint );
-      exprNodeList_unparse (exprData_getArgs (data) );
       DPRINTF ( (message ("Got call that %s ( %s) ",  exprNode_unparse(fcn),   exprNodeList_unparse (exprData_getArgs (data) ) ) ) );
 
-      fcn->requiresConstraints = constraintList_addList (fcn->requiresConstraints,
+      fcn->requiresConstraints = constraintList_addListFree (fcn->requiresConstraints,
                                                 checkCall (fcn, exprData_getArgs (data)  ) );      
 
-      fcn->ensuresConstraints = constraintList_addList (fcn->ensuresConstraints,
-                                                getPostConditions(fcn, exprData_getArgs (data),e  ) );
+      fcn->ensuresConstraints = constraintList_addListFree (fcn->ensuresConstraints,
+                                                exprNode_getPostConditions(fcn, exprData_getArgs (data),e  ) );
 
       t1 = exprNode_createNew (exprNode_getType (e) );
       
       checkArgumentList (t1, exprData_getArgs(data), sequencePoint);
 
       
-      mergeResolve (e, t1, fcn);
+      exprNode_mergeResolve (e, t1, fcn);
+
+      exprNode_free(t1);
       
       //      e->constraints = constraintList_add (e->constraints, constraint_create (e,exprNode_undefined, GT,  CALLSAFE ) );
+      
       break;
       
     case XPR_RETURN:
@@ -972,26 +1335,24 @@ bool exprNode_exprTraverse (exprNode e, bool definatelv, bool definaterv,  filel
       break;
   
     case XPR_NULLRETURN:
-      cstring_makeLiteral ("return");;
+      
       break;
       
       
     case XPR_FACCESS:
       exprNode_exprTraverse (exprData_getFieldNode (data), definatelv, definaterv, sequencePoint );
-      exprData_getFieldName (data) ;
       break;
    
     case XPR_ARROW:
       exprNode_exprTraverse (exprData_getFieldNode (data), definatelv, definaterv, sequencePoint );
-      exprData_getFieldName (data);
       break;
    
     case XPR_STRINGLITERAL:
-      cstring_copy (exprData_getLiteral (data));
+
       break;
       
     case XPR_NUMLIT:
-      cstring_copy (exprData_getLiteral (data));
+
       break;
       
     case XPR_PREOP: 
@@ -1014,8 +1375,7 @@ bool exprNode_exprTraverse (exprNode e, bool definatelv, bool definaterv,  filel
          cons = constraint_makeMaxSetSideEffectPostDecrement (t1, sequencePoint );
          e->ensuresConstraints = constraintList_add (e->ensuresConstraints, cons);
        }
-      
-      if (lltok_isMult( exprData_getUopTok (data) ) )
+      else if (lltok_isMult( tok  ) )
        {
          if (definatelv)
            {
@@ -1027,19 +1387,43 @@ bool exprNode_exprTraverse (exprNode e, bool definatelv, bool definaterv,  filel
            }
              e->requiresConstraints = constraintList_add(e->requiresConstraints, cons);
        }
-      
-      /* ! expr */
-      if (lltok_isNot_Op (exprData_getUopTok (data) ) )
+      else if (lltok_isNot_Op (tok) )
+       /* ! expr */
        {
+         constraintList_free(e->trueEnsuresConstraints);
+
          e->trueEnsuresConstraints  = constraintList_copy (t1->falseEnsuresConstraints);
+         constraintList_free(e->falseEnsuresConstraints);
          e->falseEnsuresConstraints = constraintList_copy (t1->trueEnsuresConstraints);
        }
+      
+      else if (lltok_isAmpersand_Op (tok) )
+       {
+         break;
+       }
+      else if (lltok_isMinus_Op (tok) )
+       {
+         break;
+       }
+      else if ( lltok_isExcl_Op (tok) )
+       {
+         break;
+       }
+      else if (lltok_isTilde_Op (tok) )
+       {
+         break;
+       }
+      else
+       {
+         llcontbug((message("Unsupported preop in %s", exprNode_unparse(e) ) ));
+         BADEXIT;
+       }
       break;
       
     case XPR_POSTOP:
       
       exprNode_exprTraverse (exprData_getUopNode (data), TRUE, definaterv, sequencePoint );
-      lltok_unparse (exprData_getUopTok (data));
+      
       if (lltok_isInc_Op (exprData_getUopTok (data) ) )
        {
          DPRINTF(("doing ++"));
@@ -1056,48 +1440,93 @@ bool exprNode_exprTraverse (exprNode e, bool definatelv, bool definaterv,  filel
        }
       break;
     case XPR_CAST:
-      llassert(FALSE);
-       exprNode_exprTraverse (exprData_getCastNode (data), definatelv, definaterv, sequencePoint );
+      {
+       t2 =  exprData_getCastNode (data);
+       DPRINTF (( message ("Examining cast (%q)%s", 
+                           qtype_unparse (exprData_getCastType (data)),
+                           exprNode_unparse (t2) )
+                  ));
+       exprNode_exprTraverse (t2, definatelv, definaterv, sequencePoint );
+      }
       break;
+      
     case XPR_COND:
       {
-       exprNode pred, true, false;
+       exprNode pred, trueBranch, falseBranch;
           llassert(FALSE);
       pred = exprData_getTriplePred (data);
-      true = exprData_getTripleTrue (data);
-      false = exprData_getTripleFalse (data);
+      trueBranch = exprData_getTripleTrue (data);
+      falseBranch = exprData_getTripleFalse (data);
 
       exprNode_exprTraverse (pred, FALSE, TRUE, sequencePoint );
+      
+      temp =       pred->ensuresConstraints;
       pred->ensuresConstraints = exprNode_traversEnsuresConstraints(pred);
+      constraintList_free(temp);
+
+      temp =       pred->requiresConstraints;
       pred->requiresConstraints = exprNode_traversRequiresConstraints(pred);
+      constraintList_free(temp);
       
+      temp =       pred->trueEnsuresConstraints;
       pred->trueEnsuresConstraints =  exprNode_traversTrueEnsuresConstraints(pred);
+      constraintList_free(temp);
+
+      temp =       pred->falseEnsuresConstraints;
       pred->falseEnsuresConstraints = exprNode_traversFalseEnsuresConstraints(pred);
+      constraintList_free(temp);
+
             
-      exprNode_exprTraverse (true, FALSE, TRUE, sequencePoint );
-      true->ensuresConstraints = exprNode_traversEnsuresConstraints(true);
-      true->requiresConstraints = exprNode_traversRequiresConstraints(true);
+      exprNode_exprTraverse (trueBranch, FALSE, TRUE, sequencePoint );
+      
+      temp =       trueBranch->ensuresConstraints;
+      trueBranch->ensuresConstraints = exprNode_traversEnsuresConstraints(trueBranch);
+      constraintList_free(temp);
+
+
+      temp =       trueBranch->requiresConstraints;
+      trueBranch->requiresConstraints = exprNode_traversRequiresConstraints(trueBranch);
+      constraintList_free(temp);
+
       
-      true->trueEnsuresConstraints =  exprNode_traversTrueEnsuresConstraints(true);
-      true->falseEnsuresConstraints = exprNode_traversFalseEnsuresConstraints(true);
+      temp =       trueBranch->trueEnsuresConstraints;
+      trueBranch->trueEnsuresConstraints =  exprNode_traversTrueEnsuresConstraints(trueBranch);
+      constraintList_free(temp);
+
+      temp =       trueBranch->falseEnsuresConstraints;
+      trueBranch->falseEnsuresConstraints = exprNode_traversFalseEnsuresConstraints(trueBranch);
+      constraintList_free(temp);
+
+      //dfdf
+      exprNode_exprTraverse (falseBranch, FALSE, TRUE, sequencePoint );
+      
+      temp =       falseBranch->ensuresConstraints;
+      falseBranch->ensuresConstraints = exprNode_traversEnsuresConstraints(falseBranch);
+      constraintList_free(temp);
+
+
+      temp =       falseBranch->requiresConstraints;
+      falseBranch->requiresConstraints = exprNode_traversRequiresConstraints(falseBranch);
+      constraintList_free(temp);
 
-      exprNode_exprTraverse (false, FALSE, TRUE, sequencePoint );
-      false->ensuresConstraints = exprNode_traversEnsuresConstraints(false);
-      false->requiresConstraints = exprNode_traversRequiresConstraints(false);
       
-      false->trueEnsuresConstraints =  exprNode_traversTrueEnsuresConstraints(false);
-      false->falseEnsuresConstraints = exprNode_traversFalseEnsuresConstraints(false);
+      temp =       falseBranch->trueEnsuresConstraints;
+      falseBranch->trueEnsuresConstraints =  exprNode_traversTrueEnsuresConstraints(falseBranch);
+      constraintList_free(temp);
 
+      temp =       falseBranch->falseEnsuresConstraints;
+      falseBranch->falseEnsuresConstraints = exprNode_traversFalseEnsuresConstraints(falseBranch);
+      constraintList_free(temp);
 
       /* if pred is true e equals true otherwise pred equals false */
       
-      cons =  constraint_makeEnsureEqual (e, true, sequencePoint);
-      true->ensuresConstraints = constraintList_add(true->ensuresConstraints, cons);
+      cons =  constraint_makeEnsureEqual (e, trueBranch, sequencePoint);
+      trueBranch->ensuresConstraints = constraintList_add(trueBranch->ensuresConstraints, cons);
 
-      cons =  constraint_makeEnsureEqual (e, true, sequencePoint);
-      false->ensuresConstraints = constraintList_add(false->ensuresConstraints, cons);
+      cons =  constraint_makeEnsureEqual (e, trueBranch, sequencePoint);
+      falseBranch->ensuresConstraints = constraintList_add(falseBranch->ensuresConstraints, cons);
 
-      e = doIfElse (e, pred, true, false);
+      e = doIfElse (e, pred, trueBranch, falseBranch);
       
       }
       break;
@@ -1110,9 +1539,9 @@ bool exprNode_exprTraverse (exprNode e, bool definatelv, bool definaterv,  filel
     problems../  */
       exprNode_exprTraverse (t1, FALSE, FALSE, sequencePoint );
       exprNode_exprTraverse (t2, definatelv, definaterv, sequencePoint );
-      mergeResolve (e, t1, t2);
+      exprNode_mergeResolve (e, t1, t2);
       break;
-      
+
     default:
       handledExprNode = FALSE;
     }
@@ -1123,9 +1552,15 @@ bool exprNode_exprTraverse (exprNode e, bool definatelv, bool definaterv,  filel
 
   e->ensuresConstraints  = constraintList_addGeneratingExpr ( e->ensuresConstraints, e);
 
-  DPRINTF((message ("ensures constraint for %s are %s", exprNode_unparse(e), constraintList_printDetailed(e->ensuresConstraints) ) ));
+  DPRINTF((message ("ensures constraints for %s are %s", exprNode_unparse(e), constraintList_printDetailed(e->ensuresConstraints) ) ));
+
+  DPRINTF((message ("Requires constraints for %s are %s", exprNode_unparse(e), constraintList_printDetailed(e->ensuresConstraints) ) ));
   
-  return handledExprNode; 
+  DPRINTF((message ("trueEnsures constraints for %s are %s", exprNode_unparse(e), constraintList_printDetailed(e->trueEnsuresConstraints) ) ));
+
+  DPRINTF((message ("falseEnsures constraints for %s are %s", exprNode_unparse(e), constraintList_printDetailed(e->falseEnsuresConstraints) ) ));
+
+  return; // handledExprNode; 
 }
 
 
@@ -1138,14 +1573,14 @@ constraintList exprNode_traversTrueEnsuresConstraints (exprNode e)
   exprData data;
   constraintList ret;
 
-   if (exprNode_handleError (e))
-     {
-       ret = constraintList_makeNew();
-       return ret;
-     }
+  if (exprNode_handleError (e))
+    {
+      ret = constraintList_makeNew();
+      return ret;
+    }
   ret = constraintList_copy (e->trueEnsuresConstraints );
    
-   handledExprNode = TRUE;
+  handledExprNode = TRUE;
    
   data = e->edata;
   
@@ -1153,45 +1588,53 @@ constraintList exprNode_traversTrueEnsuresConstraints (exprNode e)
     {
     case XPR_WHILEPRED:
       t1 = exprData_getSingle (data);
-      ret = constraintList_addList ( ret,exprNode_traversTrueEnsuresConstraints (t1) );
+      ret = constraintList_addListFree ( ret, exprNode_traversTrueEnsuresConstraints (t1) );
       break;
       
     case XPR_FETCH:
       
-      ret = constraintList_addList (ret,
+      ret = constraintList_addListFree (ret,
                                    exprNode_traversTrueEnsuresConstraints
                                    (exprData_getPairA (data) ) );
         
-      ret = constraintList_addList (ret,
+      ret = constraintList_addListFree (ret,
                                    exprNode_traversTrueEnsuresConstraints
                                    (exprData_getPairB (data) ) );
       break;
     case XPR_PREOP:
           
-      ret = constraintList_addList (ret,
+      ret = constraintList_addListFree (ret,
                                    exprNode_traversTrueEnsuresConstraints
                                    (exprData_getUopNode (data) ) );
       break;
       
     case XPR_PARENS: 
-      ret = constraintList_addList (ret, exprNode_traversTrueEnsuresConstraints
+      ret = constraintList_addListFree (ret, exprNode_traversTrueEnsuresConstraints
                                    (exprData_getUopNode (data) ) );
       break;
+
+    case XPR_INIT:
+      ret = constraintList_addListFree (ret,
+                                       exprNode_traversTrueEnsuresConstraints
+                                       (exprData_getInitNode (data) ) );
+       break;
+
+
     case XPR_ASSIGN:
-        ret = constraintList_addList (ret,
+        ret = constraintList_addListFree (ret,
                                    exprNode_traversTrueEnsuresConstraints
                                    (exprData_getOpA (data) ) );
         
-       ret = constraintList_addList (ret,
+       ret = constraintList_addListFree (ret,
                                    exprNode_traversTrueEnsuresConstraints
                                    (exprData_getOpB (data) ) );
        break;
     case XPR_OP:
-       ret = constraintList_addList (ret,
+       ret = constraintList_addListFree (ret,
                                    exprNode_traversTrueEnsuresConstraints
                                    (exprData_getOpA (data) ) );
         
-       ret = constraintList_addList (ret,
+       ret = constraintList_addListFree (ret,
                                    exprNode_traversTrueEnsuresConstraints
                                    (exprData_getOpB (data) ) );
        break;
@@ -1203,20 +1646,20 @@ constraintList exprNode_traversTrueEnsuresConstraints (exprNode e)
       
     case XPR_SIZEOF:
           
-       ret = constraintList_addList (ret,
-                                   exprNode_traversTrueEnsuresConstraints
-                                    (exprData_getSingle (data) ) );
+       ret = constraintList_addListFree (ret,
+                                        exprNode_traversTrueEnsuresConstraints
+                                        (exprData_getSingle (data) ) );
        break;
       
     case XPR_CALL:
-      ret = constraintList_addList (ret,
+      ret = constraintList_addListFree (ret,
                                     exprNode_traversTrueEnsuresConstraints
                                    (exprData_getFcn (data) ) );
       /*@i11*/      //   exprNodeList_unparse (exprData_getArgs (data) );
          break;
       
     case XPR_RETURN:
-      ret = constraintList_addList (ret,
+      ret = constraintList_addListFree (ret,
                                    exprNode_traversTrueEnsuresConstraints
                                    (exprData_getSingle (data) ) );
       break;
@@ -1226,14 +1669,14 @@ constraintList exprNode_traversTrueEnsuresConstraints (exprNode e)
       break;
             
     case XPR_FACCESS:
-          ret = constraintList_addList (ret,
+          ret = constraintList_addListFree (ret,
                                    exprNode_traversTrueEnsuresConstraints
                                    (exprData_getFieldNode (data) ) );
        //exprData_getFieldName (data) ;
       break;
    
     case XPR_ARROW:
-        ret = constraintList_addList (ret,
+        ret = constraintList_addListFree (ret,
                                    exprNode_traversTrueEnsuresConstraints
                                    (exprData_getFieldNode (data) ) );
        //      exprData_getFieldName (data);
@@ -1248,19 +1691,18 @@ constraintList exprNode_traversTrueEnsuresConstraints (exprNode e)
       break;
     case XPR_POSTOP:
 
-           ret = constraintList_addList (ret,
+           ret = constraintList_addListFree (ret,
                                    exprNode_traversTrueEnsuresConstraints
                                    (exprData_getUopNode (data) ) );
           break;
 
     case XPR_CAST:
 
-      ret = constraintList_addList (ret,
+      ret = constraintList_addListFree (ret,
                                    exprNode_traversTrueEnsuresConstraints
                                    (exprData_getCastNode (data) ) );
-          break;
-
       break;
+
     default:
       break;
     }
@@ -1292,45 +1734,51 @@ constraintList exprNode_traversFalseEnsuresConstraints (exprNode e)
     {
    case XPR_WHILEPRED:
       t1 = exprData_getSingle (data);
-      ret = constraintList_addList ( ret,exprNode_traversFalseEnsuresConstraints (t1) );
+      ret = constraintList_addListFree ( ret,exprNode_traversFalseEnsuresConstraints (t1) );
       break;
       
     case XPR_FETCH:
       
-      ret = constraintList_addList (ret,
+      ret = constraintList_addListFree (ret,
                                    exprNode_traversFalseEnsuresConstraints
                                    (exprData_getPairA (data) ) );
         
-      ret = constraintList_addList (ret,
+      ret = constraintList_addListFree (ret,
                                    exprNode_traversFalseEnsuresConstraints
                                    (exprData_getPairB (data) ) );
       break;
     case XPR_PREOP:
           
-      ret = constraintList_addList (ret,
+      ret = constraintList_addListFree (ret,
                                    exprNode_traversFalseEnsuresConstraints
                                    (exprData_getUopNode (data) ) );
       break;
       
     case XPR_PARENS: 
-      ret = constraintList_addList (ret, exprNode_traversFalseEnsuresConstraints
+      ret = constraintList_addListFree (ret, exprNode_traversFalseEnsuresConstraints
                                    (exprData_getUopNode (data) ) );
       break;
+    case XPR_INIT:
+        ret = constraintList_addListFree (ret,
+                                   exprNode_traversFalseEnsuresConstraints
+                                   (   exprData_getInitNode (data) ) );
+       break;
+
     case XPR_ASSIGN:
-        ret = constraintList_addList (ret,
+        ret = constraintList_addListFree (ret,
                                    exprNode_traversFalseEnsuresConstraints
                                    (exprData_getOpA (data) ) );
         
-       ret = constraintList_addList (ret,
+       ret = constraintList_addListFree (ret,
                                    exprNode_traversFalseEnsuresConstraints
                                    (exprData_getOpB (data) ) );
        break;
     case XPR_OP:
-       ret = constraintList_addList (ret,
+       ret = constraintList_addListFree (ret,
                                    exprNode_traversFalseEnsuresConstraints
                                    (exprData_getOpA (data) ) );
         
-       ret = constraintList_addList (ret,
+       ret = constraintList_addListFree (ret,
                                    exprNode_traversFalseEnsuresConstraints
                                    (exprData_getOpB (data) ) );
        break;
@@ -1342,20 +1790,20 @@ constraintList exprNode_traversFalseEnsuresConstraints (exprNode e)
       
     case XPR_SIZEOF:
           
-       ret = constraintList_addList (ret,
+       ret = constraintList_addListFree (ret,
                                    exprNode_traversFalseEnsuresConstraints
                                     (exprData_getSingle (data) ) );
        break;
       
     case XPR_CALL:
-      ret = constraintList_addList (ret,
+      ret = constraintList_addListFree (ret,
                                     exprNode_traversFalseEnsuresConstraints
                                    (exprData_getFcn (data) ) );
       /*@i11*/      //   exprNodeList_unparse (exprData_getArgs (data) );
          break;
       
     case XPR_RETURN:
-      ret = constraintList_addList (ret,
+      ret = constraintList_addListFree (ret,
                                    exprNode_traversFalseEnsuresConstraints
                                    (exprData_getSingle (data) ) );
       break;
@@ -1365,14 +1813,14 @@ constraintList exprNode_traversFalseEnsuresConstraints (exprNode e)
       break;
             
     case XPR_FACCESS:
-          ret = constraintList_addList (ret,
+          ret = constraintList_addListFree (ret,
                                    exprNode_traversFalseEnsuresConstraints
                                    (exprData_getFieldNode (data) ) );
        //exprData_getFieldName (data) ;
       break;
    
     case XPR_ARROW:
-        ret = constraintList_addList (ret,
+        ret = constraintList_addListFree (ret,
                                    exprNode_traversFalseEnsuresConstraints
                                    (exprData_getFieldNode (data) ) );
        //      exprData_getFieldName (data);
@@ -1387,14 +1835,14 @@ constraintList exprNode_traversFalseEnsuresConstraints (exprNode e)
       break;
     case XPR_POSTOP:
 
-           ret = constraintList_addList (ret,
+           ret = constraintList_addListFree (ret,
                                    exprNode_traversFalseEnsuresConstraints
                                    (exprData_getUopNode (data) ) );
           break;
           
     case XPR_CAST:
 
-      ret = constraintList_addList (ret,
+      ret = constraintList_addListFree (ret,
                                    exprNode_traversFalseEnsuresConstraints
                                    (exprData_getCastNode (data) ) );
       break;
@@ -1408,7 +1856,7 @@ constraintList exprNode_traversFalseEnsuresConstraints (exprNode e)
 
 
 /* walk down the tree and get all requires Constraints in each subexpression*/
-constraintList exprNode_traversRequiresConstraints (exprNode e)
+/*@only@*/ constraintList exprNode_traversRequiresConstraints (exprNode e)
 {
   exprNode t1;
 
@@ -1432,45 +1880,51 @@ constraintList exprNode_traversRequiresConstraints (exprNode e)
     {
    case XPR_WHILEPRED:
       t1 = exprData_getSingle (data);
-      ret = constraintList_addList ( ret,exprNode_traversRequiresConstraints (t1) );
+      ret = constraintList_addListFree ( ret, exprNode_traversRequiresConstraints (t1) );
       break;
       
     case XPR_FETCH:
       
-      ret = constraintList_addList (ret,
+      ret = constraintList_addListFree (ret,
                                    exprNode_traversRequiresConstraints
                                    (exprData_getPairA (data) ) );
         
-      ret = constraintList_addList (ret,
+      ret = constraintList_addListFree (ret,
                                    exprNode_traversRequiresConstraints
                                    (exprData_getPairB (data) ) );
       break;
     case XPR_PREOP:
           
-      ret = constraintList_addList (ret,
+      ret = constraintList_addListFree (ret,
                                    exprNode_traversRequiresConstraints
                                    (exprData_getUopNode (data) ) );
       break;
       
     case XPR_PARENS: 
-      ret = constraintList_addList (ret, exprNode_traversRequiresConstraints
+      ret = constraintList_addListFree (ret, exprNode_traversRequiresConstraints
                                    (exprData_getUopNode (data) ) );
       break;
+    case XPR_INIT:
+      ret = constraintList_addListFree (ret,
+                                       exprNode_traversRequiresConstraints
+                                       (exprData_getInitNode (data) ) );
+       break;
+
     case XPR_ASSIGN:
-        ret = constraintList_addList (ret,
+        ret = constraintList_addListFree (ret,
                                    exprNode_traversRequiresConstraints
                                    (exprData_getOpA (data) ) );
         
-       ret = constraintList_addList (ret,
+       ret = constraintList_addListFree (ret,
                                    exprNode_traversRequiresConstraints
                                    (exprData_getOpB (data) ) );
        break;
     case XPR_OP:
-       ret = constraintList_addList (ret,
+       ret = constraintList_addListFree (ret,
                                    exprNode_traversRequiresConstraints
                                    (exprData_getOpA (data) ) );
         
-       ret = constraintList_addList (ret,
+       ret = constraintList_addListFree (ret,
                                    exprNode_traversRequiresConstraints
                                    (exprData_getOpB (data) ) );
        break;
@@ -1482,20 +1936,20 @@ constraintList exprNode_traversRequiresConstraints (exprNode e)
       
     case XPR_SIZEOF:
           
-       ret = constraintList_addList (ret,
+       ret = constraintList_addListFree (ret,
                                    exprNode_traversRequiresConstraints
                                     (exprData_getSingle (data) ) );
        break;
       
     case XPR_CALL:
-      ret = constraintList_addList (ret,
+      ret = constraintList_addListFree (ret,
                                     exprNode_traversRequiresConstraints
                                    (exprData_getFcn (data) ) );
       /*@i11*/      //   exprNodeList_unparse (exprData_getArgs (data) );
          break;
       
     case XPR_RETURN:
-      ret = constraintList_addList (ret,
+      ret = constraintList_addListFree (ret,
                                    exprNode_traversRequiresConstraints
                                    (exprData_getSingle (data) ) );
       break;
@@ -1505,14 +1959,14 @@ constraintList exprNode_traversRequiresConstraints (exprNode e)
       break;
             
     case XPR_FACCESS:
-          ret = constraintList_addList (ret,
+          ret = constraintList_addListFree (ret,
                                    exprNode_traversRequiresConstraints
                                    (exprData_getFieldNode (data) ) );
        //exprData_getFieldName (data) ;
       break;
    
     case XPR_ARROW:
-        ret = constraintList_addList (ret,
+        ret = constraintList_addListFree (ret,
                                    exprNode_traversRequiresConstraints
                                    (exprData_getFieldNode (data) ) );
        //      exprData_getFieldName (data);
@@ -1527,14 +1981,14 @@ constraintList exprNode_traversRequiresConstraints (exprNode e)
       break;
     case XPR_POSTOP:
 
-           ret = constraintList_addList (ret,
+           ret = constraintList_addListFree (ret,
                                    exprNode_traversRequiresConstraints
                                    (exprData_getUopNode (data) ) );
           break;
           
     case XPR_CAST:
 
-      ret = constraintList_addList (ret,
+      ret = constraintList_addListFree (ret,
                                    exprNode_traversRequiresConstraints
                                    (exprData_getCastNode (data) ) );
       break;
@@ -1548,7 +2002,7 @@ constraintList exprNode_traversRequiresConstraints (exprNode e)
 
 
 /* walk down the tree and get all Ensures Constraints in each subexpression*/
-constraintList exprNode_traversEnsuresConstraints (exprNode e)
+/*@only@*/ constraintList exprNode_traversEnsuresConstraints (exprNode e)
 {
   exprNode t1;
 
@@ -1583,45 +2037,53 @@ constraintList exprNode_traversEnsuresConstraints (exprNode e)
     {
    case XPR_WHILEPRED:
       t1 = exprData_getSingle (data);
-      ret = constraintList_addList ( ret,exprNode_traversEnsuresConstraints (t1) );
+      ret = constraintList_addListFree ( ret,exprNode_traversEnsuresConstraints (t1) );
       break;
       
     case XPR_FETCH:
       
-      ret = constraintList_addList (ret,
+      ret = constraintList_addListFree (ret,
                                    exprNode_traversEnsuresConstraints
                                    (exprData_getPairA (data) ) );
         
-      ret = constraintList_addList (ret,
+      ret = constraintList_addListFree (ret,
                                    exprNode_traversEnsuresConstraints
                                    (exprData_getPairB (data) ) );
       break;
     case XPR_PREOP:
           
-      ret = constraintList_addList (ret,
+      ret = constraintList_addListFree (ret,
                                    exprNode_traversEnsuresConstraints
                                    (exprData_getUopNode (data) ) );
       break;
       
     case XPR_PARENS: 
-      ret = constraintList_addList (ret, exprNode_traversEnsuresConstraints
+      ret = constraintList_addListFree (ret, exprNode_traversEnsuresConstraints
                                    (exprData_getUopNode (data) ) );
       break;
+      
+    case XPR_INIT:
+      ret = constraintList_addListFree (ret,
+                                       exprNode_traversEnsuresConstraints
+                                       (exprData_getInitNode (data) ) );
+       break;
+
+
     case XPR_ASSIGN:
-        ret = constraintList_addList (ret,
+        ret = constraintList_addListFree (ret,
                                    exprNode_traversEnsuresConstraints
                                    (exprData_getOpA (data) ) );
         
-       ret = constraintList_addList (ret,
+       ret = constraintList_addListFree (ret,
                                    exprNode_traversEnsuresConstraints
                                    (exprData_getOpB (data) ) );
        break;
     case XPR_OP:
-       ret = constraintList_addList (ret,
+       ret = constraintList_addListFree (ret,
                                    exprNode_traversEnsuresConstraints
                                    (exprData_getOpA (data) ) );
         
-       ret = constraintList_addList (ret,
+       ret = constraintList_addListFree (ret,
                                    exprNode_traversEnsuresConstraints
                                    (exprData_getOpB (data) ) );
        break;
@@ -1633,20 +2095,20 @@ constraintList exprNode_traversEnsuresConstraints (exprNode e)
       
     case XPR_SIZEOF:
           
-       ret = constraintList_addList (ret,
+       ret = constraintList_addListFree (ret,
                                    exprNode_traversEnsuresConstraints
                                     (exprData_getSingle (data) ) );
        break;
       
     case XPR_CALL:
-      ret = constraintList_addList (ret,
+      ret = constraintList_addListFree (ret,
                                     exprNode_traversEnsuresConstraints
                                    (exprData_getFcn (data) ) );
       /*@i11*/      //   exprNodeList_unparse (exprData_getArgs (data) );
          break;
       
     case XPR_RETURN:
-      ret = constraintList_addList (ret,
+      ret = constraintList_addListFree (ret,
                                    exprNode_traversEnsuresConstraints
                                    (exprData_getSingle (data) ) );
       break;
@@ -1656,14 +2118,14 @@ constraintList exprNode_traversEnsuresConstraints (exprNode e)
       break;
             
     case XPR_FACCESS:
-          ret = constraintList_addList (ret,
+          ret = constraintList_addListFree (ret,
                                    exprNode_traversEnsuresConstraints
                                    (exprData_getFieldNode (data) ) );
        //exprData_getFieldName (data) ;
       break;
    
     case XPR_ARROW:
-        ret = constraintList_addList (ret,
+        ret = constraintList_addListFree (ret,
                                    exprNode_traversEnsuresConstraints
                                    (exprData_getFieldNode (data) ) );
        //      exprData_getFieldName (data);
@@ -1678,13 +2140,13 @@ constraintList exprNode_traversEnsuresConstraints (exprNode e)
       break;
     case XPR_POSTOP:
 
-           ret = constraintList_addList (ret,
+           ret = constraintList_addListFree (ret,
                                    exprNode_traversEnsuresConstraints
                                    (exprData_getUopNode (data) ) );
           break;
     case XPR_CAST:
 
-      ret = constraintList_addList (ret,
+      ret = constraintList_addListFree (ret,
                                    exprNode_traversEnsuresConstraints
                                    (exprData_getCastNode (data) ) );
       break;
@@ -1704,3 +2166,84 @@ DPRINTF( (message (
   return ret;
 }
 
+/*drl moved out of constraintResolve.c 07-02-001 */
+void checkArgumentList (/*@out@*/ exprNode temp, exprNodeList arglist, fileloc sequencePoint)
+{
+  temp->requiresConstraints = constraintList_makeNew();
+  temp->ensuresConstraints = constraintList_makeNew();
+  temp->trueEnsuresConstraints = constraintList_makeNew();
+  temp->falseEnsuresConstraints = constraintList_makeNew();
+  
+  exprNodeList_elements (arglist, el)
+    {
+      constraintList temp2;
+      exprNode_exprTraverse (el, FALSE, FALSE, sequencePoint);
+      temp2 = el->requiresConstraints;
+      el->requiresConstraints = exprNode_traversRequiresConstraints(el);
+      constraintList_free(temp2);
+
+      temp2 = el->ensuresConstraints;
+      el->ensuresConstraints  = exprNode_traversEnsuresConstraints(el);
+      constraintList_free(temp2);
+
+      temp->requiresConstraints = constraintList_addList(temp->requiresConstraints,
+                                                           el->requiresConstraints);
+      
+      temp->ensuresConstraints = constraintList_addList(temp->ensuresConstraints,
+                                                          el->ensuresConstraints);
+    }
+  end_exprNodeList_elements;
+  
+}
+
+/*drl moved out of constraintResolve.c 07-03-001 */
+constraintList exprNode_getPostConditions (exprNode fcn, exprNodeList arglist, exprNode fcnCall)
+{
+  constraintList postconditions;
+  uentry temp;
+  DPRINTF( (message ("Got call that %s ( %s) ",  exprNode_unparse(fcn),   exprNodeList_unparse (arglist ) ) ) );
+
+  temp = exprNode_getUentry (fcn);
+
+  postconditions = uentry_getFcnPostconditions (temp);
+
+  if (constraintList_isDefined(postconditions) )
+    {
+      postconditions = constraintList_doSRefFixConstraintParam (postconditions, arglist);
+      postconditions = constraintList_doFixResult (postconditions, fcnCall);
+    }
+  else
+    {
+      postconditions = constraintList_makeNew();
+    }
+  
+  return postconditions;
+}
+
+
+/*drl moved out of constraintResolve.c 07-02-001 */
+constraintList checkCall (/*@dependent@*/ exprNode fcn, exprNodeList arglist)
+{
+  constraintList preconditions;
+  uentry temp;
+  DPRINTF( (message ("Got call that %s ( %s) ",  exprNode_unparse(fcn),   exprNodeList_unparse (arglist ) ) ) );
+
+  temp = exprNode_getUentry (fcn);
+
+  preconditions = uentry_getFcnPreconditions (temp);
+
+  if (constraintList_isDefined(preconditions) )
+    {
+      preconditions = constraintList_togglePost (preconditions);
+      preconditions = constraintList_preserveCallInfo(preconditions, fcn);
+      preconditions = constraintList_doSRefFixConstraintParam (preconditions, arglist);
+    }
+  else
+    {
+      if (constraintList_isUndefined(preconditions) )
+       preconditions = constraintList_makeNew();
+    }
+  DPRINTF (( message("Done checkCall\n") ));
+  DPRINTF (( message("Returning list %q ", constraintList_printDetailed(preconditions) ) ));
+  return preconditions;
+}
This page took 0.111374 seconds and 4 git commands to generate.