diff options
| author | Dimitri van Heesch <dimitri@stack.nl> | 2013-05-19 12:23:25 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <dimitri@stack.nl> | 2013-05-19 12:23:25 (GMT) |
| commit | 79099187058387c3d77bc33f46f02ee2315ef83d (patch) | |
| tree | 83a30b06a24a934bb4120199cd0c180ece6fc1ed /src/scanner.l | |
| parent | 8dc4ff6dd22b1603f33537ff03994cc63e658768 (diff) | |
| download | Doxygen-79099187058387c3d77bc33f46f02ee2315ef83d.zip Doxygen-79099187058387c3d77bc33f46f02ee2315ef83d.tar.gz Doxygen-79099187058387c3d77bc33f46f02ee2315ef83d.tar.bz2 | |
Release-1.8.4
Diffstat (limited to 'src/scanner.l')
| -rw-r--r-- | src/scanner.l | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/scanner.l b/src/scanner.l index 32f00c8..6bbf1c4 100644 --- a/src/scanner.l +++ b/src/scanner.l @@ -1119,6 +1119,10 @@ RAWEND ")"[^ \t\(\)\\]{0,16}\" current->type = "id"; } current->name = yytext; + if (insideCpp || insideObjC) + { + current->id = ClangParser::instance()->lookup(yyLineNr,yytext); + } } <ObjCMethod>":"{B}* { // start of parameter list current->name += ':'; @@ -6074,6 +6078,10 @@ RAWEND ")"[^ \t\(\)\\]{0,16}\" docBlock.resize(docBlock.length() - 3); lineCount(); } +<DocLine>{B}*"///"[/]+{B}*/"\n" { // ignore marker line (see bug700345) + handleCommentBlock(docBlock.data(),current->brief.isEmpty()); + BEGIN( docBlockContext ); + } <DocLine>[^\n]*/"\n" { // whole line docBlock+=yytext; handleCommentBlock(docBlock.data(),current->brief.isEmpty()); @@ -6833,7 +6841,8 @@ void CLanguageScanner::parseCode(CodeOutputInterface & codeOutIntf, bool CLanguageScanner::needsPreprocessing(const QCString &extension) { QCString fe=extension.lower(); - return + SrcLangExt lang = getLanguageFromFileName(extension); + return (SrcLangExt_Cpp == lang) || !( fe==".java" || fe==".as" || fe==".d" || fe==".php" || fe==".php4" || fe==".inc" || fe==".phtml" ); |