hooked up simplecpp::C23 [skip ci]

Author: firewave

gui/mainwindow.cpp

@@ -295,6 +295,7 @@ MainWindow::MainWindow(TranslationHandler* th, QSettings* settings) :
     mUI->mActionC11->setActionGroup(mCStandardActions);
     //mUI->mActionC17->setActionGroup(mCStandardActions);
     //mUI->mActionC23->setActionGroup(mCStandardActions);
+    //mUI->mActionC2Y->setActionGroup(mCStandardActions);
 
     mUI->mActionCpp03->setActionGroup(mCppStandardActions);
     mUI->mActionCpp11->setActionGroup(mCppStandardActions);
@@ -421,6 +422,7 @@ void MainWindow::loadSettings()
     mUI->mActionC11->setChecked(standards.c == Standards::C11);
     //mUI->mActionC17->setChecked(standards.c == Standards::C17);
     //mUI->mActionC23->setChecked(standards.c == Standards::C23);
+    //mUI->mActionC2Y->setChecked(standards.c == Standards::C2Y);
     standards.setCPP(mSettings->value(SETTINGS_STD_CPP, QString()).toString().toStdString());
     mUI->mActionCpp03->setChecked(standards.cpp == Standards::CPP03);
     mUI->mActionCpp11->setChecked(standards.cpp == Standards::CPP11);
@@ -522,6 +524,8 @@ void MainWindow::saveSettings() const
     //    mSettings->setValue(SETTINGS_STD_C, "C17");
     //if (mUI->mActionC23->isChecked())
     //    mSettings->setValue(SETTINGS_STD_C, "C23");
+    //if (mUI->mActionC2Y->isChecked())
+    //    mSettings->setValue(SETTINGS_STD_C, "C2Y");
 
     if (mUI->mActionCpp03->isChecked())
         mSettings->setValue(SETTINGS_STD_CPP, "C++03");

gui/mainwindow.ui

@@ -229,6 +229,7 @@
      <addaction name="mActionC11"/>
      <!--addaction name="mActionC17"/-->
      <!--addaction name="mActionC23"/-->
+     <!--addaction name="mActionC2Y"/-->
     </widget>
     <addaction name="mActionAnalyzeFiles"/>
     <addaction name="mActionAnalyzeDirectory"/>
@@ -828,6 +829,14 @@
     <string>C&amp;23</string>
    </property>
   </action-->
+  <!--action name="mActionC2Y">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>C&amp;2y</string>
+   </property>
+  </action-->
   <action name="mActionC89">
    <property name="checkable">
     <bool>true</bool>

lib/keywords.cpp

@@ -77,6 +77,14 @@ static const std::unordered_set<std::string> c23_keywords = {
     C23_KEYWORDS
 };
 
+static const std::unordered_set<std::string> c2y_keywords_all = {
+    C90_KEYWORDS, C99_KEYWORDS, C11_KEYWORDS, C23_KEYWORDS
+};
+
+static const std::unordered_set<std::string> c2y_keywords = {
+    C23_KEYWORDS
+};
+
 // see https://en.cppreference.com/w/cpp/keyword
 
 #define CPP03_KEYWORDS \
@@ -181,6 +189,8 @@ const std::unordered_set<std::string>& Keywords::getAll(Standards::cstd_t cStd)
         return c17_keywords_all;
     case Standards::cstd_t::C23:
         return c23_keywords_all;
+    case Standards::cstd_t::C2Y:
+        return c2y_keywords_all;
     }
     cppcheck::unreachable();
 }
@@ -222,6 +232,8 @@ const std::unordered_set<std::string>& Keywords::getOnly(Standards::cstd_t cStd)
         return c17_keywords;
     case Standards::cstd_t::C23:
         return c23_keywords;
+    case Standards::cstd_t::C2Y:
+        return c2y_keywords;
     }
     cppcheck::unreachable();
 }

lib/standards.cpp

@@ -36,6 +36,8 @@ static Standards::cstd_t mapC(simplecpp::cstd_t cstd) {
         return Standards::C17;
     case simplecpp::C23:
         return Standards::C23;
+    case simplecpp::C2Y:
+        return Standards::C2Y;
     case simplecpp::CUnknown:
         return Standards::CLatest;
     }
@@ -73,6 +75,8 @@ std::string Standards::getC(cstd_t c_std)
         return "c17";
     case C23:
         return "c23";
+    case C2Y:
+        return "c2y";
     }
     return "";
 }

lib/standards.h

@@ -38,7 +38,7 @@ struct CPPCHECKLIB Standards {
     enum Language : std::uint8_t { None, C, CPP };
 
     /** C code standard */
-    enum cstd_t : std::uint8_t { C89, C99, C11, C17, C23, CLatest = C23 } c = CLatest;
+    enum cstd_t : std::uint8_t { C89, C99, C11, C17, C23, C2Y, CLatest = C2Y } c = CLatest;
 
     /** C++ code standard */
     enum cppstd_t : std::uint8_t { CPP03, CPP11, CPP14, CPP17, CPP20, CPP23, CPP26, CPPLatest = CPP26 } cpp = CPPLatest;