19 header file do not check fully

script/build-pack-win32.cmd

@@ -1,6 +1,6 @@
 @ECHO OFF
 
-IF EXIST release (RD release)
+IF EXIST release (RD /S /Q release)
 python cppnamelint.py bldgpack .. .\release
 
 ECHO.

script/cppnamelint.py

@@ -259,7 +259,7 @@ def convert_py_args_to_exe_args(py_args) -> str:
 def find_sample_files(start_dir: str) -> []:
     paired_list = []
 
-    include_src_files: [] = ['.c', '.cpp']
+    include_src_files: [] = ['.c', '.cpp', '.h']
     include_cfg_files: [] = ['.toml']
 
     file_obj = File()

source/LearnIt.h

@@ -34,6 +34,7 @@ class LearnIt {
   void _PrintFunctionDecl(FunctionDecl *pDecl);
   void _PrintParmVarDecl(ParmVarDecl *pDecl);
   void _PrintRecordDecl(RecordDecl *pDecl);
+  void _PrintTypedefDecl(TypedefDecl *pDecl);
 };
 
 #endif // __LEARN_IT_H__

source/Main.cpp

@@ -28,53 +28,64 @@ bool WriteJsonResult(const MemoBoard &MemoBoard, const string &FilePath);
 
 int RunCheck(namelint::MemoBoard &Memo) {
   int iRet = 0;
-  string InputFile = CheckInputSrc;
-  string InpuConfig = CheckInputConfig;
+
   string OutputJson = CheckOutputJson;
   vector<string> InputIncs;
 
-  DcLib::Log::Out(INFO_ALL, "InputFile  = %s", InputFile.c_str());
-  DcLib::Log::Out(INFO_ALL, "InpuConfig = %s", InpuConfig.c_str());
-  DcLib::Log::Out(INFO_ALL, "OutputJson = %s", OutputJson.c_str());
+  Memo.File.Source = CheckInputSrc;
+  Memo.File.Config = CheckInputConfig;
+  Memo.Dir.Includes = InputIncs;
+
+  if (OutputJson.length() == 0) {
+    OutputJson = "cppnamelint.json";
+  }
 
-  if (!llvm::sys::fs::exists(InputFile)) {
+  //
+  // Check input parameters.
+  //
+  DcLib::Log::Out(INFO_ALL, "Source File = %s", Memo.File.Source.c_str());
+  DcLib::Log::Out(INFO_ALL, "Config File = %s", Memo.File.Config.c_str());
+  DcLib::Log::Out(INFO_ALL, "OutputJson  = %s", OutputJson.c_str());
+
+  if (!llvm::sys::fs::exists(Memo.File.Source)) {
     cout << "Error: Failed to find input source file." << endl;
     return 1;
   }
 
-  if (!llvm::sys::fs::exists(InpuConfig)) {
+  if (!llvm::sys::fs::exists(Memo.File.Config)) {
     cout << "Error: Failed to find config file." << endl;
     return 2;
   }
 
   string errorReason;
-  if (!Memo.Config.LoadFile(InpuConfig, errorReason)) {
+  if (!Memo.Config.LoadFile(Memo.File.Config, errorReason)) {
     cout << "Error: Failed to load config file (format wrong)." << endl;
     cout << errorReason << endl;
     return 3;
   }
 
-  if (OutputJson.length() == 0) {
-    OutputJson = "cppnamelint.json";
-  }
-
+  //
+  // Load source code file then create compilatation database.
+  //
   std::string ErrorMessage;
-  std::unique_ptr<CompilationDatabase> Compilations =
-      FixedCompilationDatabase::loadFromFile(InputFile, ErrorMessage);
+  auto Compilations =
+      FixedCompilationDatabase::loadFromFile(Memo.File.Source, ErrorMessage);
 
-  Memo.File.Source = InputFile;
-  Memo.File.Config = InpuConfig;
-  Memo.Dir.Includes = InputIncs;
-
-  vector<string> SingleFileInList = {InputFile};
+  //
+  // Create clang tool then add clang tool arguments.
+  //
+  vector<string> SingleFileInList = {Memo.File.Source};
   ClangTool Tool(*Compilations, SingleFileInList);
+  // Tool.appendArgumentsAdjuster(getInsertArgumentAdjuster("--I./",
+  // ArgumentInsertPosition::BEGIN));
+  // Tool.appendArgumentsAdjuster(
+  //    getInsertArgumentAdjuster("-v", ArgumentInsertPosition::BEGIN));
+  Tool.appendArgumentsAdjuster(getInsertArgumentAdjuster(
+      "--language=c++",
+      ArgumentInsertPosition::BEGIN)); // Make it parses header file.
 
   Tool.setDiagnosticConsumer(new IgnoringDiagConsumer());
 
-  MyFactory MyFactory;
-  std::unique_ptr<FrontendActionFactory> Factory =
-      newFrontendActionFactory(&MyFactory);
-
   Detection Detect;
   shared_ptr<ConfigData> pConfig = Memo.Config.GetData();
   GeneralOptions *pOptions = &pConfig->General.Options;
@@ -85,14 +96,19 @@ int RunCheck(namelint::MemoBoard &Memo) {
 
     Memo.Checked.nFile++;
 
-    string FileBaseName = Path::FindFileName(InputFile);
+    string FileBaseName = Path::FindFileName(Memo.File.Source);
     GeneralRules *pRules = &pConfig->General.Rules;
     if (!Detect.CheckFile(pRules->FileName, FileBaseName)) {
       Memo.Error.nFile++;
       Memo.ErrorDetailList.push_back(new ErrorDetail(FileBaseName, ""));
     }
   }
 
+  MyFactory MyFactory;
+  std::unique_ptr<FrontendActionFactory> Factory =
+      newFrontendActionFactory(&MyFactory);
+
+  // Go
   if (0 == Tool.run(Factory.get())) {
     iRet = GetTotalError(Memo);
     PrintTraceMemo(Memo);
@@ -193,8 +209,10 @@ bool PrintTraceMemo(const MemoBoard &MemoBoard) {
   bool bStatus = true;
   char szText[512] = {0};
 
-  cout << " File    = " << MemoBoard.File.Source << endl;
-  cout << " Config  = " << MemoBoard.File.Config << endl;
+  cout << " File    = "
+       << llvm::sys::path::filename(MemoBoard.File.Source).data() << endl;
+  cout << " Config  = "
+       << llvm::sys::path::filename(MemoBoard.File.Config).data() << endl;
   for (size_t nIdx = 0; nIdx < MemoBoard.Dir.Includes.size(); nIdx++) {
     sprintf(szText, " Inc[%2d] = %s", nIdx + 1,
             MemoBoard.Dir.Includes[nIdx].c_str());

source/MyAstVisitor.cpp

@@ -421,3 +421,12 @@ bool MyASTVisitor::VisitParmVarDecl(ParmVarDecl *pDecl) {
 
   return true;
 }
+
+bool MyASTVisitor::VisitTypedefDecl(TypedefDecl *pDecl) {
+  APP_CONTEXT *pAppCxt = ((APP_CONTEXT *)GetAppCxt());
+
+  if (pAppCxt->MemoBoard.Option.bEnableLog) {
+    this->m_LearnIt.PrintDecl(pDecl);
+  }
+  return true;
+}

source/MyAstVisitor.h

@@ -75,6 +75,76 @@ class MyASTVisitor : public RecursiveASTVisitor<MyASTVisitor> {
   bool VisitFieldDecl(FieldDecl *pDecl);
   bool VisitReturnStmt(ReturnStmt *pRetStmt);
   bool VisitParmVarDecl(ParmVarDecl *pDecl);
+  bool VisitTypedefDecl(TypedefDecl *pDecl);
 };
 
+/*
+  // Declaration visitors
+  bool VisitTypeAliasTemplateDecl(TypeAliasTemplateDecl *D);
+  bool VisitTypeAliasDecl(TypeAliasDecl *D);
+  bool VisitAttributes(Decl *D);
+  bool VisitBlockDecl(BlockDecl *B);
+  bool VisitCXXRecordDecl(CXXRecordDecl *D);
+  Optional<bool> shouldVisitCursor(CXCursor C);
+  bool VisitDeclContext(DeclContext *DC);
+  bool VisitTranslationUnitDecl(TranslationUnitDecl *D);
+  bool VisitTypedefDecl(TypedefDecl *D);
+  bool VisitTagDecl(TagDecl *D);
+  bool VisitClassTemplateSpecializationDecl(ClassTemplateSpecializationDecl *D);
+  bool VisitClassTemplatePartialSpecializationDecl(
+                                     ClassTemplatePartialSpecializationDecl *D);
+  bool VisitTemplateTypeParmDecl(TemplateTypeParmDecl *D);
+  bool VisitEnumConstantDecl(EnumConstantDecl *D);
+  bool VisitDeclaratorDecl(DeclaratorDecl *DD);
+  bool VisitFunctionDecl(FunctionDecl *ND);
+  bool VisitFieldDecl(FieldDecl *D);
+  bool VisitVarDecl(VarDecl *);
+  bool VisitNonTypeTemplateParmDecl(NonTypeTemplateParmDecl *D);
+  bool VisitFunctionTemplateDecl(FunctionTemplateDecl *D);
+  bool VisitClassTemplateDecl(ClassTemplateDecl *D);
+  bool VisitTemplateTemplateParmDecl(TemplateTemplateParmDecl *D);
+  bool VisitObjCTypeParamDecl(ObjCTypeParamDecl *D);
+  bool VisitObjCMethodDecl(ObjCMethodDecl *ND);
+  bool VisitObjCContainerDecl(ObjCContainerDecl *D);
+  bool VisitObjCCategoryDecl(ObjCCategoryDecl *ND);
+  bool VisitObjCProtocolDecl(ObjCProtocolDecl *PID);
+  bool VisitObjCPropertyDecl(ObjCPropertyDecl *PD);
+  bool VisitObjCTypeParamList(ObjCTypeParamList *typeParamList);
+  bool VisitObjCInterfaceDecl(ObjCInterfaceDecl *D);
+  bool VisitObjCImplDecl(ObjCImplDecl *D);
+  bool VisitObjCCategoryImplDecl(ObjCCategoryImplDecl *D);
+  bool VisitObjCImplementationDecl(ObjCImplementationDecl *D);
+  // FIXME: ObjCCompatibleAliasDecl requires aliased-class locations.
+  bool VisitObjCPropertyImplDecl(ObjCPropertyImplDecl *PD);
+  bool VisitLinkageSpecDecl(LinkageSpecDecl *D);
+  bool VisitNamespaceDecl(NamespaceDecl *D);
+  bool VisitNamespaceAliasDecl(NamespaceAliasDecl *D);
+  bool VisitUsingDirectiveDecl(UsingDirectiveDecl *D);
+  bool VisitUsingDecl(UsingDecl *D);
+  bool VisitUnresolvedUsingValueDecl(UnresolvedUsingValueDecl *D);
+  bool VisitUnresolvedUsingTypenameDecl(UnresolvedUsingTypenameDecl *D);
+  bool VisitStaticAssertDecl(StaticAssertDecl *D);
+  bool VisitFriendDecl(FriendDecl *D);
+
+  // Name visitor
+  bool VisitDeclarationNameInfo(DeclarationNameInfo Name);
+  bool VisitNestedNameSpecifier(NestedNameSpecifier *NNS, SourceRange Range);
+  bool VisitNestedNameSpecifierLoc(NestedNameSpecifierLoc NNS);
+
+  // Template visitors
+  bool VisitTemplateParameters(const TemplateParameterList *Params);
+  bool VisitTemplateName(TemplateName Name, SourceLocation Loc);
+  bool VisitTemplateArgumentLoc(const TemplateArgumentLoc &TAL);
+
+  // Type visitors
+#define ABSTRACT_TYPELOC(CLASS, PARENT)
+#define TYPELOC(CLASS, PARENT) \
+  bool Visit##CLASS##TypeLoc(CLASS##TypeLoc TyLoc);
+#include "clang/AST/TypeLocNodes.def"
+
+  bool VisitTagTypeLoc(TagTypeLoc TL);
+  bool VisitArrayTypeLoc(ArrayTypeLoc TL);
+  bool VisitFunctionTypeLoc(FunctionTypeLoc TL, bool SkipResultType = false);
+*/
+
 #endif // __NAMELINT_MY_AST_VISITOR__H__

source/test/sample/Sample01UpperCamel.c

@@ -1,4 +1,4 @@
-// [General.Rules]
+// [General.Rules]
 // FileName                = 1 # 1: UpperCamel
 // FunctionName            = 1 # 1: UpperCamel
 // VariableName            = 1 # 1: UpperCamel

source/test/sample/Sample01UpperCamel.toml

@@ -1,4 +1,4 @@
-[General.Options]
+[General.Options]
 Version                 = 0.2
 FileExtNameList         = ["*.c","*.h","*.cpp"]
 CheckVariableName       = true

source/test/sample/Sample02_UpperCamel.c

@@ -1,4 +1,4 @@
-// [General.Rules]
+// [General.Rules]
 // FileName                = 1 # 1: UpperCamel
 // FunctionName            = 1 # 1: UpperCamel
 // VariableName            = 1 # 1: UpperCamel

source/test/sample/Sample02_UpperCamel.toml

@@ -1,4 +1,4 @@
-[General.Options]
+[General.Options]
 Version                 = 0.2
 FileExtNameList         = ["*.c","*.h","*.cpp"]
 CheckVariableName       = true

source/test/sample/Sample06LowerCamel.cpp

@@ -1,4 +1,4 @@
-// [General.Rules]
+// [General.Rules]
 // FileName                = 1 # 1: UpperCamel
 // FunctionName            = 1 # 1: UpperCamel
 // variableName            = 4 # 4: Hungarian

source/test/sample/Sample07.cpp

@@ -0,0 +1,20 @@
+#include "Sample07.h"
+#include "Sample07a.h"
+
+#define min2(X, Y) ((X) < (Y) ? (X) : (Y))
+typedef void (*fnFunc)(short s, short);
+
+MyClass::MyClass() {}
+
+MyClass::~MyClass() {}
+
+bool MyClass::MyPubFunc(int) {
+  ITEM Item;
+  ITEM *pItem;
+  return true;
+}
+
+bool MyClass::MyPrivFunc(int Value) {
+  Value = min2(Value, 10);
+  return true;
+}

source/test/sample/Sample07.h

@@ -0,0 +1,9 @@
+class MyClass {
+public:
+  MyClass();
+  ~MyClass();
+  bool MyPubFunc(int);
+
+private:
+  bool MyPrivFunc(int);
+};