Skip to content

Better handling of restrict keyword #10

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
rgeissert wants to merge 2 commits into from
Closed

Better handling of restrict keyword #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dd0e5b6
Remove keywords before running simplifyTypedef
rgeissert Jan 8, 2011
b6af592
Treat __restrict just like restrict/__restrict__
rgeissert Jan 8, 2011
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
14 changes: 7 additions & 7 deletions lib/tokenize.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2367,6 +2367,12 @@ bool Tokenizer::tokenize(std::istream &code,
// remove Borland stuff..
simplifyBorland();

// Remove "volatile", "inline", "register", and "restrict"
simplifyKeyword();

// Remove __builtin_expect, likely and unlikely
simplifyBuiltinExpect();

// typedef..
simplifyTypedef();

Expand All @@ -2388,12 +2394,6 @@ bool Tokenizer::tokenize(std::istream &code,
}
}

// Remove "volatile", "inline", "register", and "restrict"
simplifyKeyword();

// Remove __builtin_expect, likely and unlikely
simplifyBuiltinExpect();

// collapse compound standard types into a single token
// unsigned long long int => long _isUnsigned=true,_isLong=true
simplifyStdType();
Expand Down Expand Up @@ -8820,7 +8820,7 @@ void Tokenizer::simplifyAttribute()
// Remove "volatile", "inline", "register", and "restrict"
void Tokenizer::simplifyKeyword()
{
const char pattern[] = "volatile|inline|__inline|__forceinline|register|restrict|__restrict__";
const char pattern[] = "volatile|inline|__inline|__forceinline|register|restrict|__restrict|__restrict__";
while (Token::Match(_tokens, pattern))
{
_tokens->deleteThis();
Expand Down
3 changes: 2 additions & 1 deletion test/testsimplifytokens.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6273,12 +6273,13 @@ class TestSimplifyTokens : public TestFixture
ASSERT_EQUALS("int foo ( ) { }", tok("__forceinline int foo ( ) { }", true));
ASSERT_EQUALS("if ( a ) { }", tok("if ( likely ( a ) ) { }", true));
ASSERT_EQUALS("if ( a ) { }", tok("if ( unlikely ( a ) ) { }", true));
ASSERT_EQUALS("int * p ;", tok("int * __restrict__ p;", true));
ASSERT_EQUALS("int * p ;", tok("int * __restrict p;", true));
ASSERT_EQUALS("int * * p ;", tok("int * __restrict__ * p;", true));
ASSERT_EQUALS("void foo ( float * a , float * b ) ;", tok("void foo(float * __restrict__ a, float * __restrict__ b);", true));
ASSERT_EQUALS("int * p ;", tok("int * restrict p;", true));
ASSERT_EQUALS("int * * p ;", tok("int * restrict * p;", true));
ASSERT_EQUALS("void foo ( float * a , float * b ) ;", tok("void foo(float * restrict a, float * restrict b);", true));
ASSERT_EQUALS("; int * p ;", tok("typedef int * __restrict__ rint; rint p;", true));
}

void simplifyCallingConvention()
Expand Down