mirror of
https://github.com/HEYAHONG/HCppBox.git
synced 2025-10-14 02:27:41 +08:00
[htools] 更新astyle
This commit is contained in:
@@ -645,6 +645,8 @@ std::string ASBeautifier::beautify(const std::string& originalLine)
|
||||
|
||||
if (isCStyle()
|
||||
&& !isInComment
|
||||
&& !parenDepth
|
||||
//&& line.find('(', 0) == std::string::npos
|
||||
&& line.find('#', 0) == std::string::npos
|
||||
&& line.find("//", 0) == std::string::npos
|
||||
&& line.find("/*", 0) == std::string::npos
|
||||
|
@@ -901,7 +901,7 @@ void ASFormatter::handleBreakLine()
|
||||
}
|
||||
}
|
||||
|
||||
bool ASFormatter::handlePotentialHeader(const std::string* newHeader)
|
||||
bool ASFormatter::handlePotentialHeader(const std::string *&newHeader)
|
||||
{
|
||||
isNonParenHeader = false;
|
||||
foundClosingHeader = false;
|
||||
@@ -1374,7 +1374,7 @@ void ASFormatter::handlePotentialHeaderPart2()
|
||||
}
|
||||
}
|
||||
|
||||
void ASFormatter::handlePotentialOperator(const std::string *newHeader)
|
||||
void ASFormatter::handlePotentialOperator(const std::string *&newHeader)
|
||||
{
|
||||
|
||||
// check for Java ? wildcard
|
||||
|
4
htools/common/3rdparty/astyle/astyle.h
vendored
4
htools/common/3rdparty/astyle/astyle.h
vendored
@@ -889,11 +889,11 @@ private: // functions
|
||||
void handleClosedBracesOrParens();
|
||||
void handleBraces();
|
||||
void handleBreakLine();
|
||||
bool handlePotentialHeader(const std::string*);
|
||||
bool handlePotentialHeader(const std::string*&);
|
||||
void handleEndOfBlock();
|
||||
void handleColonSection();
|
||||
void handlePotentialHeaderPart2();
|
||||
void handlePotentialOperator(const std::string*);
|
||||
void handlePotentialOperator(const std::string*&);
|
||||
void handleParens();
|
||||
void handleOpenParens();
|
||||
|
||||
|
Reference in New Issue
Block a user