review comments

Author: NinaRanns

libstdc++-v3/include/std/contracts

@@ -79,8 +79,8 @@ namespace contracts
     post = 2,
     assert = 3,
     // From P3290
-    cassert = 4,
-    manual = 5
+    manual = 4,
+    cassert = 5
     /* to be extended with implementation−defined values and by future extensions */
     /* Implementation−defined values should have a minimum value of 1000. */
     };
@@ -98,10 +98,10 @@ namespace contracts
   };
 
   enum class detection_mode  {
-    predicate_false = 1,
-    evaluation_exception = 2,
   // From P3290
-	unspecified = 3
+    unspecified = 0,
+    predicate_false = 1,
+    evaluation_exception = 3
     /* to be extended with implementation−defined values and by future extensions
 	 Implementation−defined values should have a minimum value of 1000. */
   };
@@ -158,9 +158,6 @@ namespace contracts
 	// cannot be assigned to
 	contract_violation& operator=(const contract_violation&) = delete;
 
-	/* see below */
-	//~contract_violation();
-
 	const char* comment() const noexcept { return _M_comment; }
 	detection_mode mode() const noexcept { return _M_detection_mode; }
 	std::exception_ptr evaluation_exception () const noexcept {
@@ -175,7 +172,7 @@ namespace contracts
 	assertion_kind kind() const noexcept { return _M_assertion_kind; }
 	std::source_location location() const noexcept { return _M_source_location; }
 	evaluation_semantic semantic() const noexcept { return _M_evaluation_semantic; }
-	};
+  };
 
   void invoke_default_contract_violation_handler(const contract_violation&) noexcept;
 

libstdc++-v3/testsuite/18_support/contracts/handle_enforced_contract_violation.cc

@@ -18,13 +18,9 @@
 // { dg-options "-g0 -fcontracts -fcontracts-nonattr -fcontract-evaluation-semantic=observe" }
 // { dg-do run { target c++2a } }
 
+#include <contracts>
 #include <exception>
 #include <cstdlib>
-#include <testsuite_hooks.h>
-#include <cstring>
-#include <iostream>
-
-#include "../../../include/std/contracts"
 
 void my_term()
 {

libstdc++-v3/testsuite/18_support/contracts/handle_enforced_contract_violation2.cc

@@ -18,13 +18,10 @@
 // { dg-options "-g0 -fcontracts -fcontracts-nonattr -fcontract-evaluation-semantic=observe" }
 // { dg-do run { target c++2a } }
 
+#include <contracts>
 #include <exception>
-#include <cstdlib>
 #include <testsuite_hooks.h>
 
-#include "../../../include/std/contracts"
-
-
 struct MyException{};
 
 void handle_contract_violation(const std::contracts::contract_violation& v)
@@ -46,5 +43,5 @@ int main()
   }
   VERIFY( exception_thrown == true);
 }
-// { dg-output "contract violation in function int main.* at .*:41: test comment.*" }
+// { dg-output "contract violation in function int main.* at .*:38: test comment.*" }
 // { dg-output "assertion_kind: manual, semantic: enforce, mode: unspecified, terminating: yes" }

libstdc++-v3/testsuite/18_support/contracts/handle_enforced_contract_violation3.cc

@@ -18,13 +18,10 @@
 // { dg-options "-g0 -fcontracts -fcontracts-nonattr -fcontract-evaluation-semantic=ignore" }
 // { dg-do run { target c++2a } }
 
+#include <contracts>
 #include <exception>
 #include <cstdlib>
 #include <testsuite_hooks.h>
-#include <cstring>
-#include <iostream>
-
-#include "../../../include/std/contracts"
 
 struct MyException{};
 
@@ -54,5 +51,5 @@ int main()
   // We should not get here
   return 1;
 }
-// { dg-output "contract violation in function int main.* at .*:49: test comment.*" }
+// { dg-output "contract violation in function int main.* at .*:46: test comment.*" }
 // { dg-output "assertion_kind: manual, semantic: enforce, mode: unspecified, terminating: yes" }

libstdc++-v3/testsuite/18_support/contracts/handle_enforced_contract_violation4.cc

@@ -18,12 +18,11 @@
 // { dg-options "-g0 -fcontracts -fcontracts-nonattr -fcontract-evaluation-semantic=quick_enforce" }
 // { dg-do run { target c++2a } }
 
+#include <contracts>
 #include <exception>
 #include <cstdlib>
 #include <testsuite_hooks.h>
 
-#include "../../../include/std/contracts"
-
 void my_term()
 {
   std::exit(0);
@@ -38,5 +37,5 @@ int main()
   // We should not get here
   return 1;
 }
-// { dg-output "contract violation in function int main.* at .*:37: test comment.*" }
+// { dg-output "contract violation in function int main.* at .*:36: test comment.*" }
 // { dg-output "assertion_kind: manual, semantic: enforce, mode: unspecified, terminating: yes" }

libstdc++-v3/testsuite/18_support/contracts/handle_observed_contract_violation.cc

@@ -18,17 +18,11 @@
 // { dg-options "-g0 -fcontracts -fcontracts-nonattr -fcontract-evaluation-semantic=enforce" }
 // { dg-do run { target c++2a } }
 
-#include <exception>
-#include <cstdlib>
-#include <testsuite_hooks.h>
-#include <cstring>
-#include <iostream>
-
-#include "../../../include/std/contracts"
+#include <contracts>
 
 int main()
 {
   std::contracts::handle_observed_contract_violation("test comment");
 }
-// { dg-output "contract violation in function int main.* at .*:31: test comment.*" }
+// { dg-output "contract violation in function int main.* at .*:25: test comment.*" }
 // { dg-output "assertion_kind: manual, semantic: observe, mode: unspecified, terminating: no" }

libstdc++-v3/testsuite/18_support/contracts/handle_observed_contract_violation2.cc

@@ -18,12 +18,9 @@
 // { dg-options "-g0 -fcontracts -fcontracts-nonattr -fcontract-evaluation-semantic=enforce" }
 // { dg-do run { target c++2a } }
 
-#include <exception>
-#include <cstdlib>
+#include <contracts>
 #include <testsuite_hooks.h>
 
-#include "../../../include/std/contracts"
-
 struct MyException{};
 
 void handle_contract_violation(const std::contracts::contract_violation& v)
@@ -44,5 +41,5 @@ int main()
   }
   VERIFY( exception_thrown == true);
 }
-// { dg-output "contract violation in function int main.* at .*:39: test comment.*" }
+// { dg-output "contract violation in function int main.* at .*:36: test comment.*" }
 // { dg-output "assertion_kind: manual, semantic: observe, mode: unspecified, terminating: no" }

libstdc++-v3/testsuite/18_support/contracts/handle_observed_contract_violation3.cc

@@ -18,11 +18,9 @@
 // { dg-options "-g0 -fcontracts -fcontracts-nonattr -fcontract-evaluation-semantic=ignore" }
 // { dg-do run { target c++2a } }
 
+#include <contracts>
 #include <exception>
 #include <cstdlib>
-#include <testsuite_hooks.h>
-
-#include "../../../include/std/contracts"
 
 struct MyException{};
 
@@ -52,5 +50,5 @@ int main()
   // We should not get here
   return 1;
 }
-// { dg-output "contract violation in function int main.* at .*:47: test comment.*" }
+// { dg-output "contract violation in function int main.* at .*:45: test comment.*" }
 // { dg-output "assertion_kind: manual, semantic: observe, mode: unspecified, terminating: no" }

libstdc++-v3/testsuite/18_support/contracts/handle_observed_contract_violation4.cc

@@ -18,16 +18,12 @@
 // { dg-options "-g0 -fcontracts -fcontracts-nonattr -fcontract-evaluation-semantic=quick_enforce" }
 // { dg-do run { target c++2a } }
 
-#include <exception>
-#include <cstdlib>
-#include <testsuite_hooks.h>
-
-#include "../../../include/std/contracts"
+#include <contracts>
 
 int main()
 {
 
   std::contracts::handle_observed_contract_violation(std::nothrow, "test comment");
 }
-// { dg-output "contract violation in function int main.* at .*:30: test comment.*" }
+// { dg-output "contract violation in function int main.* at .*:26: test comment.*" }
 // { dg-output "assertion_kind: manual, semantic: observe, mode: unspecified, terminating: no" }

libstdc++-v3/testsuite/18_support/contracts/handle_quick_enforced_contract_violation.cc

@@ -18,13 +18,9 @@
 // { dg-options "-g0 -fcontracts -fcontracts-nonattr -fcontract-evaluation-semantic=observe" }
 // { dg-do run { target c++2a } }
 
+#include <contracts>
 #include <exception>
 #include <cstdlib>
-#include <testsuite_hooks.h>
-#include <cstring>
-#include <iostream>
-
-#include "../../../include/std/contracts"
 
 void my_term()
 {
@@ -40,5 +36,5 @@ int main()
   // We should not get here
   return 1;
 }
-// { dg-output "contract violation in function int main.* at .*:39: test comment.*" }
+// { dg-output "contract violation in function int main.* at .*:35: test comment.*" }
 // { dg-output "assertion_kind: manual, semantic: enforce, mode: unspecified, terminating: yes" }