]> andersk Git - splint.git/blobdiff - src/constraintGeneration.c
Merged with Dave Evans's changes.
[splint.git] / src / constraintGeneration.c
index 2d4d64942b335071273ee8b531f23a9d81fa8eba..b5dffe21ed849c51424bc479463d961cdf00aaf2 100644 (file)
@@ -1,8 +1,10 @@
 
 /*
-** constraintList.c
+** constraintGeneration.c
 */
 
+//#define DEBUGPRINT 1
+
 # include <ctype.h> /* for isdigit */
 # include "lclintMacros.nf"
 # include "basic.h"
 # include "aliasChecks.h"
 # include "exprNodeSList.h"
 
-# include "exprData.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 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 void  exprNode_multiStatement (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);
+static constraintList exprNode_traversTrueEnsuresConstraints (exprNode e);
+static constraintList exprNode_traversFalseEnsuresConstraints (exprNode e);
 
-extern constraintList reflectChanges (constraintList pre2, constraintList post1);
+exprNode makeDataTypeConstraints (/*@returned@*/ exprNode e);
 
-void mergeResolve (exprNode parent, exprNode child1, exprNode child2);
-exprNode makeDataTypeConstraints (exprNode e);
 constraintList constraintList_makeFixedArrayConstraints (sRefSet s);
-constraintList checkCall (exprNode fcn, exprNodeList arglist);
 
-bool exprNode_isUnhandled (exprNode e)
+//bool exprNode_testd()
+//{
+  /*        if ( ( (exprNode_isError  ) ) )
+         {
+         }
+        if ( ( (e_1  ) ) )
+         {
+         }
+  */
+//}
+
+static bool exprNode_isUnhandled (exprNode e)
 {
   llassert( exprNode_isDefined(e) );
   switch (e->kind)
@@ -65,7 +77,7 @@ bool exprNode_isUnhandled (exprNode e)
     case XPR_SWITCH:
     case XPR_FTCASE:
     case XPR_CASE:
-    case XPR_INIT:
+      //    case XPR_INIT:
     case XPR_NODE:
       DPRINTF((message ("Warning current constraint generation does not handle expression %s", exprNode_unparse(e)) ) );
       return TRUE;
@@ -99,16 +111,17 @@ bool /*@alt void@*/ exprNode_generateConstraints (/*@temp@*/ 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) )
     {
       DPRINTF( (message("Warning ignoring %s", exprNode_unparse (e) ) ) );
-        e->requiresConstraints = constraintList_new();
-       e->ensuresConstraints = constraintList_new();
-       e->trueEnsuresConstraints = constraintList_new();
-       e->falseEnsuresConstraints = constraintList_new();
-       llassert(FALSE);
-       return FALSE;
+        return FALSE;
     }
 
   
@@ -123,7 +136,12 @@ bool /*@alt void@*/ exprNode_generateConstraints (/*@temp@*/ exprNode e)
     }
   else
     {
-      //    llassert(FALSE);
+      fileloc loc;
+      
+      loc = exprNode_getNextSequencePoint(e); 
+      exprNode_exprTraverse(e, FALSE, FALSE, loc);
+      
+      fileloc_free(loc);
       return FALSE;
     }
   
@@ -131,14 +149,14 @@ bool /*@alt void@*/ exprNode_generateConstraints (/*@temp@*/ exprNode e)
     constraintList c;
 
     c = constraintList_makeFixedArrayConstraints (e->uses);
-  e->requiresConstraints = reflectChanges (e->requiresConstraints, c);
+    e->requiresConstraints = 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;
 }
 
@@ -169,24 +187,44 @@ if (exprNode_handleError (e) != NULL)
 
 }
 
-bool exprNode_stmt (exprNode e)
+static void exprNode_stmt (exprNode e)
 {
   exprNode snode;
   fileloc loc;
-  bool notError;
-
+  cstring s;
+  
   if (exprNode_isError(e) )
     {
-      return FALSE;
+      return; // FALSE;
     }
-  e->requiresConstraints = constraintList_new();
-  e->ensuresConstraints  = constraintList_new();
+  /*e->requiresConstraints = constraintList_makeNew();
+    e->ensuresConstraints  = constraintList_makeNew(); */
   //  e = makeDataTypeConstraints(e);
   
  
   DPRINTF(( "STMT:") );
-  DPRINTF ( ( cstring_toCharsSafe ( exprNode_unparse(e)) )
-          );
+  s =  exprNode_unparse(e);
+  // DPRINTF ( ( message("STMT: %s ") ) );
+  
+  if (e->kind == XPR_INIT)
+    {
+      constraintList tempList;
+      DPRINTF (("Init") );
+      DPRINTF ( (message ("%s ", exprNode_unparse (e)) ) );
+      loc = exprNode_getNextSequencePoint(e); /* reduces to an expression */
+      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);
+      constraintList_free(tempList);
+      return; // notError;
+    }
+  
   if (e->kind != XPR_STMT)
     {
       
@@ -196,7 +234,9 @@ bool exprNode_stmt (exprNode e)
        {
          return exprNode_multiStatement (e );
        }
-      //  llassert(FALSE);
+      DPRINTF( (message ("Ignoring non-statement %s", exprNode_unparse(e) ) ) );
+      return; //TRUE;
+      //      llassert(FALSE);
     }
  
   DPRINTF (("Stmt") );
@@ -210,40 +250,56 @@ bool exprNode_stmt (exprNode e)
   
   if (exprNode_isMultiStatement (snode))
     {
-      //      llassert(FALSE);
-      return exprNode_multiStatement (snode);
+       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  (exprNode e)
 {
   exprNode stmt1, stmt2;
   if (exprNode_isError (e) )
     {
-      return FALSE;
+      return; // FALSE;
     }
 
-  e->requiresConstraints = constraintList_new();
-  e->ensuresConstraints  = constraintList_new();
+  /*
+    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:") );
@@ -264,84 +320,274 @@ bool exprNode_stmtList  (exprNode e)
   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;
 }
 
-
-exprNode doIf (exprNode e, exprNode test, exprNode body)
+static exprNode doIf (/*@returned@*/ exprNode e, exprNode test, exprNode body)
 {
-  test->trueEnsuresConstraints =  exprNode_traversTrueEnsuresConstraints(test);
+  constraintList temp;
+
+  DPRINTF ((message ("doIf: %s ", exprNode_unparse(e) ) ) );
+
+  llassert(exprNode_isDefined(test) );
+  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);
+  constraintList_free(temp);
+
+
+  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) ) ) );
+  
+  constraintList_free(e->requiresConstraints);
   e->requiresConstraints = reflectChanges (body->requiresConstraints, test->trueEnsuresConstraints);
-  e->requiresConstraints = reflectChanges (e->requiresConstraints,
+
+  e->requiresConstraints = reflectChangesFreePre (e->requiresConstraints,
                                           test->ensuresConstraints);
+  temp = e->requiresConstraints;
+  e->requiresConstraints = constraintList_mergeRequires (e->requiresConstraints, test->requiresConstraints);
+  constraintList_free(temp);
+
+
 #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_mergeEnsuresFreeFirst (e->ensuresConstraints,
+                                                       test->falseEnsuresConstraints);
+    }
+  
+  DPRINTF ((message ("doIf: if requiers %s ", constraintList_print(e->requiresConstraints) ) ) );
+  
   return e;
 }
 
+/*drl added 3/4/2001
+  Also used for condition i.e. ?: operation
+
+  Precondition
+  This function assumes that p, trueBranch, falseBranch have have all been traversed
+  for constraints i.e. we assume that exprNode_traversEnsuresConstraints,
+  exprNode_traversRequiresConstraints,  exprNode_traversTrueEnsuresConstraints,
+  exprNode_traversFalseEnsuresConstraints have all been run
+*/
+
+
+static exprNode doIfElse (/*@returned@*/ exprNode e, exprNode p, exprNode trueBranch, exprNode falseBranch)
+{
+  
+    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 = reflectChangesFreePre (t, p->ensuresConstraints);
+
+    cons = reflectChanges (falseBranch->requiresConstraints, p->falseEnsuresConstraints);
+    cons  = reflectChangesFreePre (cons, c1);
+
+    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;
+}
+
+static exprNode doWhile (/*@returned@*/ exprNode e, exprNode test, exprNode body)
+{
+  DPRINTF ((message ("doWhile: %s ", exprNode_unparse(e) ) ) );
+  return doIf (e, test, body);
+}
+
 constraintList constraintList_makeFixedArrayConstraints (sRefSet s)
 {
   constraintList ret;
-  ret = constraintList_new();
+  constraint con;
+  ret = constraintList_makeNew();
  
   sRefSet_elements (s, el)
     {
-    llassert (el);
+      //    llassert (el);
     if (sRef_isFixedArray(el) )
       {
-       int s;
-       constraint con;
-       s = sRef_getArraySize(el);
+       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
+       size = sRef_getArraySize(el);
        DPRINTF( (message("%s is a fixed array with size %d",
-                         sRef_unparse(el), s) ) );
-       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
       {
        DPRINTF( (message("%s is not a fixed array",
                          sRef_unparse(el)) ) );
+     
+    
+    if (sRef_isExternallyVisible (el) )
+      {
+       /*DPRINTF( (message("%s is externally visible",
+                         sRef_unparse(el) ) ));
+       con = constraint_makeSRefWriteSafeInt(el, 0);
+       ret = constraintList_add(ret, con);
+       
+       con = constraint_makeSRefReadSafeInt(el, 0);
+       
+       ret = constraintList_add(ret, con);*/
+      }
       }
     }
   end_sRefSet_elements
 
+    DPRINTF(( message("constraintList_makeFixedArrayConstraints returning %s",
+                     constraintList_print(ret) ) ));
     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);
-  
-/*   sRefSet_elements (e->uses, el) */
-/*     llassert (el); */
-/*     if (sRef_isFixedArray(el) ) */
-/*       { */
-/*     int s; */
-/*     constraint con; */
-/*     s = sRef_getArraySize(el); */
-/*     DPRINTF( (message("%s is a fixed array with size %d", */
-/*                       sRef_unparse(el), s) ) ); */
-/*     con = constraint_makeSRefWriteSafeInt (el, (s - 1)); */
-/*     e->ensuresConstraints = constraintList_add(e->ensuresConstraints, */
-/*                                                con); */
-/*       } */
-/*     else */
-/*       { */
-/*     DPRINTF( (message("%s is not a fixed array", */
-/*                       sRef_unparse(el)) ) ); */
-/*       } */
-/*   end_sRefSet_elements */
-
+  e->ensuresConstraints = constraintList_addListFree (e->ensuresConstraints, c);
  return e;
 }
 
+static void doFor (exprNode e, exprNode forPred, exprNode forBody)
+{
+  exprNode init, test, inc;
+  //merge the constraints: modle as if statement
+      /* init
+       if (test)
+          for body
+          inc        */
+      init  =  exprData_getTripleInit (forPred->edata);
+      test =   exprData_getTripleTest (forPred->edata);
+      inc  =   exprData_getTripleInc (forPred->edata);
+
+      if ( ( (exprNode_isError (test) /*|| (exprNode_isError(init) )*/ ) || (exprNode_isError (inc) ) ) )
+       {
+         DPRINTF ((message ("strange for statement:%s, ignoring it", exprNode_unparse(e) ) ) );
+         return;
+       }
+
+      forLoopHeuristics(e, forPred, forBody);
+      
+      constraintList_free(e->requiresConstraints);
+      e->requiresConstraints = reflectChanges (forBody->requiresConstraints, test->ensuresConstraints);
+      e->requiresConstraints = reflectChangesFreePre (e->requiresConstraints, test->trueEnsuresConstraints);
+      e->requiresConstraints = reflectChangesFreePre (e->requiresConstraints, forPred->ensuresConstraints);
+
+      if (!forBody->canBreak)
+       {
+         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
+       {
+         DPRINTF(("Can break") );
+       }
+      
+}
+
+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))) ));
+
+  body = exprData_getPairB (data);
+  
+  // exprNode_generateConstraints(body);
+  
+  // e->requiresConstraints = constraintList_copy ( body->requiresConstraints );
+  //e->ensuresConstraints = constraintList_copy ( body->ensuresConstraints );
+  
+  return e;
+}
+
 
-bool exprNode_multiStatement (exprNode e)
+void exprNode_multiStatement (exprNode e)
 {
   
   bool ret;
@@ -349,14 +595,16 @@ bool exprNode_multiStatement (exprNode e)
   exprNode e1, e2;
   exprNode p, trueBranch, falseBranch;
   exprNode forPred, forBody;
-  exprNode init, test, inc;
-  constraintList cons;
-  constraintList t, f;
-  e->requiresConstraints = constraintList_new();
-  e->ensuresConstraints = constraintList_new();
-  e->trueEnsuresConstraints = constraintList_new();
-  e->falseEnsuresConstraints = constraintList_new();
+  exprNode test;
 
+  constraintList temp;
+
+  //  constraintList t, f;
+  /*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),
@@ -364,7 +612,7 @@ bool exprNode_multiStatement (exprNode e)
   
   if (exprNode_handleError (e))
     {
-      return FALSE;
+      return; // FALSE;
     }
 
   data = e->edata;
@@ -379,32 +627,46 @@ bool exprNode_multiStatement (exprNode e)
       forPred = exprData_getPairA (data);
       forBody = exprData_getPairB (data);
       
-  
       //first generate the constraints
       exprNode_generateConstraints (forPred);
       exprNode_generateConstraints (forBody);
-      
-      //merge the constraints: modle as if statement
-      /* init
-       if (test)
-          for body
-          inc        */
-      init  =  exprData_getTripleInit (forPred->edata);
-      test =   exprData_getTripleTest (forPred->edata);
-      inc  =   exprData_getTripleInc (forPred->edata);
 
-      test->trueEnsuresConstraints =  exprNode_traversTrueEnsuresConstraints(test);
-      //      e->requiresConstraints = reflectChanges (body->requiresConstraints, test->trueEnsuresConstraints);
-      e->requiresConstraints = reflectChanges (e->requiresConstraints, test->ensuresConstraints);
-      
+
+      doFor (e, forPred, forBody);
+     
       break;
 
     case XPR_FORPRED:
       //            ret = message ("for (%s; %s; %s)",
       exprNode_generateConstraints (exprData_getTripleInit (data) );
-      exprNode_exprTraverse (exprData_getTripleTest (data),FALSE, FALSE, exprNode_loc(e));
+      test = exprData_getTripleTest (data);
+      exprNode_exprTraverse (test,FALSE, FALSE, exprNode_loc(e));
+      exprNode_generateConstraints (exprData_getTripleInc (data) );
+    
+      if (!exprNode_isError(test) )
+       {
+         constraintList temp2;
+         temp2 = test->trueEnsuresConstraints;
+         test->trueEnsuresConstraints =  exprNode_traversTrueEnsuresConstraints(test);
+         constraintList_free(temp2);
+       }
+      
       exprNode_generateConstraints (exprData_getTripleInc (data));
       break;
+
+    case XPR_WHILE:
+      e1 = exprData_getPairA (data);
+      e2 = exprData_getPairB (data);
+      
+       exprNode_exprTraverse (e1,
+                             FALSE, FALSE, exprNode_loc(e1));
+       
+       exprNode_generateConstraints (e2);
+
+       e = doWhile (e, e1, e2);
+      
+      break; 
+
     case XPR_IF:
       DPRINTF(( "IF:") );
       DPRINTF ((exprNode_unparse(e) ) );
@@ -416,13 +678,13 @@ bool exprNode_multiStatement (exprNode e)
                             FALSE, FALSE, exprNode_loc(e1));
 
       exprNode_generateConstraints (e2);
-
       e = doIf (e, e1, e2);
   
       
       //      e->constraints = constraintList_exprNodemerge (exprData_getPairA (data),exprData_getPairB(data));
       break;
-      
+
+     
     case XPR_IFELSE:
       DPRINTF(("Starting IFELSE"));
       //      ret = message ("if (%s) %s else %s",
@@ -435,83 +697,67 @@ bool exprNode_multiStatement (exprNode e)
       exprNode_generateConstraints (trueBranch);
       exprNode_generateConstraints (falseBranch);
 
-      // do requires clauses
-      
-      cons = reflectChanges (trueBranch->requiresConstraints, p->trueEnsuresConstraints);
-      cons  = reflectChanges (cons,
-                             p->ensuresConstraints);
-      e->requiresConstraints = constraintList_copy (cons);
+      temp = p->ensuresConstraints;
+      p->ensuresConstraints = exprNode_traversEnsuresConstraints (p);
+      constraintList_free(temp);
 
-      cons = reflectChanges (falseBranch->requiresConstraints, p->falseEnsuresConstraints);
-      cons  = reflectChanges (cons,
-                             p->ensuresConstraints);
-      e->requiresConstraints = constraintList_addList (e->requiresConstraints,
-                                                      cons);
-      e->requiresConstraints = constraintList_addList (e->requiresConstraints,
-                                                      p->requiresConstraints);
-      
-      // do ensures clauses
-      // find the  the ensures lists for each subbranch
-      t = constraintList_mergeEnsures (p->trueEnsuresConstraints, trueBranch->ensuresConstraints);
-      t = constraintList_mergeEnsures (p->ensuresConstraints, t);
+      temp = p->requiresConstraints;
+      p->requiresConstraints = exprNode_traversRequiresConstraints (p);
+      constraintList_free(temp);
 
-      f = constraintList_mergeEnsures (p->falseEnsuresConstraints, falseBranch->ensuresConstraints);
-      f = constraintList_mergeEnsures (p->ensuresConstraints, f);
+      temp = p->trueEnsuresConstraints;
+      p->trueEnsuresConstraints =  exprNode_traversTrueEnsuresConstraints(p);
+      constraintList_free(temp);
 
-      // find ensures for whole if/else statement
-      
-      e->ensuresConstraints = constraintList_logicalOr (t, f);
+      temp = p->falseEnsuresConstraints;
+      p->falseEnsuresConstraints =  exprNode_traversFalseEnsuresConstraints(p);
+      constraintList_free(temp);
+
+          e = doIfElse (e, p, trueBranch, falseBranch);
       DPRINTF( ("Done IFELSE") );
       break;
-    case XPR_WHILE:
-       e1 = exprData_getPairA (data);
-       e2 = exprData_getPairB (data);
-      exprNode_exprTraverse (e1,
-                            FALSE, FALSE, exprNode_loc(e1));
+    case XPR_DOWHILE:
 
+      e2 = (exprData_getPairB (data));
+      e1 = (exprData_getPairA (data));
+
+      DPRINTF((message ("do { %s } while (%s)", exprNode_unparse(e2), exprNode_unparse(e1) ) ));
       exprNode_generateConstraints (e2);
+      exprNode_generateConstraints (e1);
+      e = exprNode_copyConstraints (e, e2);
+      DPRINTF ((message ("e = %s  ", constraintList_print(e->requiresConstraints) ) ));
       
-      e1->trueEnsuresConstraints =  exprNode_traversTrueEnsuresConstraints(e1);
-      
-      e->requiresConstraints = reflectChanges (e2->requiresConstraints, e1->trueEnsuresConstraints);
-      
-      e->requiresConstraints = reflectChanges (e->requiresConstraints,
-                                              e1->ensuresConstraints);
-#warning bad
-      e->ensuresConstraints = constraintList_copy (e1->ensuresConstraints);
-      
-      //      ret = message ("while (%s) %s",
-                    exprNode_generateConstraints (exprData_getPairA (data));
-                    exprNode_generateConstraints (exprData_getPairB (data));
-                    //      e->constraints = constraintList_exprNodemerge (exprData_getPairA (data), exprData_getPairB (data) );
-      break;
-
-    case XPR_DOWHILE:
-      // ret = message ("do { %s } while (%s)",
-                    exprNode_generateConstraints (exprData_getPairB (data));
-                    exprNode_generateConstraints (exprData_getPairA (data));
       break;
       
     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;
 
+    case XPR_SWITCH:
+      e = doSwitch (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
@@ -556,13 +802,13 @@ bool lltok_isBoolean_Op (lltok tok)
 }
 
 
-void exprNode_booleanTraverse (exprNode e, bool definatelv, bool definaterv,  fileloc sequencePoint)
+static void exprNode_booleanTraverse (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);
@@ -629,54 +875,71 @@ if (lltok_isLe_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);
+     constraintList_free(temp);
+
       e->falseEnsuresConstraints =constraintList_addList(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);
+      
+      temp = tempList;
       tempList = constraintList_logicalOr (tempList, t1->trueEnsuresConstraints);
-      e->trueEnsuresConstraints =constraintList_addList(e->trueEnsuresConstraints, tempList);
+      constraintList_free(temp);
+
+
+      e->trueEnsuresConstraints =constraintList_addListFree(e->trueEnsuresConstraints, tempList);
       
     }
+ 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@*/ fileloc sequencePoint)
 {
-  exprNode t1, t2;
+  exprNode t1, t2, fcn;
   lltok tok;
   bool handledExprNode;
   exprData data;
   constraint cons;
 
-     if (exprNode_handleError (e))
-     {
-       return FALSE;
-     }
+  constraintList temp;
 
-   DPRINTF((message ("exprNode_exprTraverset Analysising %s %s at", exprNode_unparse( e),
+  if (exprNode_isError(e) )
+    {
+      return; // FALSE;
+    }
+  
+  DPRINTF((message ("exprNode_exprTraverset Analysising %s %s at", exprNode_unparse( e),
                    fileloc_unparse(exprNode_getfileloc(e) ) ) ) );
-
-   e->requiresConstraints = constraintList_new();
-   e->ensuresConstraints = constraintList_new();
-   e->trueEnsuresConstraints = constraintList_new();;
-   e->falseEnsuresConstraints = constraintList_new();;
-
+  
+  /*e->requiresConstraints = constraintList_makeNew();
+  e->ensuresConstraints = constraintList_makeNew();
+  e->trueEnsuresConstraints = constraintList_makeNew();;
+  e->falseEnsuresConstraints = constraintList_makeNew();;
+  */
+  if (exprNode_isUnhandled (e) )
+     {
+       return; // FALSE;
+     }
    //   e = makeDataTypeConstraints (e);
  
    handledExprNode = TRUE;
@@ -711,58 +974,52 @@ bool exprNode_exprTraverse (exprNode e, bool definatelv, bool definaterv,  filel
       e->requiresConstraints = constraintList_add(e->requiresConstraints, cons);
       cons = constraint_makeEnsureMaxReadAtLeast (t1, t2, sequencePoint);
       e->ensuresConstraints = constraintList_add(e->ensuresConstraints, cons);
+
+      cons = constraint_makeEnsureLteMaxRead (t2, t1);
+      e->trueEnsuresConstraints = constraintList_add(e->trueEnsuresConstraints, cons);
+       
       //      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);
       
             /*@i325 Should check which is array/index. */
       break;
-    case XPR_PREOP: 
-      t1 = exprData_getUopNode(data);
-      //lltok_unparse (exprData_getUopTok (data));
-      exprNode_exprTraverse (t1, definatelv, definaterv, sequencePoint );
-      /*handle * pointer access */
+      
+    case XPR_PARENS: 
+      exprNode_exprTraverse (exprData_getUopNode (e->edata), definatelv, definaterv, sequencePoint);
+      //    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 );
 
-      /*@ i 325 do ++ and -- */
-      if (lltok_isMult( exprData_getUopTok (data) ) )
+      /* this test is nessecary because some expressions generate a null expression node.  function pointer do that -- drl */
+        if ( (!exprNode_isError (e))  &&  (!exprNode_isError(t2)) )
        {
-         if (definatelv)
-           {
-             cons = constraint_makeWriteSafeInt (t1, 0);
-           }
-         else
-           {
-             cons = constraint_makeReadSafeInt (t1, 0);
-           }
-             e->requiresConstraints = constraintList_add(e->requiresConstraints, cons);
+         cons =  constraint_makeEnsureEqual (e, t2, sequencePoint);
+         e->ensuresConstraints = constraintList_add(e->ensuresConstraints, cons);
        }
       
-      /* ! expr */
-      if (lltok_isNot_Op (exprData_getUopTok (data) ) )
-       {
-         e->trueEnsuresConstraints  = constraintList_copy (t1->falseEnsuresConstraints);
-         e->falseEnsuresConstraints = constraintList_copy (t1->trueEnsuresConstraints);
-       }
       break;
-      
-    case XPR_PARENS: 
-      exprNode_exprTraverse (exprData_getUopNode (e->edata), definatelv, definaterv, sequencePoint);
-      //    e->constraints = constraintList_exprNodemerge (exprData_getUopNode (e->edata), exprNode_undefined);
-      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));
+      #warning check this for += -= etc
       exprNode_exprTraverse (t2, definatelv, TRUE, sequencePoint );
 
-      //      DPRINTF ( ("Doing ASSign"));
-      cons =  constraint_makeEnsureEqual (t1, t2, sequencePoint);
-      
-      e->ensuresConstraints = constraintList_add(e->ensuresConstraints, cons);
-
+      /* this test is nessecary because some expressions generate a null expression node.  function pointer do that -- drl */
+      if ( (!exprNode_isError (t1))  &&  (!exprNode_isError(t2)) )
+       {
+         cons =  constraint_makeEnsureEqual (t1, t2, sequencePoint);
+         e->ensuresConstraints = constraintList_add(e->ensuresConstraints, cons);
+       }
       break;
     case XPR_OP:
       t1 = exprData_getOpA (data);
@@ -772,13 +1029,29 @@ bool exprNode_exprTraverse (exprNode e, bool definatelv, bool definaterv,  filel
       tok = exprData_getOpTok (data);
       exprNode_exprTraverse (t2, definatelv, definaterv, sequencePoint );
 
+      #warning fix definatelv and definaterv
+      
+      if (tok.tok == ADD_ASSIGN)
+       {
+         cons = constraint_makeAddAssign (t1, t2,  sequencePoint );
+         e->ensuresConstraints = constraintList_add(e->ensuresConstraints, cons);
+       }
+
+      if (tok.tok == SUB_ASSIGN)
+       {
+         cons = constraint_makeSubtractAssign (t1, t2,  sequencePoint );
+         e->ensuresConstraints = constraintList_add(e->ensuresConstraints, cons);
+       }
+
+      
+      
       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) ) );
+      #warning make sure the case can be ignored..
       
       break;
       
@@ -788,14 +1061,24 @@ bool exprNode_exprTraverse (exprNode e, bool definatelv, bool definaterv,  filel
       break;
       
     case XPR_CALL:
-      exprNode_exprTraverse (exprData_getFcn (data), definatelv, definaterv, sequencePoint );
-      exprNodeList_unparse (exprData_getArgs (data) );
-      DPRINTF ( (message ("Got call that %s ( %s) ",  exprNode_unparse(exprData_getFcn(data) ),   exprNodeList_unparse (exprData_getArgs (data) ) ) ) );
+      fcn = exprData_getFcn(data);
+      
+      exprNode_exprTraverse (fcn, definatelv, definaterv, sequencePoint );
+      DPRINTF ( (message ("Got call that %s ( %s) ",  exprNode_unparse(fcn),   exprNodeList_unparse (exprData_getArgs (data) ) ) ) );
 
-     
+      fcn->requiresConstraints = constraintList_addListFree (fcn->requiresConstraints,
+                                                checkCall (fcn, exprData_getArgs (data)  ) );      
 
-      e->requiresConstraints = constraintList_addList (e->requiresConstraints,
-                                                checkCall (exprData_getFcn (data), exprData_getArgs (data)  ) );      
+      fcn->ensuresConstraints = constraintList_addListFree (fcn->ensuresConstraints,
+                                                getPostConditions(fcn, exprData_getArgs (data),e  ) );
+
+      t1 = exprNode_createNew (exprNode_getType (e) );
+      
+      checkArgumentList (t1, exprData_getArgs(data), sequencePoint);
+
+      
+      mergeResolve (e, t1, fcn);
+      
       //      e->constraints = constraintList_add (e->constraints, constraint_create (e,exprNode_undefined, GT,  CALLSAFE ) );
       break;
       
@@ -804,55 +1087,231 @@ 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: 
+      t1 = exprData_getUopNode(data);
+      tok = (exprData_getUopTok (data));
+      //lltok_unparse (exprData_getUopTok (data));
+      exprNode_exprTraverse (t1, definatelv, definaterv, sequencePoint );
+      /*handle * pointer access */
+      if (lltok_isInc_Op (tok) )
+       {
+         DPRINTF(("doing ++(var)"));
+         t1 = exprData_getUopNode (data);
+         cons = constraint_makeMaxSetSideEffectPostIncrement (t1, sequencePoint );
+         e->ensuresConstraints = constraintList_add (e->ensuresConstraints, cons);
+       }
+      else if (lltok_isDec_Op (tok) )
+       {
+         DPRINTF(("doing --(var)"));
+         t1 = exprData_getUopNode (data);
+         cons = constraint_makeMaxSetSideEffectPostDecrement (t1, sequencePoint );
+         e->ensuresConstraints = constraintList_add (e->ensuresConstraints, cons);
+       }
+      else if (lltok_isMult( tok  ) )
+       {
+         if (definatelv)
+           {
+             cons = constraint_makeWriteSafeInt (t1, 0);
+           }
+         else
+           {
+             cons = constraint_makeReadSafeInt (t1, 0);
+           }
+             e->requiresConstraints = constraintList_add(e->requiresConstraints, cons);
+       }
+      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 ++"));
          t1 = exprData_getUopNode (data);
          cons = constraint_makeMaxSetSideEffectPostIncrement (t1, sequencePoint );
          e->ensuresConstraints = constraintList_add (e->ensuresConstraints, cons);
-         //      cons = constraint_makeMaxReadSideEffectPostIncrement (t1, sequencePoint );
-         //e->ensuresConstraints = constraintList_add (e->ensuresConstraints, cons);
        }
+       if (lltok_isDec_Op (exprData_getUopTok (data) ) )
+       {
+         DPRINTF(("doing --"));
+         t1 = exprData_getUopNode (data);
+         cons = constraint_makeMaxSetSideEffectPostDecrement (t1, sequencePoint );
+         e->ensuresConstraints = constraintList_add (e->ensuresConstraints, cons);
+       }
+      break;
+    case XPR_CAST:
+      llassert(FALSE);
+       exprNode_exprTraverse (exprData_getCastNode (data), definatelv, definaterv, sequencePoint );
+      break;
+    case XPR_COND:
+      {
+       exprNode pred, true, false;
+          llassert(FALSE);
+      pred = exprData_getTriplePred (data);
+      true = exprData_getTripleTrue (data);
+      false = 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 );
+      
+      temp =       true->ensuresConstraints;
+      true->ensuresConstraints = exprNode_traversEnsuresConstraints(true);
+      constraintList_free(temp);
+
+
+      temp =       true->requiresConstraints;
+      true->requiresConstraints = exprNode_traversRequiresConstraints(true);
+      constraintList_free(temp);
+
+      
+      temp =       true->trueEnsuresConstraints;
+      true->trueEnsuresConstraints =  exprNode_traversTrueEnsuresConstraints(true);
+      constraintList_free(temp);
+
+      temp =       true->falseEnsuresConstraints;
+      true->falseEnsuresConstraints = exprNode_traversFalseEnsuresConstraints(true);
+      constraintList_free(temp);
+
+      //dfdf
+      exprNode_exprTraverse (false, FALSE, TRUE, sequencePoint );
+      
+      temp =       false->ensuresConstraints;
+      false->ensuresConstraints = exprNode_traversEnsuresConstraints(false);
+      constraintList_free(temp);
+
+
+      temp =       false->requiresConstraints;
+      false->requiresConstraints = exprNode_traversRequiresConstraints(false);
+      constraintList_free(temp);
+
+      
+      temp =       false->trueEnsuresConstraints;
+      false->trueEnsuresConstraints =  exprNode_traversTrueEnsuresConstraints(false);
+      constraintList_free(temp);
+
+      temp =       false->falseEnsuresConstraints;
+      false->falseEnsuresConstraints = exprNode_traversFalseEnsuresConstraints(false);
+      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, true, sequencePoint);
+      false->ensuresConstraints = constraintList_add(false->ensuresConstraints, cons);
+
+      e = doIfElse (e, pred, true, false);
+      
+      }
       break;
+    case XPR_COMMA:
+      llassert(FALSE);
+      t1 = exprData_getPairA (data);
+      t2 = exprData_getPairB (data);
+    /* we essiantially treat this like expr1; expr2
+     of course sequencePoint isn't adjusted so this isn't completely accurate
+    problems../  */
+      exprNode_exprTraverse (t1, FALSE, FALSE, sequencePoint );
+      exprNode_exprTraverse (t2, definatelv, definaterv, sequencePoint );
+      mergeResolve (e, t1, t2);
+      break;
+      
     default:
       handledExprNode = FALSE;
     }
 
   e->requiresConstraints =  constraintList_preserveOrig ( e->requiresConstraints);
   e->ensuresConstraints  =  constraintList_preserveOrig ( e->ensuresConstraints);
+  e->requiresConstraints = constraintList_addGeneratingExpr ( e->requiresConstraints, e);
+
+  e->ensuresConstraints  = constraintList_addGeneratingExpr ( e->ensuresConstraints, e);
+
+  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; 
 }
 
 
 constraintList exprNode_traversTrueEnsuresConstraints (exprNode e)
 {
-  //  exprNode t1, t2;
+  exprNode t1;
 
   bool handledExprNode;
   //  char * mes;
@@ -861,7 +1320,7 @@ constraintList exprNode_traversTrueEnsuresConstraints (exprNode e)
 
    if (exprNode_handleError (e))
      {
-       ret = constraintList_new();
+       ret = constraintList_makeNew();
        return ret;
      }
   ret = constraintList_copy (e->trueEnsuresConstraints );
@@ -872,43 +1331,47 @@ constraintList exprNode_traversTrueEnsuresConstraints (exprNode e)
   
   switch (e->kind)
     {
+    case XPR_WHILEPRED:
+      t1 = exprData_getSingle (data);
+      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_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;
@@ -920,20 +1383,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;
@@ -943,14 +1406,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);
@@ -965,10 +1428,156 @@ 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_addListFree (ret,
+                                   exprNode_traversTrueEnsuresConstraints
+                                   (exprData_getCastNode (data) ) );
+      break;
+
+    default:
+      break;
+    }
+
+  return ret;
+}
+
+constraintList exprNode_traversFalseEnsuresConstraints (exprNode e)
+{
+   exprNode t1;
+
+  bool handledExprNode;
+  //  char * mes;
+  exprData data;
+  constraintList ret;
+
+   if (exprNode_handleError (e))
+     {
+       ret = constraintList_makeNew();
+       return ret;
+     }
+  ret = constraintList_copy (e->falseEnsuresConstraints );
+   
+   handledExprNode = TRUE;
+   
+  data = e->edata;
+  
+  switch (e->kind)
+    {
+   case XPR_WHILEPRED:
+      t1 = exprData_getSingle (data);
+      ret = constraintList_addListFree ( ret,exprNode_traversFalseEnsuresConstraints (t1) );
+      break;
+      
+    case XPR_FETCH:
+      
+      ret = constraintList_addListFree (ret,
+                                   exprNode_traversFalseEnsuresConstraints
+                                   (exprData_getPairA (data) ) );
+        
+      ret = constraintList_addListFree (ret,
+                                   exprNode_traversFalseEnsuresConstraints
+                                   (exprData_getPairB (data) ) );
+      break;
+    case XPR_PREOP:
+          
+      ret = constraintList_addListFree (ret,
+                                   exprNode_traversFalseEnsuresConstraints
+                                   (exprData_getUopNode (data) ) );
+      break;
+      
+    case XPR_PARENS: 
+      ret = constraintList_addListFree (ret, exprNode_traversFalseEnsuresConstraints
+                                   (exprData_getUopNode (data) ) );
+      break;
+    case XPR_ASSIGN:
+        ret = constraintList_addListFree (ret,
+                                   exprNode_traversFalseEnsuresConstraints
+                                   (exprData_getOpA (data) ) );
+        
+       ret = constraintList_addListFree (ret,
+                                   exprNode_traversFalseEnsuresConstraints
+                                   (exprData_getOpB (data) ) );
+       break;
+    case XPR_OP:
+       ret = constraintList_addListFree (ret,
+                                   exprNode_traversFalseEnsuresConstraints
+                                   (exprData_getOpA (data) ) );
+        
+       ret = constraintList_addListFree (ret,
+                                   exprNode_traversFalseEnsuresConstraints
+                                   (exprData_getOpB (data) ) );
+       break;
+    case XPR_SIZEOFT:
+      
+      //      ctype_unparse (qtype_getType (exprData_getType (data) ) );
+      
+      break;
+      
+    case XPR_SIZEOF:
+          
+       ret = constraintList_addListFree (ret,
+                                   exprNode_traversFalseEnsuresConstraints
+                                    (exprData_getSingle (data) ) );
+       break;
+      
+    case XPR_CALL:
+      ret = constraintList_addListFree (ret,
+                                    exprNode_traversFalseEnsuresConstraints
+                                   (exprData_getFcn (data) ) );
+      /*@i11*/      //   exprNodeList_unparse (exprData_getArgs (data) );
+         break;
+      
+    case XPR_RETURN:
+      ret = constraintList_addListFree (ret,
+                                   exprNode_traversFalseEnsuresConstraints
+                                   (exprData_getSingle (data) ) );
+      break;
+  
+    case XPR_NULLRETURN:
+      //      cstring_makeLiteral ("return");;
+      break;
+            
+    case XPR_FACCESS:
+          ret = constraintList_addListFree (ret,
+                                   exprNode_traversFalseEnsuresConstraints
+                                   (exprData_getFieldNode (data) ) );
+       //exprData_getFieldName (data) ;
+      break;
+   
+    case XPR_ARROW:
+        ret = constraintList_addListFree (ret,
+                                   exprNode_traversFalseEnsuresConstraints
+                                   (exprData_getFieldNode (data) ) );
+       //      exprData_getFieldName (data);
+      break;
+   
+    case XPR_STRINGLITERAL:
+      //      cstring_copy (exprData_getLiteral (data));
+      break;
+      
+    case XPR_NUMLIT:
+      //      cstring_copy (exprData_getLiteral (data));
+      break;
+    case XPR_POSTOP:
+
+           ret = constraintList_addListFree (ret,
+                                   exprNode_traversFalseEnsuresConstraints
+                                   (exprData_getUopNode (data) ) );
+          break;
+          
+    case XPR_CAST:
+
+      ret = constraintList_addListFree (ret,
+                                   exprNode_traversFalseEnsuresConstraints
+                                   (exprData_getCastNode (data) ) );
+      break;
+
     default:
       break;
     }
@@ -978,9 +1587,9 @@ constraintList exprNode_traversTrueEnsuresConstraints (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, t2;
+  exprNode t1;
 
   bool handledExprNode;
   //  char * mes;
@@ -989,7 +1598,7 @@ constraintList exprNode_traversRequiresConstraints (exprNode e)
 
    if (exprNode_handleError (e))
      {
-       ret = constraintList_new();
+       ret = constraintList_makeNew();
        return ret;
      }
   ret = constraintList_copy (e->requiresConstraints );
@@ -1000,43 +1609,47 @@ constraintList exprNode_traversRequiresConstraints (exprNode e)
   
   switch (e->kind)
     {
+   case XPR_WHILEPRED:
+      t1 = exprData_getSingle (data);
+      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_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;
@@ -1048,20 +1661,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;
@@ -1071,14 +1684,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);
@@ -1093,10 +1706,18 @@ 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_addListFree (ret,
+                                   exprNode_traversRequiresConstraints
+                                   (exprData_getCastNode (data) ) );
+      break;
+
     default:
       break;
     }
@@ -1106,9 +1727,9 @@ 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, t2;
+  exprNode t1;
 
   bool handledExprNode;
   //  char * mes;
@@ -1120,7 +1741,7 @@ constraintList exprNode_traversEnsuresConstraints (exprNode e)
 
    if (exprNode_handleError (e))
      {
-       ret = constraintList_new();
+       ret = constraintList_makeNew();
        return ret;
      }
    
@@ -1139,43 +1760,47 @@ constraintList exprNode_traversEnsuresConstraints (exprNode e)
   
   switch (e->kind)
     {
+   case XPR_WHILEPRED:
+      t1 = exprData_getSingle (data);
+      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_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;
@@ -1187,20 +1812,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;
@@ -1210,14 +1835,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);
@@ -1232,10 +1857,17 @@ 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_addListFree (ret,
+                                   exprNode_traversEnsuresConstraints
+                                   (exprData_getCastNode (data) ) );
+      break;
+      
     default:
       break;
     }
This page took 0.10505 seconds and 4 git commands to generate.