Skip to content

style: Format sources using astyle 3.0.1 #515

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

style: Format sources using astyle 3.0.1 #515

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions simplecpp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -761,18 +761,18 @@ void simplecpp::TokenList::readfile(Stream &stream, const std::string &filename,
while (stream.good() && ch != '\n') {
currentToken += ch;
ch = stream.readChar();
if(ch == '\\') {
if (ch == '\\') {
TokenString tmp;
char tmp_ch = ch;
while((stream.good()) && (tmp_ch == '\\' || tmp_ch == ' ' || tmp_ch == '\t')) {
while ((stream.good()) && (tmp_ch == '\\' || tmp_ch == ' ' || tmp_ch == '\t')) {
tmp += tmp_ch;
tmp_ch = stream.readChar();
}
if(!stream.good()) {
if (!stream.good()) {
break;
}

if(tmp_ch != '\n') {
if (tmp_ch != '\n') {
currentToken += tmp;
} else {
const TokenString check_portability = currentToken + tmp;
Expand Down
17 changes: 9 additions & 8 deletions test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,14 +438,14 @@ static void comment_multiline()
ASSERT_EQUALS("\n\nvoid f ( ) {", preprocess(code));

const char code1[] = "#define ABC {// \\\r\n"
"}\n"
"void f() ABC\n";
"}\n"
"void f() ABC\n";
ASSERT_EQUALS("\n\nvoid f ( ) {", preprocess(code1));

const char code2[] = "#define A 1// \\\r"
"\r"
"2\r"
"A\r";
"\r"
"2\r"
"A\r";
ASSERT_EQUALS("\n\n2\n1", preprocess(code2));

const char code3[] = "void f() {// \\ \n}\n";
Expand Down Expand Up @@ -2100,7 +2100,7 @@ static void circularInclude()
"#define TEST_H\n"
"#include \"a/a.h\"\n"
"#endif\n"
;
;
cache.insert({path, makeTokenList(code, files, path)});
}

Expand All @@ -2111,7 +2111,7 @@ static void circularInclude()
"#define A_H\n"
"#include \"../test.h\"\n"
"#endif\n"
;
;
cache.insert({path, makeTokenList(code, files, path)});
}

Expand Down Expand Up @@ -3176,7 +3176,8 @@ static void fuzz_crash()
"n\n";
(void)preprocess(code, simplecpp::DUI()); // do not crash
}
{ // #346
{
// #346
const char code[] = "#define foo(intp)f##oo(intp\n"
"foo(f##oo(intp))\n";
(void)preprocess(code, simplecpp::DUI()); // do not crash
Expand Down