further review comments

Author: NinaRanns

gcc/cp/contracts.h

@@ -103,7 +103,9 @@ enum constract_assertion_kind {
   CAK_INVALID = 0 ,
   CAK_PRE = 1 ,
   CAK_POST = 2 ,
-  CAK_ASSERT = 3
+  CAK_ASSERT = 3,
+  CAK_MANUAL = 4,
+  CAK_CASSERT = 5,
 };
 
 /* Per P2900R11.  */
@@ -118,6 +120,7 @@ enum contract_evaluation_semantic {
 };
 
 enum constract_detection_mode {
+  CDM_UNSPECIFIED = 0,
   CDM_PREDICATE_FALSE = 1,
   CDM_EVAL_EXCEPTION = 2
 };

libstdc++-v3/include/std/contracts

@@ -101,17 +101,17 @@ namespace contracts
   // From P3290
     unspecified = 0,
     predicate_false = 1,
-    evaluation_exception = 3
+    evaluation_exception = 2
     /* to be extended with implementation−defined values and by future extensions
 	 Implementation−defined values should have a minimum value of 1000. */
   };
 
   using __vendor_ext = void;
 
   class contract_violation {
-    int version = 0;
-    __vendor_ext* _M_ext = nullptr;
-    const char* _M_comment = nullptr;
+    int _M_version;
+    __vendor_ext* _M_ext;
+    const char* _M_comment;
     detection_mode _M_detection_mode;
     assertion_kind _M_assertion_kind;
     std::source_location _M_source_location;

libstdc++-v3/src/experimental/contract26.cc

@@ -23,7 +23,7 @@
 // see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 // <http://www.gnu.org/licenses/>.
 
-#include "../../include/std/contracts"
+#include <contracts>
 #if _GLIBCXX_HOSTED && _GLIBCXX_VERBOSE
 # include <iostream>
 # include <cxxabi.h>
@@ -58,7 +58,7 @@ void __handle_contract_violation(const std::contracts::contract_violation &viola
        std::cerr << " manual";
        break;
      default:
-       std::cerr << " unknown: " << (int) violation.semantic();
+       std::cerr << " unknown: " << (int) violation.kind();
    }
    delimiter = ", ";
 
@@ -89,7 +89,7 @@ void __handle_contract_violation(const std::contracts::contract_violation &viola
       std::cerr << " unspecified";
       break;
     default:
-      std::cerr << " unknown";
+      std::cerr << " unknown: " << (int) violation.mode();
   }
   delimiter = ", ";
 

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

@@ -18,8 +18,8 @@
 // { dg-options "-g0 -fcontracts -fcontracts-nonattr -fcontract-evaluation-semantic=observe" }
 // { dg-do run { target c++2a } }
 
+#include <contracts>
 #include <testsuite_hooks.h>
-#include "../../../include/std/contracts"
 
 bool custom_called = false;
 

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

@@ -18,12 +18,11 @@
 // { dg-options "-g0 -fcontracts -fcontracts-nonattr -fcontract-evaluation-semantic=observe" }
 // { dg-do run { target c++2a } }
 
+#include <contracts>
 #include <testsuite_hooks.h>
 #include <iostream>
 #include <sstream>
 
-#include "../../../include/std/contracts"
-
 
 struct checking_buf
   : public std::streambuf