Fixed several C++ lexical / tokenize errors.#16
Merged
adangel merged 4 commits intoadangel:masterfrom Jan 18, 2015
Merged
Conversation
added 4 commits
January 13, 2015 11:36
This commit fixes a lexical error when a C++ file contains ASM with the
'@' character. The following code cannot be tokenized and triggers a
lexical error:
asm void eSPI_boot()
{
// setup stack pointer
lis r1, _stack_addr@h
ori r1, r1, _stack_addr@l
}
The error that occurs:
net.sourceforge.pmd.lang.ast.TokenMgrError: Lexical error in file
CODE_LOADED_FROM_STRING at line 4, column 22. Encountered: "@" (64),
after : ""
…gle line comment that starts with "//*". This commit fixes a lexical eror when a preprocessor directive is followed by a single line comment that starts with "//*". The following code could not be tokenized: #define LSTFVLES_CPP //* It triggers the following error: net.sourceforge.pmd.lang.ast.TokenMgrError: Lexical error in file 'foo.cpp' at line 2, column 0. Encountered: <EOF> after : ""
…al L''. This commit fixes a lexical error when a C++ file contains an empty character literal L''. The following code could not be tokenized: std::wstring wsMessage( sMessage.length(), L''); It triggers the following error: net.sourceforge.pmd.lang.ast.TokenMgrError: Lexical error in file 'foo.cpp' at line 1, column 46. Encountered: "\'" (39), after : "\'"
…aracter inside a string or character.
The following 2 code snippets could not be tokenized:
1: if (*pbuf == '\0x05'), the problem is the '\0' in the character
literal '\0x05'.
2: szPath = m_sdcacheDir + _T("\ oMedia");, the problem is the '\ '
in the string literal "\ oMedia".
I relaxed the lexical grammar so a '\' (backslash) can escape any
character inside a string or character literal. We can relax the grammar
because CPD only needs the tokens, so it is no problem to accept
'invalid' string / character literals. (according to the ANSI C
standard). Failing too fast because the tokenizer is too strict is
annoying because then we can't check the files for duplicated code.
Both snippets were taken from existing projects and be successfully
compiled, so for some C / C++ compilers it is valid code.
|
Andreas Dangel » pmd #217 SUCCESS |
Owner
|
Thanks! |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
For a detailed information of the fixes, see the commit messages.