Fixed bug preventing the expression of a return statement from being checked for errors.

diff --git a/src/constraintGeneration.c b/src/constraintGeneration.c
index 54179c43ec2a6da117a9a566c4395e6d972bb8f8..e3c0a1f5400ba73daefce377decd84f02cc3aa8a 100644 (file)
--- a/src/constraintGeneration.c
+++ b/src/constraintGeneration.c
@@ -42,6 +42,8 @@
 
 static bool exprNode_handleError(/*@dependent@*/ exprNode p_e);
 
+static void exprNode_stmt ( /*@dependent@*/ /*@temp@*/ exprNode p_e);
+
 static bool exprNode_isMultiStatement(/*@dependent@*/ exprNode p_e);
 static void  exprNode_multiStatement (/*@dependent@*/ exprNode p_e);
 
@@ -116,7 +118,7 @@ bool /*@alt void@*/ exprNode_generateConstraints (/*@dependent@*/ exprNode e)
   if (exprNode_isUnhandled (e) )
     {
       DPRINTF((message("Warning ignoring %s", exprNode_unparse (e) ) ) );
-        return FALSE;
+      return FALSE;
     }
 
   DPRINTF((message ("exprNode_generateConstraints Analysising %s at %s", exprNode_unparse( e),
@@ -128,13 +130,16 @@ bool /*@alt void@*/ exprNode_generateConstraints (/*@dependent@*/ exprNode e)
     }
   else
     {
-      fileloc loc;
+/*        fileloc loc; */
       
-      loc = exprNode_getNextSequencePoint(e); 
-      exprNode_exprTraverse(e, FALSE, FALSE, loc);
+/*        loc = exprNode_getNextSequencePoint(e);  */
+/*        exprNode_exprTraverse(e, FALSE, FALSE, loc); */
       
-      fileloc_free(loc);
+/*        fileloc_free(loc); */
+
+      exprNode_stmt(e);
       return FALSE;
+      
     }
   
   {
@@ -213,6 +218,22 @@ static void exprNode_stmt ( /*@dependent@*/ /*@temp@*/ exprNode e)
       constraintList_free(tempList);
       return; 
     }
+
+  /*drl 2/13/002 patched bug so return statement will be checked*/
+  /*return is a stmt not not expression ...*/
+  if (e->kind == XPR_RETURN)
+    {
+      constraintList tempList;
+      
+      loc = exprNode_getNextSequencePoint(e); /* reduces to an expression */
+      
+      exprNode_exprTraverse (exprData_getSingle (e->edata), FALSE, TRUE, loc);
+      fileloc_free(loc);
+      
+      tempList = e->requiresConstraints;
+      e->requiresConstraints = exprNode_traversRequiresConstraints(e);
+      constraintList_free(tempList);
+    }
   
   if (e->kind != XPR_STMT)
     {
@@ -224,9 +245,15 @@ static void exprNode_stmt ( /*@dependent@*/ /*@temp@*/ exprNode e)
        {
          exprNode_multiStatement (e); /* evans 2001-08-21: spurious return removed */
        }
-
-      DPRINTF((message ("Ignoring non-statement %s", exprNode_unparse(e) ) ) );
-      return; 
+      else
+       {
+         loc = exprNode_getNextSequencePoint(e); /* reduces to an expression */
+         
+         exprNode_exprTraverse (e, FALSE, TRUE, loc);
+         fileloc_free(loc);
+         
+         }
+         return; 
     }
  
   DPRINTF (("Stmt") );
@@ -2175,7 +2202,7 @@ we'll include it in a production release when its stable...
 
   ctype ct, rt;
   
-  TPRINTF((
+  DPRINTF((
           message("doing findStructs: %s", exprNodeList_unparse(arglist) )
           ));
 

diff --git a/src/ctbase.i b/src/ctbase.i
index 473c7817a2dd6d1966694ce6eb2ddbd82e8ac1fa..9c2fddf052817370e6fcea3cdd467769ca815867 100644 (file)
--- a/src/ctbase.i
+++ b/src/ctbase.i
@@ -1167,7 +1167,7 @@ ctbase_expectFunction (ctype c)
 }
 
 static bool
-ctbase_isExpectFunction (ctbase ct)
+ctbase_isExpectFunction (ctbase ct) /*@*/
 {
   return (ct->type == CT_EXPFCN);
 }