Fixed /*@i@*/ splintme errors.

[splint.git] / src / constraintExpr.c

diff --git a/src/constraintExpr.c b/src/constraintExpr.c
index df1abb5d6eb45dc6307821015d0d8dc67772415c..f6284c6ea5d0de7719b63cf4b4546601559fec6d 100644 (file)
--- a/src/constraintExpr.c
+++ b/src/constraintExpr.c
@@ -481,12 +481,13 @@ constraintExpr constraintExpr_makeExprNode (exprNode e)
         ret = constraintExpr_parseMakeBinaryOp (ce1, tok, ce2);         
        }
 
-     
-     /*@i333*/
-     /* uncomment this block to activate the cheesy heuristic
-       for handling sizeof expressions
+
+        /* define this block to activate the cheesy heuristic
+       for handling sizeof expressions*/
+#if 0     
+
        
-     / *
+     /*
        drl 8-11-001
        
        We handle expressions containing sizeof with the rule
@@ -494,7 +495,7 @@ constraintExpr constraintExpr_makeExprNode (exprNode e)
 
        This is the total wronge way to do this but...
        it may be better than nothing
-     * /
+     */
 
      
       
@@ -513,7 +514,8 @@ constraintExpr constraintExpr_makeExprNode (exprNode e)
           ret =  oldconstraintExpr_makeTermExprNode (e);
           }
        }
-     */
+#endif
+     
      else
         ret = oldconstraintExpr_makeTermExprNode (e);
    
@@ -553,7 +555,6 @@ constraintExpr constraintExpr_makeExprNode (exprNode e)
    case XPR_COMMA:
      t = exprData_getPairA(data);
      ret = constraintExpr_makeExprNode(t);
-     /*@i3434*/ /* drl: I'm not sure if this is right.  I'm adding a break to quiet Splint */
      break;
    default:
      ret = oldconstraintExpr_makeTermExprNode (e);
@@ -1052,17 +1053,17 @@ bool constraintExpr_same (constraintExpr expr1, constraintExpr expr2)
   BADEXIT;
 }
 
-bool constraintExpr_search (/*@observer@*/ constraintExpr c, /*@observer@*/ constraintExpr old)
+bool 
+constraintExpr_search (/*@observer@*/ constraintExpr c, 
+                      /*@observer@*/ constraintExpr old)
 {
   bool ret = FALSE;
   constraintExprKind kind;
   constraintExpr temp;
   
-  if ( constraintExpr_similar (c, old) )
+  if (constraintExpr_similar (c, old))
     {
-      DPRINTF((message ("Found  %q",
-                       constraintExpr_unparse(old)
-                       )));
+      DPRINTF (("Found  %q", constraintExpr_unparse (old)));
       return TRUE;
     }
 
@@ -1480,10 +1481,7 @@ static /*@only@*/ constraintExpr constraintExpr_simplifyunaryExpr (/*@only@*/ co
   DPRINTF ((message ("Doing constraintExpr_simplify:%s", constraintExpr_unparse (c) ) ) );  
   
 
-  /*@i22*/
   
-  /* drl: I think this is an Splint bug */
-
   llassert ( constraintExpr_isDefined (c) );
   if (constraintExpr_isUndefined (c) )
     {
@@ -1543,11 +1541,11 @@ cstring constraintExpr_unparse (/*@temp@*/ /*@observer@*/ constraintExpr ex) /*@
 
             if (context_getFlag (FLG_PARENCONSTRAINT) )
              {
-               st = message ("(%q) ", constraintTerm_print (constraintExprData_termGetTerm (ex->data)));
+               st = message ("(%q) ", constraintTerm_unparse (constraintExprData_termGetTerm (ex->data)));
              }
            else
              {
-               st = message ("%q", constraintTerm_print (constraintExprData_termGetTerm (ex->data)));
+               st = message ("%q", constraintTerm_unparse (constraintExprData_termGetTerm (ex->data)));
              }
       break;
     case unaryExpr:
@@ -1888,32 +1886,29 @@ doFixResultTerm (/*@only@*/ constraintExpr e, /*@exposed@*/ exprNode fcnCall)
 {
   constraintTerm t;
   sRef s;
-
-  
   constraintExprData data;
   constraintExprKind kind;
-  
   constraintExpr ret;
-
-  llassert(constraintExpr_isDefined (e) );
+  
+  llassert (constraintExpr_isDefined (e) );
   
   data = e->data;
   kind = e->kind;
-
-  llassert(kind == term);
-
+  
+  llassert (kind == term);
+  
   t = constraintExprData_termGetTerm (data);
-  llassert (constraintTerm_isDefined(t) );
-
+  llassert (constraintTerm_isDefined (t));
+  
   ret = e;
-  switch (constraintTerm_getKind(t) )
+
+  switch (constraintTerm_getKind (t))
     {
-    case EXPRNODE:
-      break;
-    case INTLITERAL:
+    case CTT_EXPR:
+    case CTT_INTLITERAL:
       break;
       
-    case SREF:
+    case CTT_SREF:
       s = constraintTerm_getSRef(t);
       if (sRef_isResult (s))
        {
@@ -1933,7 +1928,11 @@ doFixResultTerm (/*@only@*/ constraintExpr e, /*@exposed@*/ exprNode fcnCall)
   return ret;
   
 }
-/*
+
+#if 0
+
+/*to be used for structure checking */
+
 / *@only@* / static constraintExpr
 doSRefFixInvarConstraintTerm (/ *@only@* / constraintExpr e,
  sRef s, ctype ct)
@@ -1957,21 +1956,21 @@ doSRefFixInvarConstraintTerm (/ *@only@* / constraintExpr e,
 
   switch (constraintTerm_getKind(t))
     {
-    case EXPRNODE:
-      DPRINTF((message ("%q @ %q ", constraintTerm_print(t),
+    case CTT_EXPR:
+      DPRINTF((message ("%q @ %q ", constraintTerm_unparse(t),
                        fileloc_unparse (constraintTerm_getFileloc(t) ) ) ));
       break;
-    case INTLITERAL:
-      DPRINTF((message (" %q ", constraintTerm_print (t)) ));
+    case CTT_INTLITERAL:
+      DPRINTF((message (" %q ", constraintTerm_unparse (t)) ));
       break;
       
-    case SREF:
+    case CTT_SREF:
       / * evans 2001-07-24: constants should use the original term * /
       if (!constraintTerm_canGetValue (t))
        {
          sRef snew;
          DPRINTF ((message("Doing sRef_fixInvarConstraint for %q ", 
-                            constraintTerm_print (t) ) ));
+                            constraintTerm_unparse (t) ) ));
 
          snew = fixSref (ct, s, constraintTerm_getSRef(t));
 
@@ -1992,7 +1991,7 @@ doSRefFixInvarConstraintTerm (/ *@only@* / constraintExpr e,
   return ret;
   
 }
-*/
+#endif
  
 /*drl moved from constriantTerm.c 5/20/001*/
 /*@only@*/ static constraintExpr 
@@ -2026,20 +2025,19 @@ doSRefFixConstraintParamTerm (/*@only@*/ constraintExpr e, /*@observer@*/ /*@tem
 
   switch (constraintTerm_getKind(t))
     {
-    case EXPRNODE:
-      DPRINTF((message ("%q @ %q ", constraintTerm_print(t),
+    case CTT_EXPR:
+      DPRINTF((message ("%q @ %q ", constraintTerm_unparse(t),
                        fileloc_unparse (constraintTerm_getFileloc(t) ) ) ));
       break;
-    case INTLITERAL:
-      DPRINTF((message (" %q ", constraintTerm_print (t)) ));
+    case CTT_INTLITERAL:
+      DPRINTF((message (" %q ", constraintTerm_unparse (t)) ));
       break;
-      
-    case SREF:
+    case CTT_SREF:
       /* evans 2001-07-24: constants should use the original term */
       if (!constraintTerm_canGetValue (t))
        {
          DPRINTF ((message("Doing sRef_fixConstraintParam for %q ", 
-                            constraintTerm_print (t) ) ));
+                            constraintTerm_unparse (t) ) ));
          ret = sRef_fixConstraintParam (constraintTerm_getSRef(t), arglist);
          
          constraintExpr_free (e);
@@ -2538,7 +2536,7 @@ static /*@only@*/ constraintExpr  constraintTerm_simpleDivTypeExprNode(/*@only@*
                }
              if (ctype_match (ctype_makePointer(ct2),ct) )
                {
-                 /* sloopy way to do this... */ /*@i22*/
+                 /*a bit of a sloopy way to do this but... */
                                  constraintExpr_free(e);
                  return constraintExpr_makeExprNode(t1);
                }
@@ -2556,7 +2554,6 @@ static /*@only@*/ constraintExpr  constraintTerm_simpleDivTypeExprNode(/*@only@*
 
 static /*@only@*/ constraintExpr simpleDivType (/*@only@*/ constraintExpr e, ctype ct)
 {
-  /*@i333*/
   DPRINTF(( (message("simpleDiv got %s ", constraintExpr_unparse(e) ) )
            ));