Fixed data on readme.

[splint.git] / src / constraintTerm.c

diff --git a/src/constraintTerm.c b/src/constraintTerm.c
index 8d1aa1306a42f8d319effd00326941488f61a6e7..234598a7ed5f880f16ac18cd53d379ca8841a332 100644 (file)
--- a/src/constraintTerm.c
+++ b/src/constraintTerm.c
@@ -38,8 +38,12 @@
 # include "exprNodeSList.h"
 
 /*@-czechfcns@*/
+/*@-nullderef@*/ /* !!! DRL needs to fix this code! */
+/*@-nullstate@*/ /* !!! DRL needs to fix this code! */
+/*@-nullpass@*/ /* !!! DRL needs to fix this code! */
+/*@-temptrans@*/ /* !!! DRL needs to fix this code! */
 
-/*@access exprNode @*/
+/*@access exprNode@*/ /* !!! NO! Don't do this recklessly! */
 
 bool constraintTerm_isDefined (constraintTerm t)
 {
@@ -528,7 +532,7 @@ bool constraintTerm_similar (constraintTerm term1, constraintTerm term2)
     }       
 }
 
-void constraintTerm_dump ( /*@observer@*/ constraintTerm t,  FILE *f)
+void constraintTerm_dump (/*@observer@*/ constraintTerm t,  FILE *f)
 {
   fileloc loc;
   constraintTermValue value;
@@ -548,8 +552,7 @@ void constraintTerm_dump ( /*@observer@*/ constraintTerm t,  FILE *f)
       
     case EXPRNODE:
       u = exprNode_getUentry(t->value.expr);
-      fprintf(f, "%s\n", cstring_toCharsSafe( uentry_rawName (u) )
-             );
+      fprintf (f, "%s\n", cstring_toCharsSafe (uentry_rawName (u)));
       break;
       
     case SREF:
@@ -562,7 +565,7 @@ void constraintTerm_dump ( /*@observer@*/ constraintTerm t,  FILE *f)
          {
            fprintf(f, "Result\n");
          }
-       else if (sRef_isParam (s ) )
+       else if (sRef_isParam (s))
          {
            int param;
            ctype ct;
@@ -577,10 +580,14 @@ void constraintTerm_dump ( /*@observer@*/ constraintTerm t,  FILE *f)
            fprintf(f, "Param %s %d\n", cstring_toCharsSafe(ctString), (int) param );
            cstring_free(ctString);
          }
+       else if (sRef_isField (s) )
+         {
+           fprintf(f, "sRef_dump %s\n", cstring_toCharsSafe(sRef_dump(s)) );
+         }
        else
          {
            u = sRef_getUentry(s);
-           fprintf(f, "%s\n", cstring_toCharsSafe(uentry_rawName (u) ) );
+           fprintf (f, "%s\n", cstring_toCharsSafe (uentry_rawName (u)));
          }
        
       }
@@ -644,9 +651,14 @@ void constraintTerm_dump ( /*@observer@*/ constraintTerm t,  FILE *f)
 
            ostr2 = str2;
            t = ctype_undump(&str2) ;
-           s = sRef_makeParam (param, t, stateInfo_makeLoc (g_currentloc));
+           s = sRef_makeParam (param, t, stateInfo_makeLoc (g_currentloc, SA_CREATED));
            free (ostr2);
          }
+       else if (strcmp (term, "sRef_dump" ) == 0 )
+         {
+           reader_checkChar(&str, ' ');
+           s = sRef_undump (&str);
+         }
        else  /* This must be an identified that we can search for in usymTab */
          {
            cstring termStr = cstring_makeLiteralTemp(term);
@@ -724,3 +736,37 @@ ctype constraintTerm_getCType (constraintTerm term)
   return ct;
 }
 
+bool constraintTerm_isConstantOnly (constraintTerm term)
+{  
+  switch (term->kind)
+    {
+    case EXPRNODE:
+      if (exprNode_isNumLiteral (term->value.expr) ||
+         exprNode_isStringLiteral (term->value.expr) ||
+         exprNode_isCharLiteral  (term->value.expr) )
+       {
+         return TRUE;
+       }
+      else
+       {
+         return FALSE;
+       }
+
+    case INTLITERAL:
+      return TRUE;
+            
+    case SREF:
+      if ( sRef_isConst (term->value.sref) )
+       {
+         return TRUE;
+       }
+      else
+       {
+         return FALSE;
+       }
+    default:
+      BADEXIT;
+    }
+  
+  BADEXIT;
+}