*** empty log message ***

[splint.git] / src / constraintTerm.c

diff --git a/src/constraintTerm.c b/src/constraintTerm.c
index 580f0b9825860b15416f3993304f7b9833ba904f..bbba3b7f9f518eb7ea127f31c53a3cb89b2ebdd8 100644 (file)
--- a/src/constraintTerm.c
+++ b/src/constraintTerm.c
@@ -73,6 +73,51 @@ bool constraintTerm_isIntLiteral (constraintTerm term)
   return FALSE;
 }
 
+
+bool constraintTerm_isInitBlock (/*@observer@*/ /*@temp@*/ constraintTerm c) /*@*/
+{
+  llassert (c != NULL);
+  if (c->kind == EXPRNODE)
+    {
+      
+      if (exprNode_isInitBlock(c->value.expr) )
+       {
+         return TRUE;
+       }
+    }
+  return FALSE;
+}
+
+
+int constraintTerm_getInitBlockLength (/*@observer@*/ /*@temp@*/ constraintTerm c) /*@*/
+{
+
+  exprNodeList  list;
+  int ret;
+  llassert (c != NULL);
+  llassert (constraintTerm_isInitBlock (c) );
+  llassert (c->kind == EXPRNODE);
+
+  llassert(exprNode_isDefined(c->value.expr) );
+
+  if (exprNode_isUndefined(c->value.expr) )
+    {
+      return 1;
+    }
+
+  if (c->value.expr->edata == exprData_undefined)
+    {
+      return 1;
+    }
+  list = exprData_getArgs(c->value.expr->edata);
+
+  ret = exprNodeList_size(list);
+
+  return ret;  
+}
+
+
+
 bool constraintTerm_isStringLiteral (constraintTerm c) /*@*/
 {
   llassert (c != NULL);
@@ -86,6 +131,8 @@ bool constraintTerm_isStringLiteral (constraintTerm c) /*@*/
   return FALSE;
 }
 
+
+
 cstring constraintTerm_getStringLiteral (constraintTerm c)
 {
   llassert (c != NULL);
@@ -205,7 +252,7 @@ static cstring constraintTerm_getName (constraintTerm term)
       s = message ("%s", exprNode_unparse (term->value.expr) );
       break;
     case INTLITERAL:
-      s = message (" %ld ", term->value.intlit);
+      s = message (" %d ", (int) term->value.intlit);
       break;
       
     case SREF:
@@ -264,7 +311,7 @@ cstring constraintTerm_print (constraintTerm term)  /*@*/
                   fileloc_unparse (term->loc) );
       break;
     case INTLITERAL:
-      s = message (" %ld ", term->value.intlit);
+      s = message (" %d ", (int)term->value.intlit);
       break;
       
     case SREF:
@@ -347,7 +394,7 @@ long constraintTerm_getValue (constraintTerm term)
       BADBRANCH;
     }
 
-  BADBRANCH;
+  BADEXIT;
 }
 
 /* same and similar are similar but not the same*/
@@ -547,12 +594,12 @@ void constraintTerm_dump ( /*@observer@*/ constraintTerm t,  FILE *f)
   
   uentry ue;
   
-  char * str;
-  char * os;
+  char *str;
+  char *os;
 
   str = mstring_create (MAX_DUMP_LINE_LENGTH);
   os = str;
-  str = fgets(os, MAX_DUMP_LINE_LENGTH, f);
+  str = fgets (os, MAX_DUMP_LINE_LENGTH, f);
 
   kind = (constraintTermType) reader_getInt(&str);
   str = fgets(os, MAX_DUMP_LINE_LENGTH, f);
@@ -583,7 +630,7 @@ void constraintTerm_dump ( /*@observer@*/ constraintTerm t,  FILE *f)
 
            ostr2 = str2;
            t = ctype_undump(&str2) ;
-           s = sRef_makeParam (param, t );
+           s = sRef_makeParam (param, t, stateInfo_makeLoc (g_currentloc));
            free (ostr2);
          }
        else  //This must be an identified that we can search for