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

[splint.git] / src / constraintList.c

diff --git a/src/constraintList.c b/src/constraintList.c
index fe65c3c9ea05650b5bd70d3bb181359f081ec15b..cdfe8821a52ed904f0e14a5348b82a0ca2e346be 100644 (file)
--- a/src/constraintList.c
+++ b/src/constraintList.c
@@ -36,7 +36,7 @@
 /*@-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! */
+
 
 /*@iter constraintList_elements_private_only (sef constraintList x, yield only constraint el); @*/
 # define constraintList_elements_private_only(x, m_el) \
@@ -288,14 +288,10 @@ constraintList_print (/*@temp@*/ constraintList s) /*@*/
          cstring temp1;
 
          if (context_getFlag (FLG_ORCONSTRAINT))
-           {
              temp1 = constraint_printOr(current);
-           }
-         else
-           {
-             temp1 = constraint_print (current);
-           }
-         type = message ("%q %q\n", type, temp1 );
+           else
+             temp1 = constraint_print(current);
+         type = message ("%q %q ", type, temp1 );
        }
 
       if (first)
@@ -305,7 +301,7 @@ constraintList_print (/*@temp@*/ constraintList s) /*@*/
        }
       else
        {
-         st = message ("%q, %q", st, type);
+         st = message ("%q /\\ %q", st, type);
        }
     }