CPreProcessor,C: skip #ifdef __cplusplus ~ #endif branch #2648
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Masatake YAMATO <[email protected]>
…ssed to cppInit() cppInit takes too many arguments. To make the cppInit invocation understandable, this change introduces cppInitData struct type. With the type, a client parser can specify an argument with specifying the name of field. This change fixex a bug as a side effect. The orders of parameters didn't matched between the declaration and the implementation of cppInit(). Signed-off-by: Masatake YAMATO <[email protected]>
Close universal-ctags#2647. C parser doesn't work when C++ code "extern "C" {" and "}" is given. $ cat /tmp/extern-c.c extern "C" { #ifdef X void f() {} #else void g() {} #endif } $ u-ctags --output-format=xref --kinds-c=+plz --fields=+nie -o - /tmp/extern-c.c f function 3 /tmp/extern-c.c void f() {} $ cat /tmp/none-extern-c.c #ifdef X void f() {} #else void g() {} #endif $ u-ctags --output-format=xref --kinds-c=+plz --fields=+nie -o - /tmp/none-extern-c.c f function 2 /tmp/none-extern-c.c void f() {} g function 4 /tmp/none-extern-c.c void g() {} The function g() is missed if the code is surrounded by extern "C" { and }. This change uses a heuristic rule to skip the code in the C parser. In most of cases, the code is in #ifdef __cplusplus ~ #endif branch. So when the CPreProcessor parser detects #ifdef __cplusplus ~ #endif, with this change, the CPreProcessor parser doesn't pass the code inside __cplusplus branch to its client parser that requests to the CPreProcessor parser to do so. C parser requests it. C++ parser doesn't. Signed-off-by: Masatake YAMATO <[email protected]>
Codecov Report
@@ Coverage Diff @@
## master #2648 +/- ##
=======================================
Coverage 86.86% 86.87%
=======================================
Files 183 183
Lines 38973 38995 +22
=======================================
+ Hits 33855 33875 +20
- Misses 5118 5120 +2
Continue to review full report at Codecov.
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Close #2647.
C parser doesn't work when C++ code "extern "C" {" and "}" is given.