Merged this branch with the one in the splint.sf.net repository.

[splint.git] / src / constraintGeneration.c

diff --git a/src/constraintGeneration.c b/src/constraintGeneration.c
index c08063d3ce058c39864a8ee5c57167983410d798..6ab433f0efe1e284e73f64d507fdb338137fc1cf 100644 (file)
--- a/src/constraintGeneration.c
+++ b/src/constraintGeneration.c
@@ -153,7 +153,6 @@ static void exprNode_stmt (/*@temp@*/ exprNode e)
 {
   exprNode snode;
   fileloc loc;
-  cstring s;
   
   if (exprNode_isError(e))
     {
@@ -164,8 +163,8 @@ static void exprNode_stmt (/*@temp@*/ exprNode e)
     e->ensuresConstraints  = constraintList_makeNew(); */
  
   DPRINTF(("expNode_stmt: STMT:"));
-  s =  exprNode_unparse(e);
-  DPRINTF ((message("exprNode_stmt: STMT: %s ", s)));
+
+  DPRINTF ((message("exprNode_stmt: STMT: %s ",  exprNode_unparse(e) ) ) );
   
   if (e->kind == XPR_INIT)
     {
@@ -548,6 +547,7 @@ static void doFor (/*@dependent@*/ exprNode e, /*@dependent@*/ exprNode forPred,
     }
 }
 
+/*@i2323*/
 static /*@dependent@*/ exprNode exprNode_makeDependent(/*@returned@*/  exprNode e)
 {
   /* !!! DRL - this is ridiculous!  Read the manual on memory annotations please! */
@@ -1396,7 +1396,12 @@ void exprNode_exprTraverse (exprNode e, bool definatelv, bool definaterv,  /*@ob
        {
          break;
        }
-      else if (lltok_isExcl_Op (tok))
+      /* drl -04-06-2002 fixed to handle unary + */
+      else if (lltok_isPlus_Op (tok) )
+       {
+         break;
+       } 
+      else if ( lltok_isExcl_Op (tok) )
        {
          break;
        }