From 4a689c7f182a8860dda9ef42e85afc3fbc9b7cab Mon Sep 17 00:00:00 2001
From: drl7x <drl7x>
Date: Mon, 7 Jan 2002 03:30:45 +0000
Subject: [PATCH] Adding redundantconstraints flags.  Set constraintor and
 showconstraintlocation flags to true.

---
 src/constraintResolve.c | 7 +++++++
 src/context.c           | 5 +++++
 src/flags.def           | 8 ++++++++
 3 files changed, 20 insertions(+)

diff --git a/src/constraintResolve.c b/src/constraintResolve.c
index e2f1dc1..5231742 100644
--- a/src/constraintResolve.c
+++ b/src/constraintResolve.c
@@ -125,6 +125,13 @@ static /*@only@*/ constraintList reflectChangesEnsuresFree1 (/*@only@*/ constrai
 
   DPRINTF((message ("constraintList_mergeRequires: merging  %s and %s ", constraintList_print (list1), constraintList_print(list2) ) ) );
 
+  if (context_getFlag (FLG_REDUNDANTCONSTRAINTS) )
+    {
+      ret = constraintList_copy(list1);
+      ret = constraintList_addList(ret, list2);
+      return ret;
+    }
+    
   /* get constraints in list1 not satified by list2 */
   temp = constraintList_reflectChanges(list1, list2);
   DPRINTF((message ("constraintList_mergeRequires: temp = %s", constraintList_print(temp) ) ) );
diff --git a/src/context.c b/src/context.c
index f345427..4eeadda 100644
--- a/src/context.c
+++ b/src/context.c
@@ -911,6 +911,11 @@ context_resetAllFlags (void)
 
   gc.flags[FLG_GNUEXTENSIONS] = TRUE;
 
+  /*
+    Changed for 3.0.0.19
+   */
+  gc.flags[FLG_ORCONSTRAINT] = TRUE;
+  gc.flags[FLG_CONSTRAINTLOCATION] = TRUE;
   /*
   ** On by default for Win32, but not Unix (to support MS/VC++ error message format).
   */
diff --git a/src/flags.def b/src/flags.def
index 11654e8..bdcf162 100644
--- a/src/flags.def
+++ b/src/flags.def
@@ -1878,6 +1878,14 @@ static flaglist flags =
     "Display function post conditions.",
     0, 0
   },
+  {
+    FK_BOUNDS, FK_DISPLAY, modeFlag,
+    "redundantconstraints",
+    FLG_REDUNDANTCONSTRAINTS,
+    "display seemingly redundant constraints",
+    "Display seemingly redundant constraints",
+    0, 0
+  },
   /*drl7x added 6/18/01 */    
   {
     FK_BOUNDS, FK_MEMORY, modeFlag,
-- 
2.45.1