Committing after merging Evan's changes.

[splint.git] / src / constraintExpr.c

diff --git a/src/constraintExpr.c b/src/constraintExpr.c
index 5ea57e0da93595c468447e1282f73123202aee0a..7093b6efe48731be4b496935b9186240efc422b3 100644 (file)
--- a/src/constraintExpr.c
+++ b/src/constraintExpr.c
@@ -1888,25 +1888,23 @@ 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 CTT_EXPR:
     case CTT_INTLITERAL:
@@ -1932,7 +1930,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)
@@ -1991,7 +1993,7 @@ doSRefFixInvarConstraintTerm (/ *@only@* / constraintExpr e,
   return ret;
   
 }
-*/
+#endif
  
 /*drl moved from constriantTerm.c 5/20/001*/
 /*@only@*/ static constraintExpr