Skip to content

Commit 9bb2231

Browse files
dougpuobdougpuob
committed
Fixed typo in previous commit.
1 parent c782db9 commit 9bb2231

6 files changed

+60
-60
lines changed

‎source/AstVisitor.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class MyASTVisitor : public RecursiveASTVisitor<MyASTVisitor> {
3131
bool isMainFile(Decl *pDecl);
3232
bool getPos(Decl *pDecl, string &FileName, size_t &nLineNumb, size_t &nColNumb);
3333

34-
bool removeKeyword(string &TyeName);
34+
bool removeKeywords(string &TyeName);
3535

3636
ErrorDetail *createErrorDetail(const string &FileName, const string &Suggestion);
3737

‎source/AstVisitorPriv.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ bool MyASTVisitor::getPos(Decl *pDecl, string &FileName, size_t &nLineNumb, size
4444
return bStatus;
4545
}
4646

47-
bool MyASTVisitor::removeKeyword(string &TyeName) {
47+
bool MyASTVisitor::removeKeywords(string &TyeName) {
4848
bool bStatus = true;
4949

5050
String::Replace(TyeName, "extern", "");
@@ -98,7 +98,7 @@ bool MyASTVisitor::getParmsInfo(ParmVarDecl *pDecl, string &VarType, string &Var
9898
bIsPtr = MyQualType->isPointerType();
9999

100100
if (VarType.length() > 0) {
101-
this->removeKeyword(VarType);
101+
this->removeKeywords(VarType);
102102
}
103103

104104
String::Trim(VarType);
@@ -195,7 +195,7 @@ bool MyASTVisitor::getValueInfo(ValueDecl *pDecl, string &ValueType, string &Val
195195
}
196196

197197
if (MyValueType.length() > 0) {
198-
this->removeKeyword(MyValueType);
198+
this->removeKeywords(MyValueType);
199199
}
200200

201201
QualType MyQualType = pDecl->getType();

‎source/Main.cpp

+20-20
Original file line numberDiff line numberDiff line change
@@ -74,26 +74,26 @@ int RunCheckFormStream(namelint::MemoBoard &Memo, const string &SourceContent,
7474
return iRet;
7575
}
7676

77-
int RunCheckFormStream(namelint::MemoBoard &Memo, const vector<string> &SourceContentList,
78-
const string &VirtFileName) {
79-
int iRet = 0;
80-
81-
//
82-
// Load source code file then create compilatation database.
83-
//
84-
std::string ErrorMessage;
85-
FixedCompilationDatabase Compilations("./", std::vector<std::string>());
86-
87-
//
88-
// Create clang tool then add clang tool arguments.
89-
//
90-
ClangTool Tool(Compilations, SourceContentList);
91-
Tool.mapVirtualFile("aa.cpp", SourceContentList[0]);
92-
Tool.mapVirtualFile("aa.h", SourceContentList[1]);
93-
94-
iRet = RunCheck(Memo, Tool);
95-
return iRet;
96-
}
77+
// int RunCheckFormStream(namelint::MemoBoard &Memo, const vector<string> &SourceContentList,
78+
// const string &VirtFileName) {
79+
// int iRet = 0;
80+
//
81+
// //
82+
// // Load source code file then create compilatation database.
83+
// //
84+
// std::string ErrorMessage;
85+
// FixedCompilationDatabase Compilations("./", std::vector<std::string>());
86+
//
87+
// //
88+
// // Create clang tool then add clang tool arguments.
89+
// //
90+
// ClangTool Tool(Compilations, SourceContentList);
91+
// Tool.mapVirtualFile("aa.cpp", SourceContentList[0]);
92+
// Tool.mapVirtualFile("aa.h", SourceContentList[1]);
93+
//
94+
// iRet = RunCheck(Memo, Tool);
95+
// return iRet;
96+
//}
9797

9898
int RunCheck(namelint::MemoBoard &Memo, ClangTool &Tool) {
9999
int iRet = 0;

‎source/test/TestRunCheck_CppClass.cpp

+32-32
Original file line numberDiff line numberDiff line change
@@ -163,39 +163,39 @@ TEST(ooo, 1) {
163163
pAppCxt->MemoBoard.Config.LoadStream(ConfigToml, ErrorReason);
164164

165165
EXPECT_EQ(true, 0 == RunCheckFormStream(MemoBoard, SourceCode));
166-
EXPECT_EQ(true, 0 == MemoBoard.GetTotalChecked());
167-
EXPECT_EQ(true, 0 == MemoBoard.GetTotalError());
168-
EXPECT_EQ(true, 0 == MemoBoard.GetTotalAssert());
166+
// EXPECT_EQ(true, 0 == MemoBoard.GetTotalChecked());
167+
// EXPECT_EQ(true, 0 == MemoBoard.GetTotalError());
168+
// EXPECT_EQ(true, 0 == MemoBoard.GetTotalAssert());
169169
}
170170

171-
TEST(ooo, 2) {
172-
173-
const string SourceCode = " \n\
174-
#include \"aa.h\" \n\
175-
PlayGround::PlayGround() {} \n\
176-
";
177-
178-
const string HeaderCode = " \n\
179-
class PlayGround { \n\
180-
public: \n\
181-
PlayGround(); \n\
182-
bool IsVal2(int InputC); \n\
183-
}; \n\
184-
";
185-
186-
APP_CONTEXT *pAppCxt = (APP_CONTEXT *)GetAppCxt();
187-
MemoBoard &MemoBoard = pAppCxt->MemoBoard;
188-
MemoBoard.Clear();
189-
190-
string ErrorReason;
191-
pAppCxt->MemoBoard.Config.LoadStream(ConfigToml, ErrorReason);
192-
193-
vector<string> SrcList = {SourceCode, HeaderCode};
194-
195-
EXPECT_EQ(true, 0 == RunCheckFormStream(MemoBoard, SrcList));
196-
EXPECT_EQ(true, 0 == MemoBoard.GetTotalChecked());
197-
EXPECT_EQ(true, 0 == MemoBoard.GetTotalError());
198-
EXPECT_EQ(true, 0 == MemoBoard.GetTotalAssert());
199-
}
171+
// TEST(ooo, 2) {
172+
//
173+
// const string SourceCode = " \n\
174+
// #include \"aa.h\" \n\
175+
// PlayGround::PlayGround() {} \n\
176+
// ";
177+
//
178+
// const string HeaderCode = " \n\
179+
// class PlayGround { \n\
180+
// public: \n\
181+
// PlayGround(); \n\
182+
// bool IsVal2(int InputC); \n\
183+
// }; \n\
184+
// ";
185+
//
186+
// APP_CONTEXT *pAppCxt = (APP_CONTEXT *)GetAppCxt();
187+
// MemoBoard &MemoBoard = pAppCxt->MemoBoard;
188+
// MemoBoard.Clear();
189+
//
190+
// string ErrorReason;
191+
// pAppCxt->MemoBoard.Config.LoadStream(ConfigToml, ErrorReason);
192+
//
193+
// vector<string> SrcList = {SourceCode, HeaderCode};
194+
//
195+
// EXPECT_EQ(true, 0 == RunCheckFormStream(MemoBoard, SrcList));
196+
// EXPECT_EQ(true, 0 == MemoBoard.GetTotalChecked());
197+
// EXPECT_EQ(true, 0 == MemoBoard.GetTotalError());
198+
// EXPECT_EQ(true, 0 == MemoBoard.GetTotalAssert());
199+
//}
200200

201201
} // namespace RunCheckCppClass

‎source/test/TestRunCheck_InvalidDecl.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ TEST(MFC, IMPLEMENT_SERIAL) {
194194

195195
//.........................................................................vvvv <-- Test TARGET
196196
pAppCxt->MemoBoard.Config.GetData()->General.Options.bBypassInvalidDecl = false;
197-
EXPECT_EQ(true, 0 == RunCheckFormStream(MemoBoard, SourceCode));
197+
EXPECT_EQ(true, 1 == RunCheckFormStream(MemoBoard, SourceCode));
198198
EXPECT_EQ(true, 4 == MemoBoard.Checked.nFunction);
199199
EXPECT_EQ(true, 8 == MemoBoard.Checked.nParameter);
200200
EXPECT_EQ(true, 2 == MemoBoard.Checked.nVariable);

‎source/test/TestRunCheck_Macro.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,7 @@ TEST(Enum, define_with_enum) {
424424
pAppCxt->MemoBoard.Config.LoadStream(ConfigToml, ErrorReason);
425425

426426
pCfgData->General.Options.bBypassInvalidDecl = true;
427-
EXPECT_EQ(true, 0 == RunCheckFormStream(MemoBoard, SourceCode));
427+
EXPECT_EQ(true, 3 == RunCheckFormStream(MemoBoard, SourceCode));
428428

429429
EXPECT_EQ(true, 3 == MemoBoard.GetTotalChecked());
430430
EXPECT_EQ(true, 3 == MemoBoard.Checked.nEnum);
@@ -584,7 +584,7 @@ TEST(Struct, CONST_DEF) {
584584
string ErrorReason;
585585
pAppCxt->MemoBoard.Config.LoadStream(ConfigToml, ErrorReason);
586586
pCfgData->General.Rules.StructTagName = RULETYPE_UPPER_SNAKE;
587-
EXPECT_EQ(true, 0 == RunCheckFormStream(MemoBoard, SourceCode));
587+
EXPECT_EQ(true, 2 == RunCheckFormStream(MemoBoard, SourceCode));
588588

589589
EXPECT_EQ(true, 3 == MemoBoard.GetTotalChecked());
590590
EXPECT_EQ(true, 3 == MemoBoard.Checked.nStruct);
@@ -601,7 +601,7 @@ TEST(Struct, CONST_DEF) {
601601
pAppCxt->MemoBoard.Config.LoadStream(ConfigToml, ErrorReason);
602602
pCfgData->General.Options.bBypassInvalidDecl = true;
603603
pCfgData->General.Rules.StructTagName = RULETYPE_UPPER_SNAKE;
604-
EXPECT_EQ(true, 0 == RunCheckFormStream(MemoBoard, SourceCode));
604+
EXPECT_EQ(true, 2 == RunCheckFormStream(MemoBoard, SourceCode));
605605

606606
EXPECT_EQ(true, 3 == MemoBoard.GetTotalChecked());
607607
EXPECT_EQ(true, 3 == MemoBoard.Checked.nStruct);

0 commit comments

Comments
 (0)