Merge pull request #299 from correctcomputation/3c-rename

Rename CConv, etc. to 3C

Author: mattmccutchen-cci

.github/workflows/main.yml

@@ -66,7 +66,7 @@ wiki](https://github.com/Microsoft/checkedc-clang/wiki).
 |Debug X86 Windows| Checked C and clang regression tests|![Debug X86 Windows status](https://msresearch.visualstudio.com/_apis/public/build/definitions/f6454e27-a46c-49d9-8453-29d89d53d2f9/211/badge)|
 |Debug X64 Windows| Checked C and clang regression tests| ![Debug X64 Windows status](https://msresearch.visualstudio.com/_apis/public/build/definitions/f6454e27-a46c-49d9-8453-29d89d53d2f9/205/badge)|
 |Debug X64 Linux  | Checked C and clang regression tests| ![Debug X64 Linux status](https://msresearch.visualstudio.com/_apis/public/build/definitions/f6454e27-a46c-49d9-8453-29d89d53d2f9/217/badge)|
-|Debug X64 Linux  | cconv-standalone (Checked C Convert tool) nightly tests| ![Nightly Sanity Tests](https://github.com/correctcomputation/checkedc-clang/workflows/Nightly%20Sanity%20Tests/badge.svg?branch=master)|
+|Debug X64 Linux  | 3C (Checked-C-Convert tool) nightly tests| ![Nightly Sanity Tests](https://github.com/correctcomputation/checkedc-clang/workflows/Nightly%20Sanity%20Tests/badge.svg?branch=master)|
 |Release X64 Linux| Checked C, clang, and LLVM nightly tests|![Release X64 Linux status](https://msresearch.visualstudio.com/_apis/public/build/definitions/f6454e27-a46c-49d9-8453-29d89d53d2f9/238/badge)|
 
 ## Contributing

README.md

@@ -1,24 +1,24 @@
-//=--CConvertCommands.cpp-----------------------------------------*- C++-*-===//
+//=--3CCommands.cpp-----------------------------------------------*- C++-*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
-// Implementation of CConv command helper methods.
+// Implementation of 3C command helper methods.
 //===----------------------------------------------------------------------===//
 
-#ifdef INTERACTIVECCCONV
-#include "CConvertCommands.h"
+#ifdef INTERACTIVE3C
+#include "3CCommands.h"
 
 namespace clang {
 namespace clangd {
 
-#define CCONVSOURCE "CConv_RealWild"
+#define _3CSOURCE "3C_RealWild"
 
 static bool GetPtrIDFromDiagMessage(const Diagnostic &DiagMsg,
                                     unsigned long &PtrId) {
-  if (DiagMsg.source.rfind(CCONVSOURCE, 0) == 0) {
+  if (DiagMsg.source.rfind(_3CSOURCE, 0) == 0) {
     PtrId = atoi(DiagMsg.code.c_str());
     return true;
   }
@@ -29,40 +29,40 @@ void AsCCCommands(const Diagnostic &D, std::vector<Command> &OutCommands) {
   unsigned long PtrId;
   if (GetPtrIDFromDiagMessage(D, PtrId)) {
     Command AllPtrsCmd;
-    CConvertManualFix PtrFix;
+    _3CManualFix PtrFix;
     PtrFix.ptrID = PtrId;
-    AllPtrsCmd.ccConvertManualFix = PtrFix;
+    AllPtrsCmd._3CManualFix = PtrFix;
     Command SinglePtrCmd = AllPtrsCmd;
 
-    AllPtrsCmd.command = Command::CCONV_APPLY_FOR_ALL;
+    AllPtrsCmd.command = Command::_3C_APPLY_FOR_ALL;
     AllPtrsCmd.title = "Make this pointer non-WILD and apply the "
                        "same observation to all the pointers.";
 
     OutCommands.push_back(AllPtrsCmd);
 
-    SinglePtrCmd.command = Command::CCONV_APPLY_ONLY_FOR_THIS;
+    SinglePtrCmd.command = Command::_3C_APPLY_ONLY_FOR_THIS;
     SinglePtrCmd.title = "Make ONLY this pointer non-WILD.";
 
     OutCommands.push_back(SinglePtrCmd);
   }
 }
 
-bool IsCConvCommand(const ExecuteCommandParams &Params) {
-    return (Params.command.rfind(Command::CCONV_APPLY_ONLY_FOR_THIS, 0) == 0) ||
-           (Params.command.rfind(Command::CCONV_APPLY_FOR_ALL, 0) == 0);
+bool Is3CCommand(const ExecuteCommandParams &Params) {
+    return (Params.command.rfind(Command::_3C_APPLY_ONLY_FOR_THIS, 0) == 0) ||
+           (Params.command.rfind(Command::_3C_APPLY_FOR_ALL, 0) == 0);
 }
 
 bool ExecuteCCCommand(const ExecuteCommandParams &Params,
                     std::string &ReplyMessage,
-                    CConvInterface &CcInterface) {
+                    _3CInterface &CcInterface) {
   ReplyMessage = "Checked C Pointer Modified.";
-  if (Params.command.rfind(Command::CCONV_APPLY_ONLY_FOR_THIS, 0) == 0) {
-    int PtrId = Params.ccConvertManualFix->ptrID;
+  if (Params.command.rfind(Command::_3C_APPLY_ONLY_FOR_THIS, 0) == 0) {
+    int PtrId = Params._3CManualFix->ptrID;
     CcInterface.MakeSinglePtrNonWild(PtrId);
     return true;
   }
-  if (Params.command.rfind(Command::CCONV_APPLY_FOR_ALL, 0) == 0) {
-    int PtrId = Params.ccConvertManualFix->ptrID;
+  if (Params.command.rfind(Command::_3C_APPLY_FOR_ALL, 0) == 0) {
+    int PtrId = Params._3CManualFix->ptrID;
     CcInterface.InvalidateWildReasonGlobally(PtrId);
     return true;
   }

clang-tools-extra/clangd/CConvertCommands.cpp renamed to clang-tools-extra/clangd/3CCommands.cpp

@@ -1,33 +1,33 @@
-//=--CConvertCommands.h-------------------------------------------*- C++-*-===//
+//=--3CCommands.h-------------------------------------------------*- C++-*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
-// Helper methods used to handle CConv commands.
+// Helper methods used to handle 3C commands.
 //===----------------------------------------------------------------------===//
 
-#ifdef INTERACTIVECCCONV
-#ifndef LLVM_TOOLS_CLANG_TOOLS_EXTRA_CLANGD_CCONVERTCOMMANDS_H
-#define LLVM_TOOLS_CLANG_TOOLS_EXTRA_CLANGD_CCONVERTCOMMANDS_H
+#ifdef INTERACTIVE3C
+#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANGD_3CCOMMANDS_H
+#define LLVM_CLANG_TOOLS_EXTRA_CLANGD_3CCOMMANDS_H
 
 #include "Protocol.h"
-#include "clang/CConv/CConv.h"
+#include "clang/3C/3C.h"
 
 namespace clang {
 namespace clangd {
   // Convert the provided Diagnostic into Commands
   void AsCCCommands(const Diagnostic &D, std::vector<Command> &OutCommands);
-  // Check if the execute command request from the client is a CConv command.
-  bool IsCConvCommand(const ExecuteCommandParams &Params);
+  // Check if the execute command request from the client is a 3C command.
+  bool Is3CCommand(const ExecuteCommandParams &Params);
 
-  // Interpret the provided execute command request as CConv command
+  // Interpret the provided execute command request as 3C command
   // and execute them.
   bool ExecuteCCCommand(const ExecuteCommandParams &Params,
                         std::string &ReplyMessage,
-                        CConvInterface &CcInterface);
+                        _3CInterface &CcInterface);
 }
 }
-#endif //LLVM_TOOLS_CLANG_TOOLS_EXTRA_CLANGD_CCONVERTCOMMANDS_H
+#endif //LLVM_CLANG_TOOLS_EXTRA_CLANGD_3CCOMMANDS_H
 #endif

clang-tools-extra/clangd/CConvertCommands.h renamed to clang-tools-extra/clangd/3CCommands.h

@@ -1,22 +1,22 @@
-//=--CConvertDiagnostics.cpp--------------------------------------*- C++-*-===//
+//=--3CDiagnostics.cpp--------------------------------------------*- C++-*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
-// Implementation of CConvertDiagnostics methods
+// Implementation of _3CDiagnostics methods
 //===----------------------------------------------------------------------===//
 
-#ifdef INTERACTIVECCCONV
-#include "CConvertDiagnostics.h"
+#ifdef INTERACTIVE3C
+#include "3CDiagnostics.h"
 
 namespace clang {
 namespace clangd {
 
 #define DEFAULT_PTRSIZE 4
 
-void CConvertDiagnostics::ClearAllDiags() {
+void _3CDiagnostics::ClearAllDiags() {
   std::lock_guard<std::mutex> Lock(DiagMutex);
   AllFileDiagnostics.clear();
 }
@@ -26,7 +26,7 @@ static bool IsValidSourceFile(ConstraintsInfo &CCRes, std::string &FilePath) {
 }
 
 
-bool CConvertDiagnostics::PopulateDiagsFromConstraintsInfo(ConstraintsInfo &Line) {
+bool _3CDiagnostics::PopulateDiagsFromConstraintsInfo(ConstraintsInfo &Line) {
   std::lock_guard<std::mutex> Lock(DiagMutex);
   std::set<ConstraintKey> ProcessedCKeys;
   ProcessedCKeys.clear();
@@ -57,7 +57,7 @@ bool CConvertDiagnostics::PopulateDiagsFromConstraintsInfo(ConstraintsInfo &Line
       Diag NewDiag;
       NewDiag.Range = GetLocRange(PsInfo->getLineNo(), PsInfo->getColSNo(),
                                   PsInfo->getColENo());
-      NewDiag.Source = Diag::CConvMain;
+      NewDiag.Source = Diag::_3CMain;
       NewDiag.Severity = DiagnosticsEngine::Level::Error;
       NewDiag.code = std::to_string(WReason.first);
       NewDiag.Message = "Pointer is wild because of:" +
@@ -94,7 +94,7 @@ bool CConvertDiagnostics::PopulateDiagsFromConstraintsInfo(ConstraintsInfo &Line
                                     PsInfo->getColENo());
 
         NewDiag.code = std::to_string(NonWildCk);
-        NewDiag.Source = Diag::CConvSec;
+        NewDiag.Source = Diag::_3CSec;
         NewDiag.Severity = DiagnosticsEngine::Level::Warning;
         NewDiag.Message = "Pointer is wild because it transitively "
                           "depends on other pointer(s)";

clang-tools-extra/clangd/CConvertDiagnostics.cpp renamed to clang-tools-extra/clangd/3CDiagnostics.cpp

@@ -1,26 +1,26 @@
-//=--CConvertDiagnostics.h----------------------------------------*- C++-*-===//
+//=--3CDiagnostics.h----------------------------------------------*- C++-*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
-// Class that handles CConv Diagnostic messages.
+// Class that handles 3C Diagnostic messages.
 //===----------------------------------------------------------------------===//
 
-#ifdef INTERACTIVECCCONV
-#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANGD_CCONVERTDIAGNOSTICS_H
-#define LLVM_CLANG_TOOLS_EXTRA_CLANGD_CCONVERTDIAGNOSTICS_H
+#ifdef INTERACTIVE3C
+#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANGD_3CDIAGNOSTICS_H
+#define LLVM_CLANG_TOOLS_EXTRA_CLANGD_3CDIAGNOSTICS_H
 
 #include <set>
 #include "Diagnostics.h"
-#include "clang/CConv/CConv.h"
+#include "clang/3C/3C.h"
 
 namespace clang {
 namespace clangd {
 
-// Class that represents diagnostics messages specific to CConv.
-class CConvertDiagnostics {
+// Class that represents diagnostics messages specific to 3C.
+class _3CDiagnostics {
 public:
   std::mutex DiagMutex;
 

clang-tools-extra/clangd/CConvertDiagnostics.h renamed to clang-tools-extra/clangd/3CDiagnostics.h

@@ -36,8 +36,8 @@ endif()
 
 add_clang_library(clangDaemon
   AST.cpp
-  CConvertCommands.cpp
-  CConvertDiagnostics.cpp
+  3CCommands.cpp
+  3CDiagnostics.cpp
   Cancellation.cpp
   ClangdLSPServer.cpp
   ClangdServer.cpp
@@ -140,10 +140,10 @@ add_clang_library(clangDaemon
   ${CLANGD_ATOMIC_LIB}
   )
 
-add_clang_library(cconvClangDaemon
+add_clang_library(3cClangDaemon
   AST.cpp
-  CConvertCommands.cpp
-  CConvertDiagnostics.cpp
+  3CCommands.cpp
+  3CDiagnostics.cpp
   Cancellation.cpp
   ClangdLSPServer.cpp
   ClangdServer.cpp
@@ -209,7 +209,7 @@ add_clang_library(cconvClangDaemon
   refactor/Tweak.cpp
 
   LINK_LIBS
-  CConv
+  3C
   clangAST
   clangASTMatchers
   clangBasic
@@ -247,7 +247,7 @@ add_clang_library(cconvClangDaemon
   ${CLANGD_ATOMIC_LIB}
       )
 
-  target_compile_definitions(obj.cconvClangDaemon PRIVATE INTERACTIVECCCONV=1)
+  target_compile_definitions(obj.3cClangDaemon PRIVATE INTERACTIVE3C=1)
 
 add_subdirectory(refactor/tweaks)
 if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")