summaryrefslogtreecommitdiff
path: root/src/scanner.l
diff options
context:
space:
mode:
authorDongHun Kwak <dh0128.kwak@samsung.com>2021-10-15 11:15:28 +0900
committerDongHun Kwak <dh0128.kwak@samsung.com>2021-10-15 11:15:28 +0900
commit4aa4e498d10e343b3b2a49e06195f62a49120002 (patch)
treeff9645788017052b9d83d196cc25bddcfcf1708b /src/scanner.l
parentfd5021ef77ddac91004a2b9c549e08ea952bce89 (diff)
downloaddoxygen-4aa4e498d10e343b3b2a49e06195f62a49120002.tar.gz
doxygen-4aa4e498d10e343b3b2a49e06195f62a49120002.tar.bz2
doxygen-4aa4e498d10e343b3b2a49e06195f62a49120002.zip
Imported Upstream version 1.9.0upstream/1.9.0
Diffstat (limited to 'src/scanner.l')
-rw-r--r--src/scanner.l10373
1 files changed, 5208 insertions, 5165 deletions
diff --git a/src/scanner.l b/src/scanner.l
index 7c710fa..66437bc 100644
--- a/src/scanner.l
+++ b/src/scanner.l
@@ -1,12 +1,12 @@
/*****************************************************************************
*
- *
+ *
*
* Copyright (C) 1997-2015 by Dimitri van Heesch.
*
* Permission to use, copy, modify, and distribute this software and its
- * documentation under the terms of the GNU General Public License is hereby
- * granted. No representations are made about the suitability of this software
+ * documentation under the terms of the GNU General Public License is hereby
+ * granted. No representations are made about the suitability of this software
* for any purpose. It is provided "as is" without express or implied warranty.
* See the GNU General Public License for more details.
*
@@ -25,7 +25,7 @@
%{
/*
- * includes
+ * includes
*/
#include <algorithm>
@@ -60,6 +60,9 @@
#define USE_STATE2STRING 0
+static AtomicInt anonCount;
+static AtomicInt anonNSCount;
+
struct scannerYY_state
{
OutlineParserInterface *thisParser;
@@ -105,8 +108,6 @@ struct scannerYY_state
int yyBegLineNr = 1 ;
int yyColNr = 1 ;
int yyBegColNr = 1 ;
- int anonCount = 0 ;
- int anonNSCount = 0 ;
QCString yyFileName;
MethodTypes mtype = Method;
bool stat = false;
@@ -226,15 +227,15 @@ static yy_size_t yyread(yyscan_t yyscanner,char *buf,yy_size_t max_size);
/* ----------------------------------------------------------------- */
-#undef YY_INPUT
-#define YY_INPUT(buf,result,max_size) result=yyread(yyscanner,buf,max_size);
+#undef YY_INPUT
+#define YY_INPUT(buf,result,max_size) result=yyread(yyscanner,buf,max_size);
%}
/* start command character */
-CMD ("\\"|"@")
+CMD ("\\"|"@")
BN [ \t\n\r]
-BL [ \t\r]*"\n"
+BL [ \t\r]*"\n"
B [ \t]
ID "$"?[a-z_A-Z\x80-\xFF][a-z_A-Z0-9\x80-\xFF]*
SCOPENAME "$"?(({ID}?{BN}*"::"{BN}*)*)(((~|!){BN}*)?{ID})
@@ -243,7 +244,7 @@ CSSCOPENAME (({ID}?{BN}*"."{BN}*)*)((~{BN}*)?{ID})
PRE [pP][rR][eE]
CODE [cC][oO][dD][eE]
CHARLIT (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^'\\\n]{1,4}"'"))
-PHPKW ("require"|"require_once"|"include"|"include_once"|"echo")[^a-zA-Z0-9_;]
+PHPKW ("require"|"require_once"|"include"|"include_once"|"echo")[^a-zA-Z0-9_;]
PHPUSEKW ("public"|"private"|"protected")
IDLATTR ("["[^\]]*"]"){BN}*
TYPEDEFPREFIX (("typedef"{BN}+)?)((("volatile"|"const"){BN}+)?)
@@ -261,138 +262,139 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
%x AlignAs
%x AlignAsEnd
-%x Define
-%x DefineEnd
-%x CompoundName
-%x ClassVar
-%x CSConstraintName
-%x CSConstraintType
-%x CSIndexer
-%x ClassCategory
-%x ClassTemplSpec
+%x Define
+%x DefineEnd
+%x CompoundName
+%x ClassVar
+%x CSConstraintName
+%x CSConstraintType
+%x CSIndexer
+%x ClassCategory
+%x ClassTemplSpec
%x CliPropertyType
%x CliPropertyIndex
%x CliOverride
-%x Bases
-%x BasesProt
-%x NextSemi
-%x BitFields
-%x EnumBaseType
-%x FindMembers
-%x FindMembersPHP
-%x FindMemberName
+%x Bases
+%x BasesProt
+%x NextSemi
+%x BitFields
+%x EnumBaseType
+%x FindMembers
+%x FindMembersPHP
+%x FindMemberName
%x FindFields
%x FindFieldArg
-%x Function
-%x FuncRound
-%x ExcpRound
-%x ExcpList
-%x FuncQual
+%x Function
+%x FuncRound
+%x ExcpRound
+%x ExcpList
+%x FuncQual
%x TrailingReturn
-%x Operator
-%x Array
-%x ReadBody
-%x ReadNSBody
-%x ReadBodyIntf
-%x Using
-%x UsingAlias
-%x UsingAliasEnd
-%x UsingDirective
-%x SkipCurly
-%x SkipCurlyCpp
-%x SkipCurlyEndDoc
+%x Operator
+%x Array
+%x ReadBody
+%x ReadNSBody
+%x ReadBodyIntf
+%x Using
+%x UsingAlias
+%x UsingAliasEnd
+%x UsingDirective
+%x SkipCurly
+%x SkipCurlyCpp
+%x SkipCurlyEndDoc
%x SkipString
%x SkipPHPString
-%x SkipInits
-%x SkipC11Inits
+%x SkipInits
+%x SkipC11Inits
%x SkipC11Attribute
-%x SkipCPP
-%x SkipCPPBlock
-%x SkipComment
-%x SkipCxxComment
+%x SkipCPP
+%x SkipCPPBlock
+%x SkipComment
+%x SkipCxxComment
%x SkipCurlyBlock
%x SkipRoundBlock
-%x Sharp
-%x SkipRound
-%x SkipSquare
-%x SkipRemainder
+%x Sharp
+%x SkipRound
+%x SkipSquare
+%x SkipRemainder
%x StaticAssert
%x DeclType
-%x TypedefName
-%x TryFunctionBlock
-%x TryFunctionBlockEnd
-%x Comment
-%x PackageName
-%x JavaImport
-%x PHPUse
-%x PHPUseAs
-%x CSAccessorDecl
-%x CSGeneric
-%x PreLineCtrl
-%x DefinePHP
-%x DefinePHPEnd
-%x OldStyleArgs
-%x SkipVerbString
+%x TypedefName
+%x TryFunctionBlock
+%x TryFunctionBlockEnd
+%x Comment
+%x PackageName
+%x JavaImport
+%x PHPUse
+%x PHPUseAs
+%x CSAccessorDecl
+%x CSGeneric
+%x PreLineCtrl
+%x DefinePHP
+%x DefinePHPEnd
+%x OldStyleArgs
+%x SkipVerbString
%x ObjCMethod
%x ObjCReturnType
%x ObjCParams
%x ObjCParamType
%x ObjCProtocolList
-%x ObjCPropAttr
-%x ObjCSkipStatement
-%x QtPropType
-%x QtPropName
-%x QtPropAttr
-%x QtPropRead
-%x QtPropWrite
-%x ReadInitializer
-%x UNOIDLAttributeBlock
-%x GetCallType
-%x CppQuote
-%x EndCppQuote
+%x ObjCPropAttr
+%x ObjCSkipStatement
+%x QtPropType
+%x QtPropName
+%x QtPropAttr
+%x QtPropRead
+%x QtPropWrite
+%x ReadInitializer
+%x ReadInitializerPtr
+%x UNOIDLAttributeBlock
+%x GetCallType
+%x CppQuote
+%x EndCppQuote
%x MemberSpec
%x MemberSpecSkip
-%x EndTemplate
-%x FuncPtr
-%x FuncPtrOperator
-%x EndFuncPtr
-%x ReadFuncArgType
-%x ReadTempArgs
-%x IDLUnionCase
-%x NSAliasName
-%x NSAliasArg
-%x CopyString
-%x CopyPHPString
-%x CopyGString
-%x CopyPHPGString
-%x CopyRound
-%x CopyCurly
-%x GCopyRound
-%x GCopySquare
-%x GCopyCurly
-%x SkipUnionSwitch
-%x Specialization
-%x SpecializationSingleQuote
-%x SpecializationDoubleQuote
-%x FuncPtrInit
-%x FuncFunc
-%x FuncFuncEnd
-%x FuncFuncType
-%x FuncFuncArray
+%x EndTemplate
+%x FuncPtr
+%x FuncPtrOperator
+%x EndFuncPtr
+%x ReadFuncArgType
+%x ReadTempArgs
+%x IDLUnionCase
+%x NSAliasName
+%x NSAliasArg
+%x CopyString
+%x CopyPHPString
+%x CopyGString
+%x CopyPHPGString
+%x CopyRound
+%x CopyCurly
+%x GCopyRound
+%x GCopySquare
+%x GCopyCurly
+%x SkipUnionSwitch
+%x Specialization
+%x SpecializationSingleQuote
+%x SpecializationDoubleQuote
+%x FuncPtrInit
+%x FuncFunc
+%x FuncFuncEnd
+%x FuncFuncType
+%x FuncFuncArray
%x CopyArgString
%x CopyArgPHPString
-%x CopyArgRound
-%x CopyArgSharp
-%x CopyArgComment
-%x CopyArgCommentLine
-%x CopyArgVerbatim
-%x HereDoc
-%x HereDocEnd
-%x CopyHereDoc
-%x CopyHereDocEnd
-%x RawString
-%x RawGString
-%x CSString
+%x CopyArgRound
+%x CopyArgSharp
+%x CopyArgComment
+%x CopyArgCommentLine
+%x CopyArgVerbatim
+%x HereDoc
+%x HereDocEnd
+%x CopyHereDoc
+%x CopyHereDocEnd
+%x RawString
+%x RawGString
+%x CSString
%x IDLAttribute
%x IDLProp
@@ -417,421 +419,421 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
/** comment parsing states */
-%x DocLine
-%x DocBlock
+%x DocLine
+%x DocBlock
%x DocCopyBlock
%%
-<NextSemi>"{" {
- yyextra->curlyCount=0;
- yyextra->needsSemi = TRUE;
- BEGIN(SkipCurlyBlock);
- }
-<NextSemi>"(" {
- yyextra->roundCount=0;
- BEGIN(SkipRoundBlock);
- }
-<SkipRoundBlock>"(" {
- ++yyextra->roundCount;
- }
-<SkipRoundBlock>")" {
- if (yyextra->roundCount )
- --yyextra->roundCount ;
- else
- BEGIN( NextSemi ) ;
- }
-<SkipCurlyBlock>"{" {
- ++yyextra->curlyCount ;
- }
-<SkipCurlyBlock>"}" {
- if( yyextra->curlyCount )
- {
- --yyextra->curlyCount ;
- }
- else if (yyextra->needsSemi)
- {
- BEGIN( NextSemi );
- }
- else
- {
- BEGIN( FindMembers );
- }
- }
-<NextSemi>\' {
- if (yyextra->insidePHP)
- {
- yyextra->lastStringContext=NextSemi;
- BEGIN(SkipPHPString);
- }
- }
-<NextSemi>{CHARLIT} { if (yyextra->insidePHP) REJECT; }
-<NextSemi>\" {
- yyextra->lastStringContext=NextSemi;
- BEGIN(SkipString);
- }
-<NextSemi>[;,] {
- unput(*yytext);
- BEGIN( FindMembers );
- }
-<BitFields>[;,] {
- unput(*yytext);
- BEGIN( FindMembers );
- }
+<NextSemi>"{" {
+ yyextra->curlyCount=0;
+ yyextra->needsSemi = TRUE;
+ BEGIN(SkipCurlyBlock);
+ }
+<NextSemi>"(" {
+ yyextra->roundCount=0;
+ BEGIN(SkipRoundBlock);
+ }
+<SkipRoundBlock>"(" {
+ ++yyextra->roundCount;
+ }
+<SkipRoundBlock>")" {
+ if (yyextra->roundCount )
+ --yyextra->roundCount ;
+ else
+ BEGIN( NextSemi ) ;
+ }
+<SkipCurlyBlock>"{" {
+ ++yyextra->curlyCount ;
+ }
+<SkipCurlyBlock>"}" {
+ if( yyextra->curlyCount )
+ {
+ --yyextra->curlyCount ;
+ }
+ else if (yyextra->needsSemi)
+ {
+ BEGIN( NextSemi );
+ }
+ else
+ {
+ BEGIN( FindMembers );
+ }
+ }
+<NextSemi>\' {
+ if (yyextra->insidePHP)
+ {
+ yyextra->lastStringContext=NextSemi;
+ BEGIN(SkipPHPString);
+ }
+ }
+<NextSemi>{CHARLIT} { if (yyextra->insidePHP) REJECT; }
+<NextSemi>\" {
+ yyextra->lastStringContext=NextSemi;
+ BEGIN(SkipString);
+ }
+<NextSemi>[;,] {
+ unput(*yytext);
+ BEGIN( FindMembers );
+ }
+<BitFields>[;,] {
+ unput(*yytext);
+ BEGIN( FindMembers );
+ }
<EnumBaseType>[{;,] {
yyextra->current->args = yyextra->current->args.simplifyWhiteSpace();
- unput(*yytext);
- BEGIN( ClassVar );
+ unput(*yytext);
+ BEGIN( ClassVar );
}
-<FindMembers>"<?php" { // PHP code with unsupported extension?
+<FindMembers>"<?php" { // PHP code with unsupported extension?
yyextra->insidePHP = TRUE;
- }
+ }
<FindMembersPHP>"<?"("php"?) { // PHP code start
BEGIN( FindMembers );
- }
+ }
<FindMembersPHP>"<script"{BN}+"language"{BN}*"="{BN}*['"]?"php"['"]?{BN}*">" { // PHP code start
- lineCount(yyscanner) ;
+ lineCount(yyscanner) ;
BEGIN( FindMembers );
- }
+ }
<FindMembers>"?>"|"</script>" { // PHP code end
- if (yyextra->insidePHP)
- BEGIN( FindMembersPHP );
- else
- REJECT;
+ if (yyextra->insidePHP)
+ BEGIN( FindMembersPHP );
+ else
+ REJECT;
}
<FindMembersPHP>[^\n<]+ { // Non-PHP code text, ignore
- }
+ }
<FindMembersPHP>\n { // Non-PHP code text, ignore
lineCount(yyscanner);
- }
+ }
<FindMembersPHP>. { // Non-PHP code text, ignore
- }
-<FindMembers>{PHPKW} { if (yyextra->insidePHP)
- BEGIN( NextSemi );
- else
- REJECT;
- }
-<FindMembers>"%{"[^\n]* { // Mozilla XPIDL lang-specific block
- if (!yyextra->insideIDL)
- REJECT;
- }
-<FindMembers>"%}" { // Mozilla XPIDL lang-specific block end
- if (!yyextra->insideIDL)
- REJECT;
- }
-<FindMembers>{B}*("properties"){BN}*":"{BN}* { // IDL or Borland C++ builder property
- yyextra->current->mtype = yyextra->mtype = Property;
- yyextra->current->protection = yyextra->protection = Public ;
- yyextra->current->type.resize(0);
- yyextra->current->name.resize(0);
- yyextra->current->args.resize(0);
- yyextra->current->argList.clear();
- lineCount(yyscanner) ;
- }
+ }
+<FindMembers>{PHPKW} { if (yyextra->insidePHP)
+ BEGIN( NextSemi );
+ else
+ REJECT;
+ }
+<FindMembers>"%{"[^\n]* { // Mozilla XPIDL lang-specific block
+ if (!yyextra->insideIDL)
+ REJECT;
+ }
+<FindMembers>"%}" { // Mozilla XPIDL lang-specific block end
+ if (!yyextra->insideIDL)
+ REJECT;
+ }
+<FindMembers>{B}*("properties"){BN}*":"{BN}* { // IDL or Borland C++ builder property
+ yyextra->current->mtype = yyextra->mtype = Property;
+ yyextra->current->protection = yyextra->protection = Public ;
+ yyextra->current->type.resize(0);
+ yyextra->current->name.resize(0);
+ yyextra->current->args.resize(0);
+ yyextra->current->argList.clear();
+ lineCount(yyscanner) ;
+ }
<FindMembers>{B}*"k_dcop"{BN}*":"{BN}* { yyextra->current->mtype = yyextra->mtype = DCOP;
- yyextra->current->protection = yyextra->protection = Public ;
- yyextra->current->type.resize(0);
- yyextra->current->name.resize(0);
- yyextra->current->args.resize(0);
- yyextra->current->argList.clear();
- lineCount(yyscanner) ;
- }
+ yyextra->current->protection = yyextra->protection = Public ;
+ yyextra->current->type.resize(0);
+ yyextra->current->name.resize(0);
+ yyextra->current->args.resize(0);
+ yyextra->current->argList.clear();
+ lineCount(yyscanner) ;
+ }
<FindMembers>{B}*("signals"|"Q_SIGNALS"){BN}*":"{BN}* { yyextra->current->mtype = yyextra->mtype = Signal;
-
- yyextra->current->protection = yyextra->protection = Public ;
- yyextra->current->type.resize(0);
- yyextra->current->name.resize(0);
- yyextra->current->args.resize(0);
- yyextra->current->argList.clear();
- lineCount(yyscanner) ;
- }
+
+ yyextra->current->protection = yyextra->protection = Public ;
+ yyextra->current->type.resize(0);
+ yyextra->current->name.resize(0);
+ yyextra->current->args.resize(0);
+ yyextra->current->argList.clear();
+ lineCount(yyscanner) ;
+ }
<FindMembers>{B}*"public"{BN}*("slots"|"Q_SLOTS"){BN}*":"{BN}* {
- yyextra->current->protection = yyextra->protection = Public ;
- yyextra->current->mtype = yyextra->mtype = Slot;
- yyextra->current->type.resize(0);
- yyextra->current->name.resize(0);
- yyextra->current->args.resize(0);
- yyextra->current->argList.clear();
- lineCount(yyscanner);
- }
+ yyextra->current->protection = yyextra->protection = Public ;
+ yyextra->current->mtype = yyextra->mtype = Slot;
+ yyextra->current->type.resize(0);
+ yyextra->current->name.resize(0);
+ yyextra->current->args.resize(0);
+ yyextra->current->argList.clear();
+ lineCount(yyscanner);
+ }
<FindMembers>{B}*"protected"{BN}*("slots"|"Q_SLOTS"){BN}*":"{BN}* {
- yyextra->current->protection = yyextra->protection = Protected ;
- yyextra->current->mtype = yyextra->mtype = Slot;
- yyextra->current->type.resize(0);
- yyextra->current->name.resize(0);
- yyextra->current->args.resize(0);
- yyextra->current->argList.clear();
- lineCount(yyscanner);
- }
+ yyextra->current->protection = yyextra->protection = Protected ;
+ yyextra->current->mtype = yyextra->mtype = Slot;
+ yyextra->current->type.resize(0);
+ yyextra->current->name.resize(0);
+ yyextra->current->args.resize(0);
+ yyextra->current->argList.clear();
+ lineCount(yyscanner);
+ }
<FindMembers>{B}*"private"{BN}*("slots"|"Q_SLOTS"){BN}*":"{BN}* {
- yyextra->current->protection = yyextra->protection = Private ;
- yyextra->current->mtype = yyextra->mtype = Slot;
- yyextra->current->type.resize(0);
- yyextra->current->name.resize(0);
- yyextra->current->args.resize(0);
- yyextra->current->argList.clear();
- lineCount(yyscanner);
- }
-<FindMembers>{B}*("public"|"methods"|"__published"){BN}*":"{BN}* {
- yyextra->current->protection = yyextra->protection = Public ;
- yyextra->current->mtype = yyextra->mtype = Method;
- yyextra->current->type.resize(0);
- yyextra->current->name.resize(0);
- yyextra->current->args.resize(0);
- yyextra->current->argList.clear();
- lineCount(yyscanner) ;
- }
+ yyextra->current->protection = yyextra->protection = Private ;
+ yyextra->current->mtype = yyextra->mtype = Slot;
+ yyextra->current->type.resize(0);
+ yyextra->current->name.resize(0);
+ yyextra->current->args.resize(0);
+ yyextra->current->argList.clear();
+ lineCount(yyscanner);
+ }
+<FindMembers>{B}*("public"|"methods"|"__published"){BN}*":"{BN}* {
+ yyextra->current->protection = yyextra->protection = Public ;
+ yyextra->current->mtype = yyextra->mtype = Method;
+ yyextra->current->type.resize(0);
+ yyextra->current->name.resize(0);
+ yyextra->current->args.resize(0);
+ yyextra->current->argList.clear();
+ lineCount(yyscanner) ;
+ }
<FindMembers>{B}*"internal"{BN}*":"{BN}* { // for now treat C++/CLI's internal as package...
- if (yyextra->insideCli)
- {
- yyextra->current->protection = yyextra->protection = Package ;
- yyextra->current->mtype = yyextra->mtype = Method;
- yyextra->current->type.resize(0);
- yyextra->current->name.resize(0);
- yyextra->current->args.resize(0);
- yyextra->current->argList.clear();
- lineCount(yyscanner) ;
- }
- else
- {
- REJECT;
- }
- }
-<FindMembers>{B}*"protected"{BN}*":"{BN}* {
- yyextra->current->protection = yyextra->protection = Protected ;
- yyextra->current->mtype = yyextra->mtype = Method;
- yyextra->current->type.resize(0);
- yyextra->current->name.resize(0);
- yyextra->current->args.resize(0);
- yyextra->current->argList.clear();
- lineCount(yyscanner) ;
- }
-<FindMembers>{B}*"private"{BN}*":"{BN}* {
- yyextra->current->protection = yyextra->protection = Private ;
- yyextra->current->mtype = yyextra->mtype = Method;
- yyextra->current->type.resize(0);
- yyextra->current->name.resize(0);
- yyextra->current->args.resize(0);
- yyextra->current->argList.clear();
- lineCount(yyscanner) ;
- }
-<FindMembers>{B}*"event"{BN}+ {
- if (yyextra->insideCli)
- {
- // C++/CLI event
- lineCount(yyscanner) ;
- yyextra->current->mtype = yyextra->mtype = Event;
- yyextra->current->bodyLine = yyextra->yyLineNr;
- yyextra->current->bodyColumn = yyextra->yyColNr;
- yyextra->curlyCount=0;
- BEGIN( CliPropertyType );
- }
- else if (yyextra->insideCS)
- {
- lineCount(yyscanner) ;
- yyextra->current->mtype = Event;
- yyextra->current->bodyLine = yyextra->yyLineNr;
- yyextra->current->bodyColumn = yyextra->yyColNr;
- }
- else
- {
- REJECT;
- }
- }
-<FindMembers>{B}*"property"{BN}+ {
- if (yyextra->insideCli)
- {
- // C++/CLI property
- lineCount(yyscanner) ;
- yyextra->current->mtype = yyextra->mtype = Property;
- yyextra->current->bodyLine = yyextra->yyLineNr;
- yyextra->current->bodyColumn = yyextra->yyColNr;
- yyextra->curlyCount=0;
- BEGIN( CliPropertyType );
- }
- else
- {
- REJECT;
- }
- }
-<CliPropertyType>{ID} {
- addType(yyscanner);
- yyextra->current->name = yytext;
- }
-<CliPropertyType>"[" { // C++/CLI indexed property
- yyextra->current->args = "[";
- BEGIN( CliPropertyIndex );
- }
-<CliPropertyType>"{" {
- yyextra->curlyCount=0;
- //printf("event: '%s' '%s'\n",yyextra->current->type.data(),yyextra->current->name.data());
- BEGIN( CSAccessorDecl );
- }
-<CliPropertyType>";" {
- unput(*yytext);
- BEGIN( FindMembers );
- }
-<CliPropertyType>\n {
+ if (yyextra->insideCli)
+ {
+ yyextra->current->protection = yyextra->protection = Package ;
+ yyextra->current->mtype = yyextra->mtype = Method;
+ yyextra->current->type.resize(0);
+ yyextra->current->name.resize(0);
+ yyextra->current->args.resize(0);
+ yyextra->current->argList.clear();
+ lineCount(yyscanner) ;
+ }
+ else
+ {
+ REJECT;
+ }
+ }
+<FindMembers>{B}*"protected"{BN}*":"{BN}* {
+ yyextra->current->protection = yyextra->protection = Protected ;
+ yyextra->current->mtype = yyextra->mtype = Method;
+ yyextra->current->type.resize(0);
+ yyextra->current->name.resize(0);
+ yyextra->current->args.resize(0);
+ yyextra->current->argList.clear();
+ lineCount(yyscanner) ;
+ }
+<FindMembers>{B}*"private"{BN}*":"{BN}* {
+ yyextra->current->protection = yyextra->protection = Private ;
+ yyextra->current->mtype = yyextra->mtype = Method;
+ yyextra->current->type.resize(0);
+ yyextra->current->name.resize(0);
+ yyextra->current->args.resize(0);
+ yyextra->current->argList.clear();
+ lineCount(yyscanner) ;
+ }
+<FindMembers>{B}*"event"{BN}+ {
+ if (yyextra->insideCli)
+ {
+ // C++/CLI event
+ lineCount(yyscanner) ;
+ yyextra->current->mtype = yyextra->mtype = Event;
+ yyextra->current->bodyLine = yyextra->yyLineNr;
+ yyextra->current->bodyColumn = yyextra->yyColNr;
+ yyextra->curlyCount=0;
+ BEGIN( CliPropertyType );
+ }
+ else if (yyextra->insideCS)
+ {
+ lineCount(yyscanner) ;
+ yyextra->current->mtype = Event;
+ yyextra->current->bodyLine = yyextra->yyLineNr;
+ yyextra->current->bodyColumn = yyextra->yyColNr;
+ }
+ else
+ {
+ REJECT;
+ }
+ }
+<FindMembers>{B}*"property"{BN}+ {
+ if (yyextra->insideCli)
+ {
+ // C++/CLI property
+ lineCount(yyscanner) ;
+ yyextra->current->mtype = yyextra->mtype = Property;
+ yyextra->current->bodyLine = yyextra->yyLineNr;
+ yyextra->current->bodyColumn = yyextra->yyColNr;
+ yyextra->curlyCount=0;
+ BEGIN( CliPropertyType );
+ }
+ else
+ {
+ REJECT;
+ }
+ }
+<CliPropertyType>{ID} {
+ addType(yyscanner);
+ yyextra->current->name = yytext;
+ }
+<CliPropertyType>"[" { // C++/CLI indexed property
+ yyextra->current->args = "[";
+ BEGIN( CliPropertyIndex );
+ }
+<CliPropertyType>"{" {
+ yyextra->curlyCount=0;
+ //printf("event: '%s' '%s'\n",yyextra->current->type.data(),yyextra->current->name.data());
+ BEGIN( CSAccessorDecl );
+ }
+<CliPropertyType>";" {
+ unput(*yytext);
+ BEGIN( FindMembers );
+ }
+<CliPropertyType>\n {
lineCount(yyscanner);
- }
-<CliPropertyType>{B}* {
- }
-<CliPropertyType>. {
- addType(yyscanner);
- yyextra->current->type += yytext;
- }
-<CliPropertyIndex>"]" {
+ }
+<CliPropertyType>{B}* {
+ }
+<CliPropertyType>. {
+ addType(yyscanner);
+ yyextra->current->type += yytext;
+ }
+<CliPropertyIndex>"]" {
BEGIN( CliPropertyType );
- yyextra->current->args+=yytext;
- }
-<CliPropertyIndex>. {
- yyextra->current->args+=yytext;
- }
+ yyextra->current->args+=yytext;
+ }
+<CliPropertyIndex>. {
+ yyextra->current->args+=yytext;
+ }
/*
-<FindMembers>{B}*"property"{BN}+ {
+<FindMembers>{B}*"property"{BN}+ {
if (!yyextra->current->type.isEmpty())
- {
- REJECT;
+ {
+ REJECT;
}
- else
- {
+ else
+ {
yyextra->current->mtype = yyextra->mtype = Property;
lineCount(yyscanner);
- }
+ }
}
*/
-<FindMembers>{B}*"@private"{BN}+ {
- yyextra->current->protection = yyextra->protection = Private ;
- yyextra->current->mtype = yyextra->mtype = Method;
- yyextra->current->type.resize(0);
- yyextra->current->name.resize(0);
- yyextra->current->args.resize(0);
- yyextra->current->argList.clear();
- lineCount(yyscanner) ;
- }
-<FindMembers>{B}*"@protected"{BN}+ {
- yyextra->current->protection = yyextra->protection = Protected ;
- yyextra->current->mtype = yyextra->mtype = Method;
- yyextra->current->type.resize(0);
- yyextra->current->name.resize(0);
- yyextra->current->args.resize(0);
- yyextra->current->argList.clear();
- lineCount(yyscanner) ;
- }
-<FindMembers>{B}*"@public"{BN}+ {
- yyextra->current->protection = yyextra->protection = Public ;
- yyextra->current->mtype = yyextra->mtype = Method;
- yyextra->current->type.resize(0);
- yyextra->current->name.resize(0);
- yyextra->current->args.resize(0);
- yyextra->current->argList.clear();
- lineCount(yyscanner) ;
- }
-<FindMembers>[\-+]{BN}* {
- if (!yyextra->insideObjC)
- {
- REJECT;
- }
- else
- {
- lineCount(yyscanner);
- yyextra->current->fileName = yyextra->yyFileName;
- yyextra->current->startLine = yyextra->yyLineNr;
- yyextra->current->startColumn = yyextra->yyColNr;
- yyextra->current->bodyLine = yyextra->yyLineNr;
- yyextra->current->bodyColumn = yyextra->yyColNr;
- yyextra->current->section = Entry::FUNCTION_SEC;
- yyextra->current->protection = yyextra->protection = Public ;
- yyextra->language = yyextra->current->lang = SrcLangExt_ObjC;
- yyextra->insideObjC = TRUE;
- yyextra->current->virt = Virtual;
- yyextra->current->stat=yytext[0]=='+';
- yyextra->current->mtype = yyextra->mtype = Method;
- yyextra->current->type.resize(0);
- yyextra->current->name.resize(0);
- yyextra->current->args.resize(0);
- yyextra->current->argList.clear();
- BEGIN( ObjCMethod );
- }
- }
-<ObjCMethod>"(" { // start of method's return type
- BEGIN( ObjCReturnType );
- }
-<ObjCMethod>{ID} { // found method name
- if (yyextra->current->type.isEmpty())
- {
- yyextra->current->type = "id";
- }
- yyextra->current->name = yytext;
+<FindMembers>{B}*"@private"{BN}+ {
+ yyextra->current->protection = yyextra->protection = Private ;
+ yyextra->current->mtype = yyextra->mtype = Method;
+ yyextra->current->type.resize(0);
+ yyextra->current->name.resize(0);
+ yyextra->current->args.resize(0);
+ yyextra->current->argList.clear();
+ lineCount(yyscanner) ;
+ }
+<FindMembers>{B}*"@protected"{BN}+ {
+ yyextra->current->protection = yyextra->protection = Protected ;
+ yyextra->current->mtype = yyextra->mtype = Method;
+ yyextra->current->type.resize(0);
+ yyextra->current->name.resize(0);
+ yyextra->current->args.resize(0);
+ yyextra->current->argList.clear();
+ lineCount(yyscanner) ;
+ }
+<FindMembers>{B}*"@public"{BN}+ {
+ yyextra->current->protection = yyextra->protection = Public ;
+ yyextra->current->mtype = yyextra->mtype = Method;
+ yyextra->current->type.resize(0);
+ yyextra->current->name.resize(0);
+ yyextra->current->args.resize(0);
+ yyextra->current->argList.clear();
+ lineCount(yyscanner) ;
+ }
+<FindMembers>[\-+]{BN}* {
+ if (!yyextra->insideObjC)
+ {
+ REJECT;
+ }
+ else
+ {
+ lineCount(yyscanner);
+ yyextra->current->fileName = yyextra->yyFileName;
+ yyextra->current->startLine = yyextra->yyLineNr;
+ yyextra->current->startColumn = yyextra->yyColNr;
+ yyextra->current->bodyLine = yyextra->yyLineNr;
+ yyextra->current->bodyColumn = yyextra->yyColNr;
+ yyextra->current->section = Entry::FUNCTION_SEC;
+ yyextra->current->protection = yyextra->protection = Public ;
+ yyextra->language = yyextra->current->lang = SrcLangExt_ObjC;
+ yyextra->insideObjC = TRUE;
+ yyextra->current->virt = Virtual;
+ yyextra->current->stat=yytext[0]=='+';
+ yyextra->current->mtype = yyextra->mtype = Method;
+ yyextra->current->type.resize(0);
+ yyextra->current->name.resize(0);
+ yyextra->current->args.resize(0);
+ yyextra->current->argList.clear();
+ BEGIN( ObjCMethod );
+ }
+ }
+<ObjCMethod>"(" { // start of method's return type
+ BEGIN( ObjCReturnType );
+ }
+<ObjCMethod>{ID} { // found method name
+ if (yyextra->current->type.isEmpty())
+ {
+ yyextra->current->type = "id";
+ }
+ yyextra->current->name = yytext;
if (yyextra->clangParser && (yyextra->insideCpp || yyextra->insideObjC))
{
yyextra->current->id = yyextra->clangParser->lookup(yyextra->yyLineNr,yytext);
}
- }
-<ObjCMethod>":"{B}* { // start of parameter list
- yyextra->current->name += ':';
- Argument a;
- yyextra->current->argList.push_back(a);
- BEGIN( ObjCParams );
- }
-<ObjCReturnType>[^)]* { // TODO: check if nested braches are possible.
- yyextra->current->type = yytext;
- }
-<ObjCReturnType>")" {
- BEGIN( ObjCMethod );
- }
-<ObjCParams>({ID})?{BN}*":" { // Keyword of parameter
- QCString keyw = yytext;
- keyw=keyw.left(keyw.length()-1).stripWhiteSpace(); // strip :
- if (keyw.isEmpty())
- {
- yyextra->current->name += " :";
- }
- else
- {
- yyextra->current->name += keyw+":";
- }
- if (yyextra->current->argList.back().type.isEmpty())
- {
- yyextra->current->argList.back().type="id";
- }
- Argument a;
- a.attrib=(QCString)"["+keyw+"]";
- yyextra->current->argList.push_back(a);
- }
-<ObjCParams>{ID}{BN}* { // name of parameter
- lineCount(yyscanner);
- yyextra->current->argList.back().name=QCString(yytext).stripWhiteSpace();
- }
-<ObjCParams>","{BN}*"..." { // name of parameter
- lineCount(yyscanner);
- // do we want the comma as part of the name?
- //yyextra->current->name += ",";
- Argument a;
- a.attrib="[,]";
- a.type="...";
- yyextra->current->argList.push_back(a);
- }
+ }
+<ObjCMethod>":"{B}* { // start of parameter list
+ yyextra->current->name += ':';
+ Argument a;
+ yyextra->current->argList.push_back(a);
+ BEGIN( ObjCParams );
+ }
+<ObjCReturnType>[^)]* { // TODO: check if nested braches are possible.
+ yyextra->current->type = yytext;
+ }
+<ObjCReturnType>")" {
+ BEGIN( ObjCMethod );
+ }
+<ObjCParams>({ID})?{BN}*":" { // Keyword of parameter
+ QCString keyw = yytext;
+ keyw=keyw.left(keyw.length()-1).stripWhiteSpace(); // strip :
+ if (keyw.isEmpty())
+ {
+ yyextra->current->name += " :";
+ }
+ else
+ {
+ yyextra->current->name += keyw+":";
+ }
+ if (yyextra->current->argList.back().type.isEmpty())
+ {
+ yyextra->current->argList.back().type="id";
+ }
+ Argument a;
+ a.attrib=(QCString)"["+keyw+"]";
+ yyextra->current->argList.push_back(a);
+ }
+<ObjCParams>{ID}{BN}* { // name of parameter
+ lineCount(yyscanner);
+ yyextra->current->argList.back().name=QCString(yytext).stripWhiteSpace();
+ }
+<ObjCParams>","{BN}*"..." { // name of parameter
+ lineCount(yyscanner);
+ // do we want the comma as part of the name?
+ //yyextra->current->name += ",";
+ Argument a;
+ a.attrib="[,]";
+ a.type="...";
+ yyextra->current->argList.push_back(a);
+ }
/*
-<ObjCParams>":" {
- yyextra->current->name += ':';
- }
+<ObjCParams>":" {
+ yyextra->current->name += ':';
+ }
*/
-<ObjCParams>"(" {
- yyextra->roundCount=0;
- yyextra->current->argList.back().type.resize(0);
- BEGIN( ObjCParamType );
- }
+<ObjCParams>"(" {
+ yyextra->roundCount=0;
+ yyextra->current->argList.back().type.resize(0);
+ BEGIN( ObjCParamType );
+ }
<ObjCParamType>"(" {
yyextra->roundCount++;
- yyextra->current->argList.back().type+=yytext;
+ yyextra->current->argList.back().type+=yytext;
}
-<ObjCParamType>")"/{B}* {
+<ObjCParamType>")"/{B}* {
if (yyextra->roundCount<=0)
{
BEGIN( ObjCParams );
@@ -841,221 +843,221 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
yyextra->current->argList.back().type+=yytext;
yyextra->roundCount--;
}
- }
-<ObjCParamType>[^()]* {
- yyextra->current->argList.back().type+=QCString(yytext).stripWhiteSpace();
- }
-<ObjCMethod,ObjCParams>";" { // end of method declaration
- if (!yyextra->current->argList.empty() && yyextra->current->argList.back().type.isEmpty())
- {
- yyextra->current->argList.back().type="id";
- }
+ }
+<ObjCParamType>[^()]* {
+ yyextra->current->argList.back().type+=QCString(yytext).stripWhiteSpace();
+ }
+<ObjCMethod,ObjCParams>";" { // end of method declaration
+ if (!yyextra->current->argList.empty() && yyextra->current->argList.back().type.isEmpty())
+ {
+ yyextra->current->argList.back().type="id";
+ }
if (yyextra->current->argList.empty()) // method without parameters
{
yyextra->current->argList.setNoParameters(TRUE);
}
- yyextra->current->args = argListToString(yyextra->current->argList);
- //printf("argList=%s\n",yyextra->current->args.data());
- unput(';');
- BEGIN( Function );
+ yyextra->current->args = argListToString(yyextra->current->argList);
+ //printf("argList=%s\n",yyextra->current->args.data());
+ unput(';');
+ BEGIN( Function );
}
-<ObjCMethod,ObjCParams>(";"{BN}+)?"{" { // start of a method body
- lineCount(yyscanner);
+<ObjCMethod,ObjCParams>(";"{BN}+)?"{" { // start of a method body
+ lineCount(yyscanner);
//printf("Type=%s Name=%s args=%s\n",
- // yyextra->current->type.data(),yyextra->current->name.data(),argListToString(yyextra->current->argList).data()
- // );
- if (!yyextra->current->argList.empty() && yyextra->current->argList.back().type.isEmpty())
- {
- yyextra->current->argList.back().type="id";
- }
+ // yyextra->current->type.data(),yyextra->current->name.data(),argListToString(yyextra->current->argList).data()
+ // );
+ if (!yyextra->current->argList.empty() && yyextra->current->argList.back().type.isEmpty())
+ {
+ yyextra->current->argList.back().type="id";
+ }
if (yyextra->current->argList.empty()) // method without parameters
{
yyextra->current->argList.setNoParameters(TRUE);
}
- yyextra->current->args = argListToString(yyextra->current->argList);
+ yyextra->current->args = argListToString(yyextra->current->argList);
unput('{');
- BEGIN( Function );
- }
+ BEGIN( Function );
+ }
<FindMembers>{B}*"sequence"{BN}*"<"{BN}* {
- if (yyextra->insideSlice)
- {
+ if (yyextra->insideSlice)
+ {
lineCount(yyscanner);
- yyextra->current->bodyLine = yyextra->yyLineNr;
- yyextra->current->bodyColumn = yyextra->yyColNr;
+ yyextra->current->bodyLine = yyextra->yyLineNr;
+ yyextra->current->bodyColumn = yyextra->yyColNr;
yyextra->current->fileName = yyextra->yyFileName ;
- yyextra->current->startLine = yyextra->yyLineNr ;
- yyextra->current->startColumn = yyextra->yyColNr;
+ yyextra->current->startLine = yyextra->yyLineNr ;
+ yyextra->current->startColumn = yyextra->yyColNr;
yyextra->current->args.resize(0);
- yyextra->current->section = Entry::TYPEDEF_SEC ;
+ yyextra->current->section = Entry::TYPEDEF_SEC ;
yyextra->isTypedef = TRUE;
- BEGIN( SliceSequence );
- }
- else
- REJECT;
- }
+ BEGIN( SliceSequence );
+ }
+ else
+ REJECT;
+ }
<FindMembers>{B}*"dictionary"{BN}*"<"{BN}* {
- if (yyextra->insideSlice)
- {
+ if (yyextra->insideSlice)
+ {
lineCount(yyscanner);
- yyextra->current->bodyLine = yyextra->yyLineNr;
- yyextra->current->bodyColumn = yyextra->yyColNr;
+ yyextra->current->bodyLine = yyextra->yyLineNr;
+ yyextra->current->bodyColumn = yyextra->yyColNr;
yyextra->current->fileName = yyextra->yyFileName ;
- yyextra->current->startLine = yyextra->yyLineNr ;
- yyextra->current->startColumn = yyextra->yyColNr;
+ yyextra->current->startLine = yyextra->yyLineNr ;
+ yyextra->current->startColumn = yyextra->yyColNr;
yyextra->current->args.resize(0);
- yyextra->current->section = Entry::TYPEDEF_SEC ;
+ yyextra->current->section = Entry::TYPEDEF_SEC ;
yyextra->isTypedef = TRUE;
- BEGIN( SliceDictionary );
- }
- else
- REJECT;
- }
-<FindMembers>{BN}{1,80} {
- lineCount(yyscanner);
- }
-<FindMembers>"@"({ID}".")*{ID}{BN}*"(" {
- if (yyextra->insideJava) // Java annotation
- {
- lineCount(yyscanner);
- yyextra->lastSkipRoundContext = YY_START;
- yyextra->roundCount=0;
- BEGIN( SkipRound );
- }
- else if (qstrncmp(yytext,"@property",9)==0) // ObjC 2.0 property
- {
- yyextra->current->mtype = yyextra->mtype = Property;
- yyextra->current->spec|=Entry::Readable | Entry::Writable | Entry::Assign;
- yyextra->current->protection = Public ;
- unput('(');
- BEGIN( ObjCPropAttr );
- }
- else
- {
- REJECT;
- }
- }
-<ObjCPropAttr>"getter="{ID} {
+ BEGIN( SliceDictionary );
+ }
+ else
+ REJECT;
+ }
+<FindMembers>{BN}{1,80} {
+ lineCount(yyscanner);
+ }
+<FindMembers>"@"({ID}".")*{ID}{BN}*"(" {
+ if (yyextra->insideJava) // Java annotation
+ {
+ lineCount(yyscanner);
+ yyextra->lastSkipRoundContext = YY_START;
+ yyextra->roundCount=0;
+ BEGIN( SkipRound );
+ }
+ else if (qstrncmp(yytext,"@property",9)==0) // ObjC 2.0 property
+ {
+ yyextra->current->mtype = yyextra->mtype = Property;
+ yyextra->current->spec|=Entry::Readable | Entry::Writable | Entry::Assign;
+ yyextra->current->protection = Public ;
+ unput('(');
+ BEGIN( ObjCPropAttr );
+ }
+ else
+ {
+ REJECT;
+ }
+ }
+<ObjCPropAttr>"getter="{ID} {
yyextra->current->read = yytext+7;
- }
-<ObjCPropAttr>"setter="{ID} {
+ }
+<ObjCPropAttr>"setter="{ID} {
yyextra->current->write = yytext+7;
- }
-<ObjCPropAttr>"readonly" {
- yyextra->current->spec&=~Entry::Writable;
- }
-<ObjCPropAttr>"readwrite" { // default
- }
-<ObjCPropAttr>"assign" { // default
- }
+ }
+<ObjCPropAttr>"readonly" {
+ yyextra->current->spec&=~Entry::Writable;
+ }
+<ObjCPropAttr>"readwrite" { // default
+ }
+<ObjCPropAttr>"assign" { // default
+ }
<ObjCPropAttr>"unsafe_unretained" {
- yyextra->current->spec&=~Entry::Assign;
- yyextra->current->spec|=Entry::Unretained;
- }
-<ObjCPropAttr>"retain" {
- yyextra->current->spec&=~Entry::Assign;
- yyextra->current->spec|=Entry::Retain;
- }
-<ObjCPropAttr>"copy" {
- yyextra->current->spec&=~Entry::Assign;
- yyextra->current->spec|=Entry::Copy;
- }
+ yyextra->current->spec&=~Entry::Assign;
+ yyextra->current->spec|=Entry::Unretained;
+ }
+<ObjCPropAttr>"retain" {
+ yyextra->current->spec&=~Entry::Assign;
+ yyextra->current->spec|=Entry::Retain;
+ }
+<ObjCPropAttr>"copy" {
+ yyextra->current->spec&=~Entry::Assign;
+ yyextra->current->spec|=Entry::Copy;
+ }
<ObjCPropAttr>"weak" {
- yyextra->current->spec&=~Entry::Assign;
- yyextra->current->spec|=Entry::Weak;
+ yyextra->current->spec&=~Entry::Assign;
+ yyextra->current->spec|=Entry::Weak;
}
<ObjCPropAttr>"strong" {
- yyextra->current->spec&=~Entry::Assign;
- yyextra->current->spec|=Entry::Strong;
- }
-<ObjCPropAttr>"nonatomic" {
- yyextra->current->spec|=Entry::NonAtomic;
- }
-<ObjCPropAttr>")" {
- BEGIN(FindMembers);
- }
-<FindMembers>"@"{ID} {
- if (yyextra->insideJava) // Java annotation
- {
- // skip annotation
- }
- else if (qstrcmp(yytext,"@property")==0) // ObjC 2.0 property
- {
- yyextra->current->mtype = yyextra->mtype = Property;
- yyextra->current->spec|=Entry::Writable | Entry::Readable;
- yyextra->current->protection = Public ;
- }
- else if (qstrcmp(yytext,"@synthesize")==0)
- {
- BEGIN( ObjCSkipStatement );
- }
- else if (qstrcmp(yytext,"@dynamic")==0)
- {
- BEGIN( ObjCSkipStatement );
- }
- else
- {
- REJECT;
- }
- }
-<ObjCSkipStatement>";" {
- BEGIN(FindMembers);
- }
-<PackageName>{ID}(("."|"\\"){ID})* {
- yyextra->isTypedef=FALSE;
- //printf("Found namespace %s lang=%d\n",yytext,yyextra->current->lang);
- yyextra->current->name = yytext;
- yyextra->current->name = substitute(yyextra->current->name,".","::");
- yyextra->current->name = substitute(yyextra->current->name,"\\","::");
- yyextra->current->section = Entry::NAMESPACE_SEC;
- yyextra->current->type = "namespace" ;
- yyextra->current->fileName = yyextra->yyFileName;
- yyextra->current->startLine = yyextra->yyLineNr;
- yyextra->current->startColumn = yyextra->yyColNr;
- yyextra->current->bodyLine = yyextra->yyLineNr;
- yyextra->current->bodyColumn = yyextra->yyColNr;
- lineCount(yyscanner);
- }
-<PackageName>";" {
+ yyextra->current->spec&=~Entry::Assign;
+ yyextra->current->spec|=Entry::Strong;
+ }
+<ObjCPropAttr>"nonatomic" {
+ yyextra->current->spec|=Entry::NonAtomic;
+ }
+<ObjCPropAttr>")" {
+ BEGIN(FindMembers);
+ }
+<FindMembers>"@"{ID} {
+ if (yyextra->insideJava) // Java annotation
+ {
+ // skip annotation
+ }
+ else if (qstrcmp(yytext,"@property")==0) // ObjC 2.0 property
+ {
+ yyextra->current->mtype = yyextra->mtype = Property;
+ yyextra->current->spec|=Entry::Writable | Entry::Readable;
+ yyextra->current->protection = Public ;
+ }
+ else if (qstrcmp(yytext,"@synthesize")==0)
+ {
+ BEGIN( ObjCSkipStatement );
+ }
+ else if (qstrcmp(yytext,"@dynamic")==0)
+ {
+ BEGIN( ObjCSkipStatement );
+ }
+ else
+ {
+ REJECT;
+ }
+ }
+<ObjCSkipStatement>";" {
+ BEGIN(FindMembers);
+ }
+<PackageName>{ID}(("."|"\\"){ID})* {
+ yyextra->isTypedef=FALSE;
+ //printf("Found namespace %s lang=%d\n",yytext,yyextra->current->lang);
+ yyextra->current->name = yytext;
+ yyextra->current->name = substitute(yyextra->current->name,".","::");
+ yyextra->current->name = substitute(yyextra->current->name,"\\","::");
+ yyextra->current->section = Entry::NAMESPACE_SEC;
+ yyextra->current->type = "namespace" ;
+ yyextra->current->fileName = yyextra->yyFileName;
+ yyextra->current->startLine = yyextra->yyLineNr;
+ yyextra->current->startColumn = yyextra->yyColNr;
+ yyextra->current->bodyLine = yyextra->yyLineNr;
+ yyextra->current->bodyColumn = yyextra->yyColNr;
+ lineCount(yyscanner);
+ }
+<PackageName>";" {
std::shared_ptr<Entry> tmp = yyextra->current;
- yyextra->current_root->moveToSubEntryAndRefresh(yyextra->current);
+ yyextra->current_root->moveToSubEntryAndRefresh(yyextra->current);
yyextra->current_root = tmp;
- initEntry(yyscanner);
- BEGIN(FindMembers);
- }
-<PackageName>"{" {
- yyextra->curlyCount=0;
- BEGIN( ReadNSBody );
- }
-<FindMembers>{B}*"initonly"{BN}+ {
- yyextra->current->type += " initonly ";
- if (yyextra->insideCli) yyextra->current->spec |= Entry::Initonly;
- lineCount(yyscanner);
- }
-<FindMembers>{B}*"static"{BN}+ { yyextra->current->type += " static ";
- yyextra->current->stat = TRUE;
- lineCount(yyscanner);
- }
-<FindMembers>{B}*"extern"{BN}+ {
- yyextra->current->stat = FALSE;
- yyextra->current->explicitExternal = TRUE;
- lineCount(yyscanner);
- }
-<FindMembers>{B}*"const"{BN}+ { if (yyextra->insideCS)
- {
- yyextra->current->type += " const ";
- if (yyextra->insideCS) yyextra->current->stat = TRUE;
- lineCount(yyscanner);
- }
- else
- {
- REJECT;
- }
- }
-<FindMembers>{B}*"virtual"{BN}+ { yyextra->current->type += " virtual ";
- yyextra->current->virt = Virtual;
- lineCount(yyscanner);
- }
-<FindMembers>{B}*"constexpr"{BN}+ {
+ initEntry(yyscanner);
+ BEGIN(FindMembers);
+ }
+<PackageName>"{" {
+ yyextra->curlyCount=0;
+ BEGIN( ReadNSBody );
+ }
+<FindMembers>{B}*"initonly"{BN}+ {
+ yyextra->current->type += " initonly ";
+ if (yyextra->insideCli) yyextra->current->spec |= Entry::Initonly;
+ lineCount(yyscanner);
+ }
+<FindMembers>{B}*"static"{BN}+ { yyextra->current->type += " static ";
+ yyextra->current->stat = TRUE;
+ lineCount(yyscanner);
+ }
+<FindMembers>{B}*"extern"{BN}+ {
+ yyextra->current->stat = FALSE;
+ yyextra->current->explicitExternal = TRUE;
+ lineCount(yyscanner);
+ }
+<FindMembers>{B}*"const"{BN}+ { if (yyextra->insideCS)
+ {
+ yyextra->current->type += " const ";
+ if (yyextra->insideCS) yyextra->current->stat = TRUE;
+ lineCount(yyscanner);
+ }
+ else
+ {
+ REJECT;
+ }
+ }
+<FindMembers>{B}*"virtual"{BN}+ { yyextra->current->type += " virtual ";
+ yyextra->current->virt = Virtual;
+ lineCount(yyscanner);
+ }
+<FindMembers>{B}*"constexpr"{BN}+ {
if (yyextra->insideCpp)
{
yyextra->current->type += " constexpr ";
@@ -1066,300 +1068,300 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
{
REJECT;
}
- }
-<FindMembers>{B}*"published"{BN}+ { // UNO IDL published keyword
- if (yyextra->insideIDL)
- {
- lineCount(yyscanner);
- yyextra->current->spec |= Entry::Published;
- }
- else
- {
- REJECT;
- }
- }
-<FindMembers>{B}*"abstract"{BN}+ {
- if (!yyextra->insidePHP)
- {
- yyextra->current->type += " abstract ";
- if (!yyextra->insideJava)
- {
+ }
+<FindMembers>{B}*"published"{BN}+ { // UNO IDL published keyword
+ if (yyextra->insideIDL)
+ {
+ lineCount(yyscanner);
+ yyextra->current->spec |= Entry::Published;
+ }
+ else
+ {
+ REJECT;
+ }
+ }
+<FindMembers>{B}*"abstract"{BN}+ {
+ if (!yyextra->insidePHP)
+ {
+ yyextra->current->type += " abstract ";
+ if (!yyextra->insideJava)
+ {
yyextra->current->virt = Pure;
- }
- else
- {
+ }
+ else
+ {
yyextra->current->spec|=Entry::Abstract;
- }
- }
- else
- {
- yyextra->current->spec|=Entry::Abstract;
- }
- lineCount(yyscanner);
- }
-<FindMembers>{B}*"inline"{BN}+ { yyextra->current->spec|=Entry::Inline;
- lineCount(yyscanner);
- }
-<FindMembers>{B}*"mutable"{BN}+ { yyextra->current->spec|=Entry::Mutable;
- lineCount(yyscanner);
- }
-<FindMembers>{B}*"explicit"{BN}+ { yyextra->current->spec|=Entry::Explicit;
- lineCount(yyscanner);
- }
-<FindMembers>{B}*"local"{BN}+ { yyextra->current->spec|=Entry::Local;
- lineCount(yyscanner);
- }
-<FindMembers>{B}*"@required"{BN}+ { // Objective C 2.0 protocol required section
+ }
+ }
+ else
+ {
+ yyextra->current->spec|=Entry::Abstract;
+ }
+ lineCount(yyscanner);
+ }
+<FindMembers>{B}*"inline"{BN}+ { yyextra->current->spec|=Entry::Inline;
+ lineCount(yyscanner);
+ }
+<FindMembers>{B}*"mutable"{BN}+ { yyextra->current->spec|=Entry::Mutable;
+ lineCount(yyscanner);
+ }
+<FindMembers>{B}*"explicit"{BN}+ { yyextra->current->spec|=Entry::Explicit;
+ lineCount(yyscanner);
+ }
+<FindMembers>{B}*"local"{BN}+ { yyextra->current->spec|=Entry::Local;
+ lineCount(yyscanner);
+ }
+<FindMembers>{B}*"@required"{BN}+ { // Objective C 2.0 protocol required section
yyextra->current->spec=(yyextra->current->spec & ~Entry::Optional) | Entry::Required;
- lineCount(yyscanner);
+ lineCount(yyscanner);
}
-<FindMembers>{B}*"@optional"{BN}+ { // Objective C 2.0 protocol optional section
+<FindMembers>{B}*"@optional"{BN}+ { // Objective C 2.0 protocol optional section
yyextra->current->spec=(yyextra->current->spec & ~Entry::Required) | Entry::Optional;
- lineCount(yyscanner);
+ lineCount(yyscanner);
}
/*
-<FindMembers>{B}*"import"{BN}+ { // IDL import keyword
- BEGIN( NextSemi );
- }
+<FindMembers>{B}*"import"{BN}+ { // IDL import keyword
+ BEGIN( NextSemi );
+ }
*/
-<FindMembers>{B}*"typename"{BN}+ { lineCount(yyscanner); }
-<FindMembers>{B}*"namespace"{BN}*/[^a-z_A-Z0-9] {
- yyextra->isTypedef=FALSE;
- yyextra->current->section = Entry::NAMESPACE_SEC;
- yyextra->current->type = "namespace" ;
- yyextra->current->fileName = yyextra->yyFileName;
- yyextra->current->startLine = yyextra->yyLineNr;
- yyextra->current->startColumn = yyextra->yyColNr;
- yyextra->current->bodyLine = yyextra->yyLineNr;
- yyextra->current->bodyColumn = yyextra->yyColNr;
- lineCount(yyscanner);
- if (yyextra->insidePHP)
- {
- BEGIN( PackageName );
- }
- else
- {
- BEGIN( CompoundName );
- }
- }
-<FindMembers>{B}*"module"{BN}+ {
- lineCount(yyscanner);
+<FindMembers>{B}*"typename"{BN}+ { lineCount(yyscanner); }
+<FindMembers>{B}*"namespace"{BN}*/[^a-z_A-Z0-9] {
+ yyextra->isTypedef=FALSE;
+ yyextra->current->section = Entry::NAMESPACE_SEC;
+ yyextra->current->type = "namespace" ;
+ yyextra->current->fileName = yyextra->yyFileName;
+ yyextra->current->startLine = yyextra->yyLineNr;
+ yyextra->current->startColumn = yyextra->yyColNr;
+ yyextra->current->bodyLine = yyextra->yyLineNr;
+ yyextra->current->bodyColumn = yyextra->yyColNr;
+ lineCount(yyscanner);
+ if (yyextra->insidePHP)
+ {
+ BEGIN( PackageName );
+ }
+ else
+ {
+ BEGIN( CompoundName );
+ }
+ }
+<FindMembers>{B}*"module"{BN}+ {
+ lineCount(yyscanner);
if (yyextra->insideIDL || yyextra->insideSlice)
- {
- yyextra->isTypedef=FALSE;
- yyextra->current->section = Entry::NAMESPACE_SEC;
- yyextra->current->type = "module" ;
- yyextra->current->fileName = yyextra->yyFileName;
- yyextra->current->startLine = yyextra->yyLineNr;
- yyextra->current->startColumn = yyextra->yyColNr;
- yyextra->current->bodyLine = yyextra->yyLineNr;
- yyextra->current->bodyColumn = yyextra->yyColNr;
- BEGIN( CompoundName );
- }
- else if (yyextra->insideD)
- {
- lineCount(yyscanner);
- BEGIN(PackageName);
- }
- else
- {
- addType(yyscanner);
- yyextra->current->name = QCString(yytext).stripWhiteSpace();
- }
- }
-<FindMembers>{B}*"library"{BN}+ {
- lineCount(yyscanner);
+ {
+ yyextra->isTypedef=FALSE;
+ yyextra->current->section = Entry::NAMESPACE_SEC;
+ yyextra->current->type = "module" ;
+ yyextra->current->fileName = yyextra->yyFileName;
+ yyextra->current->startLine = yyextra->yyLineNr;
+ yyextra->current->startColumn = yyextra->yyColNr;
+ yyextra->current->bodyLine = yyextra->yyLineNr;
+ yyextra->current->bodyColumn = yyextra->yyColNr;
+ BEGIN( CompoundName );
+ }
+ else if (yyextra->insideD)
+ {
+ lineCount(yyscanner);
+ BEGIN(PackageName);
+ }
+ else
+ {
+ addType(yyscanner);
+ yyextra->current->name = QCString(yytext).stripWhiteSpace();
+ }
+ }
+<FindMembers>{B}*"library"{BN}+ {
+ lineCount(yyscanner);
if (yyextra->insideIDL)
- {
- yyextra->isTypedef=FALSE;
- yyextra->current->section = Entry::NAMESPACE_SEC;
- yyextra->current->type = "library" ;
- yyextra->current->fileName = yyextra->yyFileName;
- yyextra->current->startLine = yyextra->yyLineNr;
- yyextra->current->startColumn = yyextra->yyColNr;
- yyextra->current->bodyLine = yyextra->yyLineNr;
- yyextra->current->bodyColumn = yyextra->yyColNr;
- BEGIN( CompoundName );
- }
- else
- {
- addType(yyscanner);
- yyextra->current->name = QCString(yytext).stripWhiteSpace();
- }
- }
-<FindMembers>{B}*"constants"{BN}+ { // UNO IDL constant group
- lineCount(yyscanner);
- if (yyextra->insideIDL)
- {
- yyextra->isTypedef=FALSE;
- yyextra->current->section = Entry::NAMESPACE_SEC;
- yyextra->current->type = "constants";
- yyextra->current->fileName = yyextra->yyFileName;
- yyextra->current->startLine = yyextra->yyLineNr;
- yyextra->current->startColumn = yyextra->yyColNr;
- yyextra->current->bodyLine = yyextra->yyLineNr;
- yyextra->current->bodyColumn = yyextra->yyColNr;
- BEGIN( CompoundName );
- }
- else
- {
- addType(yyscanner);
- yyextra->current->name = QCString(yytext).stripWhiteSpace();
- }
- }
-<FindMembers>{BN}*("service"){BN}+ { // UNO IDL service
- lineCount(yyscanner);
- if (yyextra->insideIDL)
- {
- yyextra->isTypedef=FALSE;
- yyextra->current->section = Entry::CLASS_SEC;
- yyextra->current->spec = Entry::Service |
- // preserve UNO IDL [optional] or published
- (yyextra->current->spec & (Entry::Optional|Entry::Published));
- addType(yyscanner);
- yyextra->current->type += " service " ;
- yyextra->current->fileName = yyextra->yyFileName;
- yyextra->current->startLine = yyextra->yyLineNr;
- yyextra->current->bodyLine = yyextra->yyLineNr;
- yyextra->current->bodyColumn = yyextra->yyColNr;
- BEGIN( CompoundName );
- }
- else // TODO is addType right? just copy/pasted
- {
- addType(yyscanner);
- yyextra->current->name = QCString(yytext).stripWhiteSpace();
- }
- }
-<FindMembers>{BN}*("singleton"){BN}+ { // UNO IDL singleton
- lineCount(yyscanner);
- if (yyextra->insideIDL)
- {
- yyextra->isTypedef=FALSE;
- yyextra->current->section = Entry::CLASS_SEC;
- yyextra->current->spec = Entry::Singleton |
- (yyextra->current->spec & Entry::Published); // preserve
- addType(yyscanner);
- yyextra->current->type += " singleton " ;
- yyextra->current->fileName = yyextra->yyFileName;
- yyextra->current->startLine = yyextra->yyLineNr;
- yyextra->current->bodyLine = yyextra->yyLineNr;
- yyextra->current->bodyColumn = yyextra->yyColNr;
- BEGIN( CompoundName );
- }
- else // TODO is addType right? just copy/pasted
- {
- addType(yyscanner);
- yyextra->current->name = QCString(yytext).stripWhiteSpace();
- }
- }
-<FindMembers>{BN}*((("disp")?"interface")|"valuetype"){BN}+ { // M$/Corba/UNO IDL/Java/Slice interface
- lineCount(yyscanner);
+ {
+ yyextra->isTypedef=FALSE;
+ yyextra->current->section = Entry::NAMESPACE_SEC;
+ yyextra->current->type = "library" ;
+ yyextra->current->fileName = yyextra->yyFileName;
+ yyextra->current->startLine = yyextra->yyLineNr;
+ yyextra->current->startColumn = yyextra->yyColNr;
+ yyextra->current->bodyLine = yyextra->yyLineNr;
+ yyextra->current->bodyColumn = yyextra->yyColNr;
+ BEGIN( CompoundName );
+ }
+ else
+ {
+ addType(yyscanner);
+ yyextra->current->name = QCString(yytext).stripWhiteSpace();
+ }
+ }
+<FindMembers>{B}*"constants"{BN}+ { // UNO IDL constant group
+ lineCount(yyscanner);
+ if (yyextra->insideIDL)
+ {
+ yyextra->isTypedef=FALSE;
+ yyextra->current->section = Entry::NAMESPACE_SEC;
+ yyextra->current->type = "constants";
+ yyextra->current->fileName = yyextra->yyFileName;
+ yyextra->current->startLine = yyextra->yyLineNr;
+ yyextra->current->startColumn = yyextra->yyColNr;
+ yyextra->current->bodyLine = yyextra->yyLineNr;
+ yyextra->current->bodyColumn = yyextra->yyColNr;
+ BEGIN( CompoundName );
+ }
+ else
+ {
+ addType(yyscanner);
+ yyextra->current->name = QCString(yytext).stripWhiteSpace();
+ }
+ }
+<FindMembers>{BN}*("service"){BN}+ { // UNO IDL service
+ lineCount(yyscanner);
+ if (yyextra->insideIDL)
+ {
+ yyextra->isTypedef=FALSE;
+ yyextra->current->section = Entry::CLASS_SEC;
+ yyextra->current->spec = Entry::Service |
+ // preserve UNO IDL [optional] or published
+ (yyextra->current->spec & (Entry::Optional|Entry::Published));
+ addType(yyscanner);
+ yyextra->current->type += " service " ;
+ yyextra->current->fileName = yyextra->yyFileName;
+ yyextra->current->startLine = yyextra->yyLineNr;
+ yyextra->current->bodyLine = yyextra->yyLineNr;
+ yyextra->current->bodyColumn = yyextra->yyColNr;
+ BEGIN( CompoundName );
+ }
+ else // TODO is addType right? just copy/pasted
+ {
+ addType(yyscanner);
+ yyextra->current->name = QCString(yytext).stripWhiteSpace();
+ }
+ }
+<FindMembers>{BN}*("singleton"){BN}+ { // UNO IDL singleton
+ lineCount(yyscanner);
+ if (yyextra->insideIDL)
+ {
+ yyextra->isTypedef=FALSE;
+ yyextra->current->section = Entry::CLASS_SEC;
+ yyextra->current->spec = Entry::Singleton |
+ (yyextra->current->spec & Entry::Published); // preserve
+ addType(yyscanner);
+ yyextra->current->type += " singleton " ;
+ yyextra->current->fileName = yyextra->yyFileName;
+ yyextra->current->startLine = yyextra->yyLineNr;
+ yyextra->current->bodyLine = yyextra->yyLineNr;
+ yyextra->current->bodyColumn = yyextra->yyColNr;
+ BEGIN( CompoundName );
+ }
+ else // TODO is addType right? just copy/pasted
+ {
+ addType(yyscanner);
+ yyextra->current->name = QCString(yytext).stripWhiteSpace();
+ }
+ }
+<FindMembers>{BN}*((("disp")?"interface")|"valuetype"){BN}+ { // M$/Corba/UNO IDL/Java/Slice interface
+ lineCount(yyscanner);
if (yyextra->insideIDL || yyextra->insideJava || yyextra->insideCS || yyextra->insideD || yyextra->insidePHP || yyextra->insideSlice)
- {
- yyextra->isTypedef=FALSE;
- yyextra->current->section = Entry::CLASS_SEC;
- yyextra->current->spec = Entry::Interface |
+ {
+ yyextra->isTypedef=FALSE;
+ yyextra->current->section = Entry::CLASS_SEC;
+ yyextra->current->spec = Entry::Interface |
// preserve UNO IDL [optional], published, Slice local
(yyextra->current->spec & (Entry::Optional|Entry::Published|Entry::Local));
- addType(yyscanner);
- yyextra->current->type += " interface" ;
- yyextra->current->fileName = yyextra->yyFileName;
- yyextra->current->startLine = yyextra->yyLineNr;
- yyextra->current->startColumn = yyextra->yyColNr;
- yyextra->current->bodyLine = yyextra->yyLineNr;
- yyextra->current->bodyColumn = yyextra->yyColNr;
- BEGIN( CompoundName );
- }
- else
- {
- addType(yyscanner);
- yyextra->current->name = QCString(yytext).stripWhiteSpace();
- }
- }
-<FindMembers>{B}*"@implementation"{BN}+ { // Objective-C class implementation
- lineCount(yyscanner);
- yyextra->isTypedef=FALSE;
- yyextra->current->section = Entry::OBJCIMPL_SEC;
- yyextra->language = yyextra->current->lang = SrcLangExt_ObjC;
- yyextra->insideObjC = TRUE;
- yyextra->current->protection = yyextra->protection = Public ;
- addType(yyscanner);
- yyextra->current->type += " implementation" ;
- yyextra->current->fileName = yyextra->yyFileName;
- yyextra->current->startLine = yyextra->yyLineNr;
- yyextra->current->bodyLine = yyextra->yyLineNr;
- yyextra->current->bodyColumn = yyextra->yyColNr;
- BEGIN( CompoundName );
- }
-<FindMembers>{B}*"@interface"{BN}+ { // Objective-C class interface, or Java attribute
- lineCount(yyscanner);
- yyextra->isTypedef=FALSE;
- yyextra->current->section = Entry::CLASS_SEC;
+ addType(yyscanner);
+ yyextra->current->type += " interface" ;
+ yyextra->current->fileName = yyextra->yyFileName;
+ yyextra->current->startLine = yyextra->yyLineNr;
+ yyextra->current->startColumn = yyextra->yyColNr;
+ yyextra->current->bodyLine = yyextra->yyLineNr;
+ yyextra->current->bodyColumn = yyextra->yyColNr;
+ BEGIN( CompoundName );
+ }
+ else
+ {
+ addType(yyscanner);
+ yyextra->current->name = QCString(yytext).stripWhiteSpace();
+ }
+ }
+<FindMembers>{B}*"@implementation"{BN}+ { // Objective-C class implementation
+ lineCount(yyscanner);
+ yyextra->isTypedef=FALSE;
+ yyextra->current->section = Entry::OBJCIMPL_SEC;
+ yyextra->language = yyextra->current->lang = SrcLangExt_ObjC;
+ yyextra->insideObjC = TRUE;
+ yyextra->current->protection = yyextra->protection = Public ;
+ addType(yyscanner);
+ yyextra->current->type += " implementation" ;
+ yyextra->current->fileName = yyextra->yyFileName;
+ yyextra->current->startLine = yyextra->yyLineNr;
+ yyextra->current->bodyLine = yyextra->yyLineNr;
+ yyextra->current->bodyColumn = yyextra->yyColNr;
+ BEGIN( CompoundName );
+ }
+<FindMembers>{B}*"@interface"{BN}+ { // Objective-C class interface, or Java attribute
+ lineCount(yyscanner);
+ yyextra->isTypedef=FALSE;
+ yyextra->current->section = Entry::CLASS_SEC;
yyextra->current->spec = Entry::Interface;
- if (!yyextra->insideJava)
- {
- yyextra->language = yyextra->current->lang = SrcLangExt_ObjC;
- yyextra->insideObjC = TRUE;
- }
- yyextra->current->protection = yyextra->protection = Public ;
- addType(yyscanner);
- yyextra->current->type += " interface" ;
- yyextra->current->fileName = yyextra->yyFileName;
- yyextra->current->startLine = yyextra->yyLineNr;
- yyextra->current->startColumn = yyextra->yyColNr;
- yyextra->current->bodyLine = yyextra->yyLineNr;
- yyextra->current->bodyColumn = yyextra->yyColNr;
- BEGIN( CompoundName );
- }
-<FindMembers>{B}*"@protocol"{BN}+ { // Objective-C protocol definition
- lineCount(yyscanner);
- yyextra->isTypedef=FALSE;
- yyextra->current->section = Entry::CLASS_SEC;
+ if (!yyextra->insideJava)
+ {
+ yyextra->language = yyextra->current->lang = SrcLangExt_ObjC;
+ yyextra->insideObjC = TRUE;
+ }
+ yyextra->current->protection = yyextra->protection = Public ;
+ addType(yyscanner);
+ yyextra->current->type += " interface" ;
+ yyextra->current->fileName = yyextra->yyFileName;
+ yyextra->current->startLine = yyextra->yyLineNr;
+ yyextra->current->startColumn = yyextra->yyColNr;
+ yyextra->current->bodyLine = yyextra->yyLineNr;
+ yyextra->current->bodyColumn = yyextra->yyColNr;
+ BEGIN( CompoundName );
+ }
+<FindMembers>{B}*"@protocol"{BN}+ { // Objective-C protocol definition
+ lineCount(yyscanner);
+ yyextra->isTypedef=FALSE;
+ yyextra->current->section = Entry::CLASS_SEC;
yyextra->current->spec = Entry::Protocol;
- yyextra->language = yyextra->current->lang = SrcLangExt_ObjC;
- yyextra->insideObjC = TRUE;
- yyextra->current->protection = yyextra->protection = Public ;
- addType(yyscanner);
- yyextra->current->type += " protocol" ;
- yyextra->current->fileName = yyextra->yyFileName;
- yyextra->current->startLine = yyextra->yyLineNr;
- yyextra->current->startColumn = yyextra->yyColNr;
- yyextra->current->bodyLine = yyextra->yyLineNr;
- yyextra->current->bodyColumn = yyextra->yyColNr;
- BEGIN( CompoundName );
- }
-<FindMembers>{B}*"exception"{BN}+ { // Corba IDL/Slice exception
- yyextra->isTypedef=FALSE;
- yyextra->current->section = Entry::CLASS_SEC;
+ yyextra->language = yyextra->current->lang = SrcLangExt_ObjC;
+ yyextra->insideObjC = TRUE;
+ yyextra->current->protection = yyextra->protection = Public ;
+ addType(yyscanner);
+ yyextra->current->type += " protocol" ;
+ yyextra->current->fileName = yyextra->yyFileName;
+ yyextra->current->startLine = yyextra->yyLineNr;
+ yyextra->current->startColumn = yyextra->yyColNr;
+ yyextra->current->bodyLine = yyextra->yyLineNr;
+ yyextra->current->bodyColumn = yyextra->yyColNr;
+ BEGIN( CompoundName );
+ }
+<FindMembers>{B}*"exception"{BN}+ { // Corba IDL/Slice exception
+ yyextra->isTypedef=FALSE;
+ yyextra->current->section = Entry::CLASS_SEC;
// preserve UNO IDL, Slice local
- yyextra->current->spec = Entry::Exception |
- (yyextra->current->spec & Entry::Published) |
- (yyextra->current->spec & Entry::Local);
- addType(yyscanner);
- yyextra->current->type += " exception" ;
- yyextra->current->fileName = yyextra->yyFileName;
- yyextra->current->startLine = yyextra->yyLineNr;
- yyextra->current->startColumn = yyextra->yyColNr;
- yyextra->current->bodyLine = yyextra->yyLineNr;
- yyextra->current->bodyColumn = yyextra->yyColNr;
- lineCount(yyscanner);
- BEGIN( CompoundName );
- }
+ yyextra->current->spec = Entry::Exception |
+ (yyextra->current->spec & Entry::Published) |
+ (yyextra->current->spec & Entry::Local);
+ addType(yyscanner);
+ yyextra->current->type += " exception" ;
+ yyextra->current->fileName = yyextra->yyFileName;
+ yyextra->current->startLine = yyextra->yyLineNr;
+ yyextra->current->startColumn = yyextra->yyColNr;
+ yyextra->current->bodyLine = yyextra->yyLineNr;
+ yyextra->current->bodyColumn = yyextra->yyColNr;
+ lineCount(yyscanner);
+ BEGIN( CompoundName );
+ }
<FindMembers>"@class" | // for Objective C class declarations
<FindMembers>{B}*{TYPEDEFPREFIX}"class{" |
-<FindMembers>{B}*{TYPEDEFPREFIX}"class"{BN}+ {
+<FindMembers>{B}*{TYPEDEFPREFIX}"class"{BN}+ {
QCString decl = yytext;
- yyextra->isTypedef=decl.find("typedef")!=-1;
+ yyextra->isTypedef=decl.find("typedef")!=-1;
bool isConst=decl.find("const")!=-1;
bool isVolatile=decl.find("volatile")!=-1;
- yyextra->current->section = Entry::CLASS_SEC;
- addType(yyscanner);
+ yyextra->current->section = Entry::CLASS_SEC;
+ addType(yyscanner);
uint64 spec = yyextra->current->spec;
- if (yyextra->insidePHP && yyextra->current->spec&Entry::Abstract)
- {
- // convert Abstract to AbstractClass
- yyextra->current->spec=(yyextra->current->spec&~Entry::Abstract)|Entry::AbstractClass;
- }
+ if (yyextra->insidePHP && yyextra->current->spec&Entry::Abstract)
+ {
+ // convert Abstract to AbstractClass
+ yyextra->current->spec=(yyextra->current->spec&~Entry::Abstract)|Entry::AbstractClass;
+ }
if (yyextra->insideSlice && spec&Entry::Local)
{
yyextra->current->spec|=Entry::Local;
@@ -1372,107 +1374,107 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
{
yyextra->current->type += " volatile";
}
- yyextra->current->type += " class" ;
- yyextra->current->fileName = yyextra->yyFileName;
- yyextra->current->startLine = yyextra->yyLineNr;
- yyextra->current->startColumn = yyextra->yyColNr;
- yyextra->current->bodyLine = yyextra->yyLineNr;
- yyextra->current->bodyColumn = yyextra->yyColNr;
- if (yytext[0]=='@')
- {
- yyextra->language = yyextra->current->lang = SrcLangExt_ObjC;
- yyextra->insideObjC = TRUE;
- }
- lineCount(yyscanner) ;
- if (yytext[yyleng-1]=='{') unput('{');
- BEGIN( CompoundName ) ;
- }
+ yyextra->current->type += " class" ;
+ yyextra->current->fileName = yyextra->yyFileName;
+ yyextra->current->startLine = yyextra->yyLineNr;
+ yyextra->current->startColumn = yyextra->yyColNr;
+ yyextra->current->bodyLine = yyextra->yyLineNr;
+ yyextra->current->bodyColumn = yyextra->yyColNr;
+ if (yytext[0]=='@')
+ {
+ yyextra->language = yyextra->current->lang = SrcLangExt_ObjC;
+ yyextra->insideObjC = TRUE;
+ }
+ lineCount(yyscanner) ;
+ if (yytext[yyleng-1]=='{') unput('{');
+ BEGIN( CompoundName ) ;
+ }
<FindMembers>{B}*"value class{" | // C++/CLI extension
<FindMembers>{B}*"value class"{BN}+ {
- yyextra->isTypedef=FALSE;
- yyextra->current->section = Entry::CLASS_SEC;
+ yyextra->isTypedef=FALSE;
+ yyextra->current->section = Entry::CLASS_SEC;
yyextra->current->spec = Entry::Value;
- addType(yyscanner);
- yyextra->current->type += " value class" ;
- yyextra->current->fileName = yyextra->yyFileName;
- yyextra->current->startLine = yyextra->yyLineNr;
- yyextra->current->startColumn = yyextra->yyColNr;
- yyextra->current->bodyLine = yyextra->yyLineNr;
- yyextra->current->bodyColumn = yyextra->yyColNr;
- lineCount(yyscanner) ;
- if (yytext[yyleng-1]=='{') unput('{');
- BEGIN( CompoundName ) ;
- }
+ addType(yyscanner);
+ yyextra->current->type += " value class" ;
+ yyextra->current->fileName = yyextra->yyFileName;
+ yyextra->current->startLine = yyextra->yyLineNr;
+ yyextra->current->startColumn = yyextra->yyColNr;
+ yyextra->current->bodyLine = yyextra->yyLineNr;
+ yyextra->current->bodyColumn = yyextra->yyColNr;
+ lineCount(yyscanner) ;
+ if (yytext[yyleng-1]=='{') unput('{');
+ BEGIN( CompoundName ) ;
+ }
<FindMembers>{B}*"ref class{" | // C++/CLI extension
<FindMembers>{B}*"ref class"{BN}+ {
- yyextra->isTypedef=FALSE;
- yyextra->current->section = Entry::CLASS_SEC;
+ yyextra->isTypedef=FALSE;
+ yyextra->current->section = Entry::CLASS_SEC;
yyextra->current->spec = Entry::Ref;
- addType(yyscanner);
- yyextra->current->type += " ref class" ;
- yyextra->current->fileName = yyextra->yyFileName;
- yyextra->current->startLine = yyextra->yyLineNr;
- yyextra->current->startColumn = yyextra->yyColNr;
- yyextra->current->bodyLine = yyextra->yyLineNr;
- yyextra->current->bodyColumn = yyextra->yyColNr;
- lineCount(yyscanner) ;
- if (yytext[yyleng-1]=='{') unput('{');
- BEGIN( CompoundName ) ;
- }
+ addType(yyscanner);
+ yyextra->current->type += " ref class" ;
+ yyextra->current->fileName = yyextra->yyFileName;
+ yyextra->current->startLine = yyextra->yyLineNr;
+ yyextra->current->startColumn = yyextra->yyColNr;
+ yyextra->current->bodyLine = yyextra->yyLineNr;
+ yyextra->current->bodyColumn = yyextra->yyColNr;
+ lineCount(yyscanner) ;
+ if (yytext[yyleng-1]=='{') unput('{');
+ BEGIN( CompoundName ) ;
+ }
<FindMembers>{B}*"interface class{" | // C++/CLI extension
<FindMembers>{B}*"interface class"{BN}+ {
- yyextra->isTypedef=FALSE;
- yyextra->current->section = Entry::CLASS_SEC;
+ yyextra->isTypedef=FALSE;
+ yyextra->current->section = Entry::CLASS_SEC;
yyextra->current->spec = Entry::Interface;
- addType(yyscanner);
- yyextra->current->type += " interface class" ;
- yyextra->current->fileName = yyextra->yyFileName;
- yyextra->current->startLine = yyextra->yyLineNr;
- yyextra->current->startColumn = yyextra->yyColNr;
- yyextra->current->bodyLine = yyextra->yyLineNr;
- yyextra->current->bodyColumn = yyextra->yyColNr;
- lineCount(yyscanner) ;
- if (yytext[yyleng-1]=='{') unput('{');
- BEGIN( CompoundName ) ;
- }
-<FindMembers>{B}*"coclass"{BN}+ {
- if (yyextra->insideIDL)
- {
- yyextra->isTypedef=FALSE;
- yyextra->current->section = Entry::CLASS_SEC;
- addType(yyscanner);
- yyextra->current->type += " coclass" ;
- yyextra->current->fileName = yyextra->yyFileName;
- yyextra->current->startLine = yyextra->yyLineNr;
- yyextra->current->startColumn = yyextra->yyColNr;
- yyextra->current->bodyLine = yyextra->yyLineNr;
- yyextra->current->bodyColumn = yyextra->yyColNr;
- lineCount(yyscanner) ;
- BEGIN( CompoundName ) ;
- }
- else
- {
- addType(yyscanner);
- yyextra->current->name = yytext;
- yyextra->current->name = yyextra->current->name.stripWhiteSpace();
- lineCount(yyscanner);
- }
- }
-<FindMembers>{B}*{TYPEDEFPREFIX}"struct{" |
-<FindMembers>{B}*{TYPEDEFPREFIX}"struct"/{BN}+ {
+ addType(yyscanner);
+ yyextra->current->type += " interface class" ;
+ yyextra->current->fileName = yyextra->yyFileName;
+ yyextra->current->startLine = yyextra->yyLineNr;
+ yyextra->current->startColumn = yyextra->yyColNr;
+ yyextra->current->bodyLine = yyextra->yyLineNr;
+ yyextra->current->bodyColumn = yyextra->yyColNr;
+ lineCount(yyscanner) ;
+ if (yytext[yyleng-1]=='{') unput('{');
+ BEGIN( CompoundName ) ;
+ }
+<FindMembers>{B}*"coclass"{BN}+ {
+ if (yyextra->insideIDL)
+ {
+ yyextra->isTypedef=FALSE;
+ yyextra->current->section = Entry::CLASS_SEC;
+ addType(yyscanner);
+ yyextra->current->type += " coclass" ;
+ yyextra->current->fileName = yyextra->yyFileName;
+ yyextra->current->startLine = yyextra->yyLineNr;
+ yyextra->current->startColumn = yyextra->yyColNr;
+ yyextra->current->bodyLine = yyextra->yyLineNr;
+ yyextra->current->bodyColumn = yyextra->yyColNr;
+ lineCount(yyscanner) ;
+ BEGIN( CompoundName ) ;
+ }
+ else
+ {
+ addType(yyscanner);
+ yyextra->current->name = yytext;
+ yyextra->current->name = yyextra->current->name.stripWhiteSpace();
+ lineCount(yyscanner);
+ }
+ }
+<FindMembers>{B}*{TYPEDEFPREFIX}"struct{" |
+<FindMembers>{B}*{TYPEDEFPREFIX}"struct"/{BN}+ {
QCString decl = yytext;
- yyextra->isTypedef=decl.find("typedef")!=-1;
+ yyextra->isTypedef=decl.find("typedef")!=-1;
bool isConst=decl.find("const")!=-1;
bool isVolatile=decl.find("volatile")!=-1;
- yyextra->current->section = Entry::CLASS_SEC ;
+ yyextra->current->section = Entry::CLASS_SEC ;
// preserve UNO IDL & Inline attributes, Slice local
- yyextra->current->spec = Entry::Struct |
- (yyextra->current->spec & Entry::Published) |
+ yyextra->current->spec = Entry::Struct |
+ (yyextra->current->spec & Entry::Published) |
(yyextra->current->spec & Entry::Inline) |
- (yyextra->current->spec & Entry::Local);
- // bug 582676: can be a struct nested in an interface so keep yyextra->insideObjC state
- //yyextra->current->objc = yyextra->insideObjC = FALSE;
- addType(yyscanner);
+ (yyextra->current->spec & Entry::Local);
+ // bug 582676: can be a struct nested in an interface so keep yyextra->insideObjC state
+ //yyextra->current->objc = yyextra->insideObjC = FALSE;
+ addType(yyscanner);
if (isConst)
{
yyextra->current->type += " const";
@@ -1481,75 +1483,75 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
{
yyextra->current->type += " volatile";
}
- yyextra->current->type += " struct" ;
- yyextra->current->fileName = yyextra->yyFileName;
- yyextra->current->startLine = yyextra->yyLineNr;
- yyextra->current->startColumn = yyextra->yyColNr;
- yyextra->current->bodyLine = yyextra->yyLineNr;
- yyextra->current->bodyColumn = yyextra->yyColNr;
- lineCount(yyscanner) ;
- if (yytext[yyleng-1]=='{') unput('{');
- BEGIN( CompoundName ) ;
- }
+ yyextra->current->type += " struct" ;
+ yyextra->current->fileName = yyextra->yyFileName;
+ yyextra->current->startLine = yyextra->yyLineNr;
+ yyextra->current->startColumn = yyextra->yyColNr;
+ yyextra->current->bodyLine = yyextra->yyLineNr;
+ yyextra->current->bodyColumn = yyextra->yyColNr;
+ lineCount(yyscanner) ;
+ if (yytext[yyleng-1]=='{') unput('{');
+ BEGIN( CompoundName ) ;
+ }
<FindMembers>{B}*"value struct{" | // C++/CLI extension
<FindMembers>{B}*"value struct"{BN}+ {
- yyextra->isTypedef=FALSE;
- yyextra->current->section = Entry::CLASS_SEC;
+ yyextra->isTypedef=FALSE;
+ yyextra->current->section = Entry::CLASS_SEC;
yyextra->current->spec = Entry::Struct | Entry::Value;
- addType(yyscanner);
- yyextra->current->type += " value struct" ;
- yyextra->current->fileName = yyextra->yyFileName;
- yyextra->current->startLine = yyextra->yyLineNr;
- yyextra->current->startColumn = yyextra->yyColNr;
- yyextra->current->bodyLine = yyextra->yyLineNr;
- yyextra->current->bodyColumn = yyextra->yyColNr;
- lineCount(yyscanner) ;
- if (yytext[yyleng-1]=='{') unput('{');
- BEGIN( CompoundName ) ;
- }
+ addType(yyscanner);
+ yyextra->current->type += " value struct" ;
+ yyextra->current->fileName = yyextra->yyFileName;
+ yyextra->current->startLine = yyextra->yyLineNr;
+ yyextra->current->startColumn = yyextra->yyColNr;
+ yyextra->current->bodyLine = yyextra->yyLineNr;
+ yyextra->current->bodyColumn = yyextra->yyColNr;
+ lineCount(yyscanner) ;
+ if (yytext[yyleng-1]=='{') unput('{');
+ BEGIN( CompoundName ) ;
+ }
<FindMembers>{B}*"ref struct{" | // C++/CLI extension
<FindMembers>{B}*"ref struct"{BN}+ {
- yyextra->isTypedef=FALSE;
- yyextra->current->section = Entry::CLASS_SEC;
+ yyextra->isTypedef=FALSE;
+ yyextra->current->section = Entry::CLASS_SEC;
yyextra->current->spec = Entry::Struct | Entry::Ref;
- addType(yyscanner);
- yyextra->current->type += " ref struct" ;
- yyextra->current->fileName = yyextra->yyFileName;
- yyextra->current->startLine = yyextra->yyLineNr;
- yyextra->current->startColumn = yyextra->yyColNr;
- yyextra->current->bodyLine = yyextra->yyLineNr;
- yyextra->current->bodyColumn = yyextra->yyColNr;
- lineCount(yyscanner) ;
- if (yytext[yyleng-1]=='{') unput('{');
- BEGIN( CompoundName ) ;
- }
+ addType(yyscanner);
+ yyextra->current->type += " ref struct" ;
+ yyextra->current->fileName = yyextra->yyFileName;
+ yyextra->current->startLine = yyextra->yyLineNr;
+ yyextra->current->startColumn = yyextra->yyColNr;
+ yyextra->current->bodyLine = yyextra->yyLineNr;
+ yyextra->current->bodyColumn = yyextra->yyColNr;
+ lineCount(yyscanner) ;
+ if (yytext[yyleng-1]=='{') unput('{');
+ BEGIN( CompoundName ) ;
+ }
<FindMembers>{B}*"interface struct{" | // C++/CLI extension
<FindMembers>{B}*"interface struct"{BN}+ {
- yyextra->isTypedef=FALSE;
- yyextra->current->section = Entry::CLASS_SEC;
+ yyextra->isTypedef=FALSE;
+ yyextra->current->section = Entry::CLASS_SEC;
yyextra->current->spec = Entry::Struct | Entry::Interface;
- addType(yyscanner);
- yyextra->current->type += " interface struct";
- yyextra->current->fileName = yyextra->yyFileName;
- yyextra->current->startLine = yyextra->yyLineNr;
- yyextra->current->startColumn = yyextra->yyColNr;
- yyextra->current->bodyLine = yyextra->yyLineNr;
- yyextra->current->bodyColumn = yyextra->yyColNr;
- lineCount(yyscanner) ;
- if (yytext[yyleng-1]=='{') unput('{');
- BEGIN( CompoundName ) ;
- }
+ addType(yyscanner);
+ yyextra->current->type += " interface struct";
+ yyextra->current->fileName = yyextra->yyFileName;
+ yyextra->current->startLine = yyextra->yyLineNr;
+ yyextra->current->startColumn = yyextra->yyColNr;
+ yyextra->current->bodyLine = yyextra->yyLineNr;
+ yyextra->current->bodyColumn = yyextra->yyColNr;
+ lineCount(yyscanner) ;
+ if (yytext[yyleng-1]=='{') unput('{');
+ BEGIN( CompoundName ) ;
+ }
<FindMembers>{B}*{TYPEDEFPREFIX}"union{" |
-<FindMembers>{B}*{TYPEDEFPREFIX}"union"{BN}+ {
+<FindMembers>{B}*{TYPEDEFPREFIX}"union"{BN}+ {
QCString decl=yytext;
- yyextra->isTypedef=decl.find("typedef")!=-1;
+ yyextra->isTypedef=decl.find("typedef")!=-1;
bool isConst=decl.find("const")!=-1;
bool isVolatile=decl.find("volatile")!=-1;
- yyextra->current->section = Entry::CLASS_SEC;
+ yyextra->current->section = Entry::CLASS_SEC;
yyextra->current->spec = Entry::Union;
- // bug 582676: can be a struct nested in an interface so keep yyextra->insideObjC state
- //yyextra->current->objc = yyextra->insideObjC = FALSE;
- addType(yyscanner);
+ // bug 582676: can be a struct nested in an interface so keep yyextra->insideObjC state
+ //yyextra->current->objc = yyextra->insideObjC = FALSE;
+ addType(yyscanner);
if (isConst)
{
yyextra->current->type += " const";
@@ -1558,239 +1560,239 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
{
yyextra->current->type += " volatile";
}
- yyextra->current->type += " union" ;
- yyextra->current->fileName = yyextra->yyFileName;
- yyextra->current->startLine = yyextra->yyLineNr;
- yyextra->current->startColumn = yyextra->yyColNr;
- yyextra->current->bodyLine = yyextra->yyLineNr;
- yyextra->current->bodyColumn = yyextra->yyColNr;
- lineCount(yyscanner) ;
- if (yytext[yyleng-1]=='{') unput('{');
- BEGIN( CompoundName ) ;
- }
+ yyextra->current->type += " union" ;
+ yyextra->current->fileName = yyextra->yyFileName;
+ yyextra->current->startLine = yyextra->yyLineNr;
+ yyextra->current->startColumn = yyextra->yyColNr;
+ yyextra->current->bodyLine = yyextra->yyLineNr;
+ yyextra->current->bodyColumn = yyextra->yyColNr;
+ lineCount(yyscanner) ;
+ if (yytext[yyleng-1]=='{') unput('{');
+ BEGIN( CompoundName ) ;
+ }
<FindMembers>{B}*{TYPEDEFPREFIX}{IDLATTR}?"enum"({BN}+("class"|"struct"))?"{" |
<FindMembers>{B}*{TYPEDEFPREFIX}{IDLATTR}?"enum"({BN}+("class"|"struct"))?{BN}+ { // for IDL: typedef [something] enum
QCString text=yytext;
- yyextra->isTypedef = text.find("typedef")!=-1;
+ yyextra->isTypedef = text.find("typedef")!=-1;
bool isStrongEnum = text.find("struct")!=-1 || text.find("class")!=-1 || yyextra->insideCS;
- if (yyextra->insideJava)
- {
- yyextra->current->section = Entry::CLASS_SEC;
- yyextra->current->spec = Entry::Enum;
- }
- else
- {
- yyextra->current->section = Entry::ENUM_SEC ;
- }
- addType(yyscanner);
- yyextra->current->type += " enum";
+ if (yyextra->insideJava)
+ {
+ yyextra->current->section = Entry::CLASS_SEC;
+ yyextra->current->spec = Entry::Enum;
+ }
+ else
+ {
+ yyextra->current->section = Entry::ENUM_SEC ;
+ }
+ addType(yyscanner);
+ yyextra->current->type += " enum";
if (isStrongEnum)
{
yyextra->current->spec |= Entry::Strong;
}
- yyextra->current->fileName = yyextra->yyFileName;
- yyextra->current->startLine = yyextra->yyLineNr;
- yyextra->current->startColumn = yyextra->yyColNr;
- yyextra->current->bodyLine = yyextra->yyLineNr;
- yyextra->current->bodyColumn = yyextra->yyColNr;
- lineCount(yyscanner) ;
- if (yytext[yyleng-1]=='{') unput('{');
- BEGIN( CompoundName ) ;
- }
+ yyextra->current->fileName = yyextra->yyFileName;
+ yyextra->current->startLine = yyextra->yyLineNr;
+ yyextra->current->startColumn = yyextra->yyColNr;
+ yyextra->current->bodyLine = yyextra->yyLineNr;
+ yyextra->current->bodyColumn = yyextra->yyColNr;
+ lineCount(yyscanner) ;
+ if (yytext[yyleng-1]=='{') unput('{');
+ BEGIN( CompoundName ) ;
+ }
<Operator>"("{BN}*")"({BN}*"<"[^>]*">"){BN}*/"(" { // A::operator()<int>(int arg)
- lineCount(yyscanner);
- yyextra->current->name += "()";
- BEGIN( FindMembers );
- }
-<Operator>"("{BN}*")"{BN}*/"(" {
- lineCount(yyscanner);
- yyextra->current->name += yytext ;
- yyextra->current->name = yyextra->current->name.simplifyWhiteSpace();
- BEGIN( FindMembers ) ;
- }
-<Operator>";" { // can occur when importing members
- unput(';');
- BEGIN( FindMembers ) ;
- }
-<Operator>[^(] {
- lineCount(yyscanner);
- yyextra->current->name += *yytext ;
- }
-<Operator>"<>" { /* skip guided templ specifiers */ }
-<Operator>"(" {
- yyextra->current->name = yyextra->current->name.simplifyWhiteSpace();
- unput(*yytext);
- BEGIN( FindMembers ) ;
- }
-<FindMembers>("template"|"generic")({BN}*)"<"/[>]? { // generic is a C++/CLI extension
- lineCount(yyscanner);
- ArgumentList al;
- //yyextra->current->spec |= (yytext[0]=='g') ? Entry::Generic : Entry::Template;
- yyextra->current->tArgLists.push_back(al);
- yyextra->currentArgumentList = &yyextra->current->tArgLists.back();
- yyextra->templateStr="<";
- yyextra->fullArgString = yyextra->templateStr;
- yyextra->copyArgString = &yyextra->templateStr;
- yyextra->currentArgumentContext = FindMembers;
- BEGIN( ReadTempArgs );
- }
+ lineCount(yyscanner);
+ yyextra->current->name += "()";
+ BEGIN( FindMembers );
+ }
+<Operator>"("{BN}*")"{BN}*/"(" {
+ lineCount(yyscanner);
+ yyextra->current->name += yytext ;
+ yyextra->current->name = yyextra->current->name.simplifyWhiteSpace();
+ BEGIN( FindMembers ) ;
+ }
+<Operator>";" { // can occur when importing members
+ unput(';');
+ BEGIN( FindMembers ) ;
+ }
+<Operator>[^(] {
+ lineCount(yyscanner);
+ yyextra->current->name += *yytext ;
+ }
+<Operator>"<>" { /* skip guided templ specifiers */ }
+<Operator>"(" {
+ yyextra->current->name = yyextra->current->name.simplifyWhiteSpace();
+ unput(*yytext);
+ BEGIN( FindMembers ) ;
+ }
+<FindMembers>("template"|"generic")({BN}*)"<"/[>]? { // generic is a C++/CLI extension
+ lineCount(yyscanner);
+ ArgumentList al;
+ //yyextra->current->spec |= (yytext[0]=='g') ? Entry::Generic : Entry::Template;
+ yyextra->current->tArgLists.push_back(al);
+ yyextra->currentArgumentList = &yyextra->current->tArgLists.back();
+ yyextra->templateStr="<";
+ yyextra->fullArgString = yyextra->templateStr;
+ yyextra->copyArgString = &yyextra->templateStr;
+ yyextra->currentArgumentContext = FindMembers;
+ BEGIN( ReadTempArgs );
+ }
<FindMembers>"namespace"{BN}+/{ID}{BN}*"=" { // namespace alias
- lineCount(yyscanner);
- BEGIN( NSAliasName );
- }
-<NSAliasName>{ID} {
- yyextra->aliasName = yytext;
- BEGIN( NSAliasArg );
- }
-<NSAliasArg>({ID}"::")*{ID} {
- //printf("Inserting namespace alias %s::%s->%s\n",yyextra->current_root->name.data(),yyextra->aliasName.data(),yytext);
+ lineCount(yyscanner);
+ BEGIN( NSAliasName );
+ }
+<NSAliasName>{ID} {
+ yyextra->aliasName = yytext;
+ BEGIN( NSAliasArg );
+ }
+<NSAliasArg>({ID}"::")*{ID} {
+ //printf("Inserting namespace alias %s::%s->%s\n",yyextra->current_root->name.data(),yyextra->aliasName.data(),yytext);
// TODO: namespace aliases are now treated as global entities
// while they should be aware of the scope they are in
Doxygen::namespaceAliasMap.insert({yyextra->aliasName.data(),std::string(yytext)});
- }
-<NSAliasArg>";" {
- BEGIN( FindMembers );
- }
+ }
+<NSAliasArg>";" {
+ BEGIN( FindMembers );
+ }
<PHPUse>({ID}{BN}*"\\"{BN}*)*{ID}/{BN}+"as" {
- lineCount(yyscanner);
- yyextra->aliasName=yytext;
- BEGIN(PHPUseAs);
- }
-<PHPUse>({ID}{BN}*"\\"{BN}*)*{ID} {
- lineCount(yyscanner);
- yyextra->current->name=removeRedundantWhiteSpace(substitute(yytext,"\\","::"));
- //printf("PHP: adding use relation: %s\n",yyextra->current->name.data());
- yyextra->current->fileName = yyextra->yyFileName;
+ lineCount(yyscanner);
+ yyextra->aliasName=yytext;
+ BEGIN(PHPUseAs);
+ }
+<PHPUse>({ID}{BN}*"\\"{BN}*)*{ID} {
+ lineCount(yyscanner);
+ yyextra->current->name=removeRedundantWhiteSpace(substitute(yytext,"\\","::"));
+ //printf("PHP: adding use relation: %s\n",yyextra->current->name.data());
+ yyextra->current->fileName = yyextra->yyFileName;
// add a using declaration
- yyextra->current->section=Entry::USINGDECL_SEC;
- yyextra->current_root->copyToSubEntry(yyextra->current);
+ yyextra->current->section=Entry::USINGDECL_SEC;
+ yyextra->current_root->copyToSubEntry(yyextra->current);
// also add it as a using directive
- yyextra->current->section=Entry::USINGDIR_SEC;
- yyextra->current_root->moveToSubEntryAndRefresh(yyextra->current);
- initEntry(yyscanner);
- yyextra->aliasName.resize(0);
- }
-<PHPUseAs>{BN}+"as"{BN}+ {
- lineCount(yyscanner);
- }
+ yyextra->current->section=Entry::USINGDIR_SEC;
+ yyextra->current_root->moveToSubEntryAndRefresh(yyextra->current);
+ initEntry(yyscanner);
+ yyextra->aliasName.resize(0);
+ }
+<PHPUseAs>{BN}+"as"{BN}+ {
+ lineCount(yyscanner);
+ }
<PHPUseAs>{PHPUSEKW} {
}
-<PHPUseAs>{ID} {
- //printf("PHP: adding use as relation: %s->%s\n",yytext,yyextra->aliasName.data());
+<PHPUseAs>{ID} {
+ //printf("PHP: adding use as relation: %s->%s\n",yytext,yyextra->aliasName.data());
if (!yyextra->aliasName.isEmpty())
{
Doxygen::namespaceAliasMap.insert({yytext,
- std::string(removeRedundantWhiteSpace(
- substitute(yyextra->aliasName,"\\","::")).data())});
- }
- yyextra->aliasName.resize(0);
- }
-<PHPUse,PHPUseAs>[,;] {
- if (*yytext==',')
- {
- BEGIN(PHPUse);
- }
- else
- {
- BEGIN(FindMembers);
- }
- }
-<JavaImport>({ID}{BN}*"."{BN}*)+"*" { // package import => add as a using directive
- lineCount(yyscanner);
- QCString scope=yytext;
- yyextra->current->name=removeRedundantWhiteSpace(substitute(scope.left(scope.length()-1),".","::"));
- yyextra->current->fileName = yyextra->yyFileName;
- yyextra->current->section=Entry::USINGDIR_SEC;
- yyextra->current_root->moveToSubEntryAndRefresh(yyextra->current);
- initEntry(yyscanner);
- BEGIN(Using);
- }
-<JavaImport>({ID}{BN}*"."{BN}*)+{ID} { // class import => add as a using declaration
+ std::string(removeRedundantWhiteSpace(
+ substitute(yyextra->aliasName,"\\","::")).data())});
+ }
+ yyextra->aliasName.resize(0);
+ }
+<PHPUse,PHPUseAs>[,;] {
+ if (*yytext==',')
+ {
+ BEGIN(PHPUse);
+ }
+ else
+ {
+ BEGIN(FindMembers);
+ }
+ }
+<JavaImport>({ID}{BN}*"."{BN}*)+"*" { // package import => add as a using directive
lineCount(yyscanner);
- QCString scope=yytext;
- yyextra->current->name=removeRedundantWhiteSpace(substitute(scope,".","::"));
- yyextra->current->fileName = yyextra->yyFileName;
- if (yyextra->insideD)
- {
- yyextra->current->section=Entry::USINGDIR_SEC;
- }
- else
- {
- //printf("import name = %s -> %s\n",yytext,yyextra->current->name.data());
- yyextra->current->section=Entry::USINGDECL_SEC;
- }
+ QCString scope=yytext;
+ yyextra->current->name=removeRedundantWhiteSpace(substitute(scope.left(scope.length()-1),".","::"));
+ yyextra->current->fileName = yyextra->yyFileName;
+ yyextra->current->section=Entry::USINGDIR_SEC;
+ yyextra->current_root->moveToSubEntryAndRefresh(yyextra->current);
+ initEntry(yyscanner);
+ BEGIN(Using);
+ }
+<JavaImport>({ID}{BN}*"."{BN}*)+{ID} { // class import => add as a using declaration
+ lineCount(yyscanner);
+ QCString scope=yytext;
+ yyextra->current->name=removeRedundantWhiteSpace(substitute(scope,".","::"));
+ yyextra->current->fileName = yyextra->yyFileName;
+ if (yyextra->insideD)
+ {
+ yyextra->current->section=Entry::USINGDIR_SEC;
+ }
+ else
+ {
+ //printf("import name = %s -> %s\n",yytext,yyextra->current->name.data());
+ yyextra->current->section=Entry::USINGDECL_SEC;
+ }
yyextra->previous = yyextra->current;
- yyextra->current_root->moveToSubEntryAndRefresh(yyextra->current);
- initEntry(yyscanner);
- BEGIN(Using);
- }
-<FindMembers>"using"{BN}+ {
- yyextra->current->startLine=yyextra->yyLineNr;
- yyextra->current->startColumn = yyextra->yyColNr;
- lineCount(yyscanner);
- BEGIN(Using);
- }
-<Using>"namespace"{BN}+ { lineCount(yyscanner); BEGIN(UsingDirective); }
+ yyextra->current_root->moveToSubEntryAndRefresh(yyextra->current);
+ initEntry(yyscanner);
+ BEGIN(Using);
+ }
+<FindMembers>"using"{BN}+ {
+ yyextra->current->startLine=yyextra->yyLineNr;
+ yyextra->current->startColumn = yyextra->yyColNr;
+ lineCount(yyscanner);
+ BEGIN(Using);
+ }
+<Using>"namespace"{BN}+ { lineCount(yyscanner); BEGIN(UsingDirective); }
<Using>({ID}{BN}*("::"|"."){BN}*)*({ID}|{OPERATOR}) {
lineCount(yyscanner);
- yyextra->current->name=yytext;
- yyextra->current->fileName = yyextra->yyFileName;
- yyextra->current->section=Entry::USINGDECL_SEC;
+ yyextra->current->name=yytext;
+ yyextra->current->fileName = yyextra->yyFileName;
+ yyextra->current->section=Entry::USINGDECL_SEC;
yyextra->current->startLine = yyextra->yyLineNr;
yyextra->previous = yyextra->current;
- yyextra->current_root->moveToSubEntryAndRefresh(yyextra->current);
- initEntry(yyscanner);
- if (yyextra->insideCS) /* Hack: in C# a using declaration and
- directive have the same syntax, so we
- also add it as a using directive here
- */
- {
- yyextra->current->name=yytext;
- yyextra->current->fileName = yyextra->yyFileName;
- yyextra->current->startLine = yyextra->yyLineNr;
- yyextra->current->startColumn = yyextra->yyColNr;
- yyextra->current->section=Entry::USINGDIR_SEC;
- yyextra->current_root->moveToSubEntryAndRefresh(yyextra->current);
- initEntry(yyscanner);
- }
- BEGIN(Using);
- }
+ yyextra->current_root->moveToSubEntryAndRefresh(yyextra->current);
+ initEntry(yyscanner);
+ if (yyextra->insideCS) /* Hack: in C# a using declaration and
+ directive have the same syntax, so we
+ also add it as a using directive here
+ */
+ {
+ yyextra->current->name=yytext;
+ yyextra->current->fileName = yyextra->yyFileName;
+ yyextra->current->startLine = yyextra->yyLineNr;
+ yyextra->current->startColumn = yyextra->yyColNr;
+ yyextra->current->section=Entry::USINGDIR_SEC;
+ yyextra->current_root->moveToSubEntryAndRefresh(yyextra->current);
+ initEntry(yyscanner);
+ }
+ BEGIN(Using);
+ }
<Using>"=" { // C++11 style template alias?
BEGIN(UsingAlias);
}
-<UsingAlias>";" {
+<UsingAlias>";" {
yyextra->previous->section=Entry::VARIABLE_SEC;
yyextra->previous->type = "typedef "+yyextra->previous->args;
- yyextra->previous->type=yyextra->previous->type.simplifyWhiteSpace();
+ yyextra->previous->type=yyextra->previous->type.simplifyWhiteSpace();
yyextra->previous->args.resize(0);
- yyextra->previous->name=yyextra->previous->name.stripWhiteSpace();
- yyextra->previous->bodyLine = yyextra->yyLineNr;
- yyextra->previous->bodyColumn = yyextra->yyColNr;
+ yyextra->previous->name=yyextra->previous->name.stripWhiteSpace();
+ yyextra->previous->bodyLine = yyextra->yyLineNr;
+ yyextra->previous->bodyColumn = yyextra->yyColNr;
yyextra->previous->spec |= Entry::Alias;
- BEGIN(FindMembers);
+ BEGIN(FindMembers);
}
<UsingAlias>";"{BN}*("/**"|"//!"|"/*!"|"///")"<" {
- yyextra->docBlockContext = UsingAliasEnd;
- yyextra->docBlockInBody = FALSE;
- yyextra->docBlockAutoBrief = ( yytext[yyleng-2]=='*' && Config_getBool(JAVADOC_AUTOBRIEF) ) ||
- ( yytext[yyleng-2]=='!' && Config_getBool(QT_AUTOBRIEF) );
+ yyextra->docBlockContext = UsingAliasEnd;
+ yyextra->docBlockInBody = FALSE;
+ yyextra->docBlockAutoBrief = ( yytext[yyleng-2]=='*' && Config_getBool(JAVADOC_AUTOBRIEF) ) ||
+ ( yytext[yyleng-2]=='!' && Config_getBool(QT_AUTOBRIEF) );
QCString indent;
indent.fill(' ',computeIndent(yytext,yyextra->column));
yyextra->docBlock=indent;
- lineCount(yyscanner);
-
- yyextra->docBlockTerm = ';';
- if (yytext[yyleng-3]=='/')
- {
- startCommentBlock(yyscanner,TRUE);
- BEGIN( DocLine );
- }
- else
- {
- startCommentBlock(yyscanner,FALSE);
- BEGIN( DocBlock );
- }
- }
+ lineCount(yyscanner);
+
+ yyextra->docBlockTerm = ';';
+ if (yytext[yyleng-3]=='/')
+ {
+ startCommentBlock(yyscanner,TRUE);
+ BEGIN( DocLine );
+ }
+ else
+ {
+ startCommentBlock(yyscanner,FALSE);
+ BEGIN( DocBlock );
+ }
+ }
<UsingAlias>">>" {
yyextra->previous->args+="> >"; // see bug769552
}
@@ -1809,300 +1811,301 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
unput(';');
BEGIN(UsingAlias);
}
-<UsingDirective>{SCOPENAME} { yyextra->current->name=removeRedundantWhiteSpace(yytext);
- yyextra->current->fileName = yyextra->yyFileName;
- yyextra->current->section=Entry::USINGDIR_SEC;
- yyextra->current_root->moveToSubEntryAndRefresh(yyextra->current);
- initEntry(yyscanner);
- BEGIN(Using);
- }
-<Using>";" { BEGIN(FindMembers); }
-<FindMembers>{SCOPENAME}{BN}*"<>" { // guided template decl
- QCString n=yytext;
- addType(yyscanner);
- yyextra->current->name=n.left(n.length()-2);
- }
-<FindMembers>{SCOPENAME}{BN}*/"<" { // Note: this could be a return type!
+<UsingDirective>{SCOPENAME} { yyextra->current->name=removeRedundantWhiteSpace(yytext);
+ yyextra->current->fileName = yyextra->yyFileName;
+ yyextra->current->section=Entry::USINGDIR_SEC;
+ yyextra->current_root->moveToSubEntryAndRefresh(yyextra->current);
+ initEntry(yyscanner);
+ BEGIN(Using);
+ }
+<Using>";" { BEGIN(FindMembers); }
+<FindMembers>{SCOPENAME}{BN}*"<>" { // guided template decl
+ QCString n=yytext;
+ addType(yyscanner);
+ yyextra->current->name=n.left(n.length()-2);
+ }
+<FindMembers>{SCOPENAME}{BN}*/"<" { // Note: this could be a return type!
yyextra->roundCount=0;
- yyextra->sharpCount=0;
- lineCount(yyscanner);
- addType(yyscanner);
- yyextra->current->name=yytext;
- yyextra->current->name=yyextra->current->name.stripWhiteSpace();
- //yyextra->current->scopeSpec.resize(0);
- // yyextra->currentTemplateSpec = &yyextra->current->scopeSpec;
- if (nameIsOperator(yyextra->current->name))
- BEGIN( Operator );
- else
- BEGIN( EndTemplate );
- }
-<FindMemberName>{SCOPENAME}{BN}*/"<" {
- yyextra->sharpCount=0;
- yyextra->roundCount=0;
- lineCount(yyscanner);
- yyextra->current->name+=((QCString)yytext).stripWhiteSpace();
- //yyextra->current->memberSpec.resize(0);
- // yyextra->currentTemplateSpec = &yyextra->current->memberSpec;
- if (nameIsOperator(yyextra->current->name))
- BEGIN( Operator );
- else
- BEGIN( EndTemplate );
- }
-<EndTemplate>"<<<" {
- if (!yyextra->insidePHP)
- {
- REJECT;
- }
- else
- {
+ yyextra->sharpCount=0;
+ lineCount(yyscanner);
+ addType(yyscanner);
+ yyextra->current->name=yytext;
+ yyextra->current->name=yyextra->current->name.stripWhiteSpace();
+ //yyextra->current->scopeSpec.resize(0);
+ // yyextra->currentTemplateSpec = &yyextra->current->scopeSpec;
+ if (nameIsOperator(yyextra->current->name))
+ BEGIN( Operator );
+ else
+ BEGIN( EndTemplate );
+ }
+<FindMemberName>{SCOPENAME}{BN}*/"<" {
+ yyextra->sharpCount=0;
+ yyextra->roundCount=0;
+ lineCount(yyscanner);
+ yyextra->current->name+=((QCString)yytext).stripWhiteSpace();
+ //yyextra->current->memberSpec.resize(0);
+ // yyextra->currentTemplateSpec = &yyextra->current->memberSpec;
+ if (nameIsOperator(yyextra->current->name))
+ BEGIN( Operator );
+ else
+ BEGIN( EndTemplate );
+ }
+<EndTemplate>"<<<" {
+ if (!yyextra->insidePHP)
+ {
+ REJECT;
+ }
+ else
+ {
yyextra->lastHereDocContext = YY_START;
- BEGIN(HereDoc);
- }
- }
-<ClassTemplSpec,EndTemplate>"<<" {
- yyextra->current->name+=yytext;
- // *yyextra->currentTemplateSpec+=yytext;
- }
-<EndTemplate>"<" {
+ BEGIN(HereDoc);
+ }
+ }
+<ClassTemplSpec,EndTemplate>"<<" {
+ yyextra->current->name+=yytext;
+ // *yyextra->currentTemplateSpec+=yytext;
+ }
+<EndTemplate>"<" {
if (yyextra->roundCount==0)
{
- // *yyextra->currentTemplateSpec+='<';
- yyextra->sharpCount++;
- }
- yyextra->current->name+=yytext;
- }
-<ClassTemplSpec,EndTemplate>">>" {
- if (yyextra->insideJava || yyextra->insideCS || yyextra->insideCli || yyextra->roundCount==0)
- {
- unput('>');
- unput(' ');
- unput('>');
- }
- else
- {
- yyextra->current->name+=yytext;
- }
- // *yyextra->currentTemplateSpec+=yytext;
- }
-<EndTemplate>">" {
- yyextra->current->name+='>';
- // *yyextra->currentTemplateSpec+='>';
- if (yyextra->roundCount==0 && --yyextra->sharpCount<=0)
- {
- //printf("Found %s\n",yyextra->current->name.data());
- BEGIN(FindMembers);
- }
- }
-<EndTemplate>">"{BN}*"(" {
- lineCount(yyscanner);
- yyextra->current->name+='>';
- // *yyextra->currentTemplateSpec+='>';
- if (yyextra->roundCount==0 && --yyextra->sharpCount<=0)
- {
- yyextra->current->bodyLine = yyextra->yyLineNr;
- yyextra->current->bodyColumn = yyextra->yyColNr;
- yyextra->current->args = "(";
- yyextra->currentArgumentContext = FuncQual;
- yyextra->fullArgString = yyextra->current->args.copy();
- yyextra->copyArgString = &yyextra->current->args;
- //printf("Found %s\n",yyextra->current->name.data());
- BEGIN( ReadFuncArgType ) ;
- }
- }
+ // *yyextra->currentTemplateSpec+='<';
+ yyextra->sharpCount++;
+ }
+ yyextra->current->name+=yytext;
+ }
+<ClassTemplSpec,EndTemplate>">>" {
+ if (yyextra->insideJava || yyextra->insideCS || yyextra->insideCli || yyextra->roundCount==0)
+ {
+ unput('>');
+ unput(' ');
+ unput('>');
+ }
+ else
+ {
+ yyextra->current->name+=yytext;
+ }
+ // *yyextra->currentTemplateSpec+=yytext;
+ }
+<EndTemplate>">" {
+ yyextra->current->name+='>';
+ // *yyextra->currentTemplateSpec+='>';
+ if (yyextra->roundCount==0 && --yyextra->sharpCount<=0)
+ {
+ //printf("Found %s\n",yyextra->current->name.data());
+ BEGIN(FindMembers);
+ }
+ }
+<EndTemplate>">"{BN}*"(" {
+ lineCount(yyscanner);
+ yyextra->current->name+='>';
+ // *yyextra->currentTemplateSpec+='>';
+ if (yyextra->roundCount==0 && --yyextra->sharpCount<=0)
+ {
+ yyextra->current->bodyLine = yyextra->yyLineNr;
+ yyextra->current->bodyColumn = yyextra->yyColNr;
+ yyextra->current->args = "(";
+ yyextra->currentArgumentContext = FuncQual;
+ yyextra->fullArgString = yyextra->current->args.copy();
+ yyextra->copyArgString = &yyextra->current->args;
+ //printf("Found %s\n",yyextra->current->name.data());
+ BEGIN( ReadFuncArgType ) ;
+ }
+ }
<EndTemplate>">"{BN}*/"("({BN}*{ID}{BN}*"::")*({BN}*"*"{BN}*)+ { // function pointer returning a template instance
- lineCount(yyscanner);
- yyextra->current->name+='>';
+ lineCount(yyscanner);
+ yyextra->current->name+='>';
if (yyextra->roundCount==0)
{
- BEGIN(FindMembers);
- }
- }
-<EndTemplate>">"{BN}*/"::" {
- lineCount(yyscanner);
- yyextra->current->name+='>';
- // *yyextra->currentTemplateSpec+='>';
- if (yyextra->roundCount==0 && --yyextra->sharpCount<=0)
- {
- BEGIN(FindMemberName);
- }
- }
+ BEGIN(FindMembers);
+ }
+ }
+<EndTemplate>">"{BN}*/"::" {
+ lineCount(yyscanner);
+ yyextra->current->name+='>';
+ // *yyextra->currentTemplateSpec+='>';
+ if (yyextra->roundCount==0 && --yyextra->sharpCount<=0)
+ {
+ BEGIN(FindMemberName);
+ }
+ }
<ClassTemplSpec,EndTemplate>"(" { yyextra->current->name+=*yytext;
- yyextra->roundCount++;
+ yyextra->roundCount++;
}
<ClassTemplSpec,EndTemplate>")" { yyextra->current->name+=*yytext;
- if (yyextra->roundCount>0) yyextra->roundCount--;
- }
-<EndTemplate>. {
- yyextra->current->name+=*yytext;
- // *yyextra->currentTemplateSpec+=*yytext;
- }
-<FindMembers>"define"{BN}*"("{BN}*["'] {
- if (yyextra->insidePHP)
- {
- yyextra->current->bodyLine = yyextra->yyLineNr;
- yyextra->current->bodyColumn = yyextra->yyColNr;
- BEGIN( DefinePHP );
- }
- else
- REJECT;
- }
+ if (yyextra->roundCount>0) yyextra->roundCount--;
+ }
+<EndTemplate>. {
+ yyextra->current->name+=*yytext;
+ // *yyextra->currentTemplateSpec+=*yytext;
+ }
+<FindMembers>"define"{BN}*"("{BN}*["'] {
+ if (yyextra->insidePHP)
+ {
+ yyextra->current->bodyLine = yyextra->yyLineNr;
+ yyextra->current->bodyColumn = yyextra->yyColNr;
+ BEGIN( DefinePHP );
+ }
+ else
+ REJECT;
+ }
<CopyHereDoc>{ID} { // PHP heredoc
- yyextra->delimiter = yytext;
+ yyextra->delimiter = yytext;
*yyextra->pCopyHereDocGString += yytext;
- BEGIN(CopyHereDocEnd);
+ BEGIN(CopyHereDocEnd);
}
-<CopyHereDoc>"'"{ID}/"'" { // PHP nowdoc
- yyextra->delimiter = &yytext[1];
+<CopyHereDoc>"'"{ID}/"'" { // PHP nowdoc
+ yyextra->delimiter = &yytext[1];
*yyextra->pCopyHereDocGString += yytext;
- BEGIN(CopyHereDocEnd);
- }
-<HereDoc>{ID} { // PHP heredoc
- yyextra->delimiter = yytext;
- BEGIN(HereDocEnd);
- }
-<HereDoc>"'"{ID}/"'" { // PHP nowdoc
- yyextra->delimiter = &yytext[1];
- BEGIN(HereDocEnd);
- }
-<HereDocEnd>^{ID} { // id at start of the line could mark the end of the block
- if (yyextra->delimiter==yytext) // it is the end marker
- {
- BEGIN(yyextra->lastHereDocContext);
- }
- }
-<HereDocEnd>. { }
-<CopyHereDocEnd>^{ID} { // id at start of the line could mark the end of the block
+ BEGIN(CopyHereDocEnd);
+ }
+<HereDoc>{ID} { // PHP heredoc
+ yyextra->delimiter = yytext;
+ BEGIN(HereDocEnd);
+ }
+<HereDoc>"'"{ID}/"'" { // PHP nowdoc
+ yyextra->delimiter = &yytext[1];
+ BEGIN(HereDocEnd);
+ }
+<HereDocEnd>^{ID} { // id at start of the line could mark the end of the block
+ if (yyextra->delimiter==yytext) // it is the end marker
+ {
+ BEGIN(yyextra->lastHereDocContext);
+ }
+ }
+<HereDocEnd>. { }
+<CopyHereDocEnd>^{ID} { // id at start of the line could mark the end of the block
*yyextra->pCopyHereDocGString += yytext;
- if (yyextra->delimiter==yytext) // it is the end marker
- {
- BEGIN(yyextra->lastHereDocContext);
- }
- }
-<CopyHereDocEnd>\n {
+ if (yyextra->delimiter==yytext) // it is the end marker
+ {
+ BEGIN(yyextra->lastHereDocContext);
+ }
+ }
+<CopyHereDocEnd>\n {
lineCount(yyscanner);
*yyextra->pCopyHereDocGString += yytext;
}
-<CopyHereDocEnd>{ID} {
+<CopyHereDocEnd>{ID} {
*yyextra->pCopyHereDocGString += yytext;
}
-<CopyHereDocEnd>. {
+<CopyHereDocEnd>. {
*yyextra->pCopyHereDocGString += yytext;
}
-<FindMembers>"Q_OBJECT" { // Qt object macro
- }
-<FindMembers>"Q_PROPERTY" { // Qt property declaration
- yyextra->current->protection = Public ; // see bug734245 & bug735462
- yyextra->current->mtype = yyextra->mtype = Property;
- yyextra->current->type.resize(0);
- BEGIN(QtPropType);
- }
-<QtPropType>"(" { // start of property arguments
- }
-<QtPropAttr>")" { // end of property arguments
- unput(';');
- BEGIN(FindMembers);
- }
-<QtPropType>{B}+ {
- yyextra->current->name+=yytext;
- }
-<QtPropType>"*" {
- yyextra->current->type+= yyextra->current->name;
- yyextra->current->type+= yytext;
- yyextra->current->name="";
- }
-<QtPropType>({TSCOPE}"::")*{TSCOPE} {
- yyextra->current->type+= yyextra->current->name;
- yyextra->current->name=yytext;
- }
-<QtPropType,QtPropAttr>{B}+"READ"{B}+ {
- yyextra->current->spec |= Entry::Readable;
- BEGIN(QtPropRead);
- }
-<QtPropType,QtPropAttr>{B}+"WRITE"{B}+ {
- yyextra->current->spec |= Entry::Writable;
- BEGIN(QtPropWrite);
- }
-<QtPropType,QtPropAttr>{B}+"MEMBER"{B}+{ID} | // member property => not supported yet
-<QtPropType,QtPropAttr>{B}+"RESET"{B}+{ID} | // reset method => not supported yet
-<QtPropType,QtPropAttr>{B}+"SCRIPTABLE"{B}+{ID} | // scriptable property => not supported yet
-<QtPropType,QtPropAttr>{B}+"DESIGNABLE"{B}+{ID} | // designable property => not supported yet
-<QtPropType,QtPropAttr>{B}+"NOTIFY"{B}+{ID} | // notify property => not supported yet
-<QtPropType,QtPropAttr>{B}+"REVISION"{B}+{ID} | // revision property => not supported yet
-<QtPropType,QtPropAttr>{B}+"STORED"{B}+{ID} | // stored property => not supported yet
-<QtPropType,QtPropAttr>{B}+"USER"{B}+{ID} | // user property => not supported yet
-<QtPropType,QtPropAttr>{B}+"CONSTANT"{B} | // constant property => not supported yet
-<QtPropType,QtPropAttr>{B}+"FINAL"{B} { // final property => not supported yet
- BEGIN(QtPropAttr);
- }
-<QtPropRead>{ID} {
- yyextra->current->read = yytext;
- BEGIN(QtPropAttr);
- }
-<QtPropWrite>{ID} {
- yyextra->current->write = yytext;
- BEGIN(QtPropAttr);
- }
+<FindMembers>"Q_OBJECT" { // Qt object macro
+ }
+<FindMembers>"Q_PROPERTY" { // Qt property declaration
+ yyextra->current->protection = Public ; // see bug734245 & bug735462
+ yyextra->current->mtype = yyextra->mtype = Property;
+ yyextra->current->type.resize(0);
+ BEGIN(QtPropType);
+ }
+<QtPropType>"(" { // start of property arguments
+ }
+<QtPropAttr>")" { // end of property arguments
+ unput(';');
+ BEGIN(FindMembers);
+ }
+<QtPropType>{B}+ {
+ yyextra->current->name+=yytext;
+ }
+<QtPropType>"*" {
+ yyextra->current->type+= yyextra->current->name;
+ yyextra->current->type+= yytext;
+ yyextra->current->name="";
+ }
+<QtPropType>({TSCOPE}"::")*{TSCOPE} {
+ yyextra->current->type+= yyextra->current->name;
+ yyextra->current->name=yytext;
+ }
+<QtPropType,QtPropAttr>{B}+"READ"{B}+ {
+ yyextra->current->spec |= Entry::Readable;
+ BEGIN(QtPropRead);
+ }
+<QtPropType,QtPropAttr>{B}+"WRITE"{B}+ {
+ yyextra->current->spec |= Entry::Writable;
+ BEGIN(QtPropWrite);
+ }
+<QtPropType,QtPropAttr>{B}+"MEMBER"{B}+{ID} | // member property => not supported yet
+<QtPropType,QtPropAttr>{B}+"RESET"{B}+{ID} | // reset method => not supported yet
+<QtPropType,QtPropAttr>{B}+"SCRIPTABLE"{B}+{ID} | // scriptable property => not supported yet
+<QtPropType,QtPropAttr>{B}+"DESIGNABLE"{B}+{ID} | // designable property => not supported yet
+<QtPropType,QtPropAttr>{B}+"NOTIFY"{B}+{ID} | // notify property => not supported yet
+<QtPropType,QtPropAttr>{B}+"REVISION"{B}+{ID} | // revision property => not supported yet
+<QtPropType,QtPropAttr>{B}+"STORED"{B}+{ID} | // stored property => not supported yet
+<QtPropType,QtPropAttr>{B}+"USER"{B}+{ID} | // user property => not supported yet
+<QtPropType,QtPropAttr>{B}+"CONSTANT"{B} | // constant property => not supported yet
+<QtPropType,QtPropAttr>{B}+"FINAL"{B} { // final property => not supported yet
+ BEGIN(QtPropAttr);
+ }
+<QtPropRead>{ID} {
+ yyextra->current->read = yytext;
+ BEGIN(QtPropAttr);
+ }
+<QtPropWrite>{ID} {
+ yyextra->current->write = yytext;
+ BEGIN(QtPropAttr);
+ }
<FindMembers>"friend"{BN}+("class"|"union"|"struct"){BN}+ {
- yyextra->current->name=yytext;
- BEGIN(FindMembers);
- }
-<FindMembers,FindMemberName>{SCOPENAME} {
+ yyextra->current->name=yytext;
+ BEGIN(FindMembers);
+ }
+<FindMembers,FindMemberName>{SCOPENAME} {
+
if (yyextra->clangParser && (yyextra->insideCpp || yyextra->insideObjC))
{
yyextra->current->id = yyextra->clangParser->lookup(yyextra->yyLineNr,yytext);
}
- yyextra->yyBegColNr=yyextra->yyColNr;
- yyextra->yyBegLineNr=yyextra->yyLineNr;
- lineCount(yyscanner);
+ yyextra->yyBegColNr=yyextra->yyColNr;
+ yyextra->yyBegLineNr=yyextra->yyLineNr;
+ lineCount(yyscanner);
if (yyextra->insideIDL && yyleng==9 && qstrcmp(yytext,"cpp_quote")==0)
- {
- BEGIN(CppQuote);
- }
- else if ((yyextra->insideIDL || yyextra->insideJava || yyextra->insideD) && yyleng==6 && qstrcmp(yytext,"import")==0)
- {
- if (yyextra->insideIDL)
- BEGIN(NextSemi);
- else // yyextra->insideJava or yyextra->insideD
- BEGIN(JavaImport);
- }
- else if (yyextra->insidePHP && qstrcmp(yytext,"use")==0)
- {
- BEGIN(PHPUse);
- }
- else if (yyextra->insideJava && qstrcmp(yytext,"package")==0)
- {
- lineCount(yyscanner);
- BEGIN(PackageName);
- }
- else if (yyextra->insideIDL && qstrcmp(yytext,"case")==0)
- {
- BEGIN(IDLUnionCase);
- }
- else if (yyextra->insideTryBlock && qstrcmp(yytext,"catch")==0)
- {
- yyextra->insideTryBlock=FALSE;
- BEGIN(TryFunctionBlock);
- }
+ {
+ BEGIN(CppQuote);
+ }
+ else if ((yyextra->insideIDL || yyextra->insideJava || yyextra->insideD) && yyleng==6 && qstrcmp(yytext,"import")==0)
+ {
+ if (yyextra->insideIDL)
+ BEGIN(NextSemi);
+ else // yyextra->insideJava or yyextra->insideD
+ BEGIN(JavaImport);
+ }
+ else if (yyextra->insidePHP && qstrcmp(yytext,"use")==0)
+ {
+ BEGIN(PHPUse);
+ }
+ else if (yyextra->insideJava && qstrcmp(yytext,"package")==0)
+ {
+ lineCount(yyscanner);
+ BEGIN(PackageName);
+ }
+ else if (yyextra->insideIDL && qstrcmp(yytext,"case")==0)
+ {
+ BEGIN(IDLUnionCase);
+ }
+ else if (yyextra->insideTryBlock && qstrcmp(yytext,"catch")==0)
+ {
+ yyextra->insideTryBlock=FALSE;
+ BEGIN(TryFunctionBlock);
+ }
else if (yyextra->insideCpp && qstrcmp(yytext,"alignas")==0)
{
yyextra->lastAlignAsContext = YY_START;
BEGIN(AlignAs);
}
- else if (yyextra->insideJS && qstrcmp(yytext,"var")==0)
- { // javascript variable
- yyextra->current->type="var";
- }
- else if (yyextra->insideJS && qstrcmp(yytext,"function")==0)
- { // javascript function
- yyextra->current->type="function";
- }
- else if (yyextra->insideCS && qstrcmp(yytext,"this")==0)
- {
- // C# indexer
- addType(yyscanner);
- yyextra->current->name="this";
- BEGIN(CSIndexer);
- }
+ else if (yyextra->insideJS && qstrcmp(yytext,"var")==0)
+ { // javascript variable
+ yyextra->current->type="var";
+ }
+ else if (yyextra->insideJS && qstrcmp(yytext,"function")==0)
+ { // javascript function
+ yyextra->current->type="function";
+ }
+ else if (yyextra->insideCS && qstrcmp(yytext,"this")==0)
+ {
+ // C# indexer
+ addType(yyscanner);
+ yyextra->current->name="this";
+ BEGIN(CSIndexer);
+ }
else if (yyextra->insideCpp && qstrcmp(yytext,"static_assert")==0)
{
// C++11 static_assert
@@ -2111,7 +2114,7 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
else if (yyextra->insideCpp && qstrcmp(yytext,"decltype")==0)
{
// C++11 decltype(x)
- yyextra->current->type+=yytext;
+ yyextra->current->type+=yytext;
BEGIN(DeclType);
}
else if (yyextra->insideSlice && qstrcmp(yytext,"optional")==0)
@@ -2127,88 +2130,88 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
yyextra->lastModifierContext = YY_START;
BEGIN(SliceOptional);
}
- else
- {
- if (YY_START==FindMembers)
- {
- addType(yyscanner);
- }
- bool javaLike = yyextra->insideJava || yyextra->insideCS || yyextra->insideD || yyextra->insidePHP || yyextra->insideJS;
- if (javaLike && qstrcmp(yytext,"public")==0)
- {
- yyextra->current->protection = Public;
- }
- else if (javaLike && qstrcmp(yytext,"protected")==0)
- {
- yyextra->current->protection = Protected;
- }
- else if ((yyextra->insideCS || yyextra->insideD || yyextra->insidePHP || yyextra->insideJS) && qstrcmp(yytext,"internal")==0)
- {
- yyextra->current->protection = Package;
- }
- else if (javaLike && qstrcmp(yytext,"private")==0)
- {
- yyextra->current->protection = Private;
- }
- else if (javaLike && qstrcmp(yytext,"static")==0)
- {
- if (YY_START==FindMembers)
- yyextra->current->name = yytext;
- else
- yyextra->current->name += yytext;
- yyextra->current->stat = TRUE;
- }
- else
- {
- if (YY_START==FindMembers)
- yyextra->current->name = yytext;
- else
- yyextra->current->name += yytext;
- if (yyextra->current->name.left(7)=="static ")
- {
- yyextra->current->stat = TRUE;
- yyextra->current->name= yyextra->current->name.mid(7);
- }
- else if (yyextra->current->name.left(7)=="inline ")
- {
- if (yyextra->current->type.isEmpty())
- {
- yyextra->current->type="inline";
- }
- else
- {
- yyextra->current->type+="inline ";
- }
- yyextra->current->name= yyextra->current->name.mid(7);
- }
- else if (yyextra->current->name.left(6)=="const ")
- {
- if (yyextra->current->type.isEmpty())
- {
- yyextra->current->type="const";
- }
- else
- {
- yyextra->current->type+="const ";
- }
- yyextra->current->name=yyextra->current->name.mid(6);
- }
- }
- QCString tmp=yytext;
- if (nameIsOperator(tmp))
+ else
+ {
+ if (YY_START==FindMembers)
+ {
+ addType(yyscanner);
+ }
+ bool javaLike = yyextra->insideJava || yyextra->insideCS || yyextra->insideD || yyextra->insidePHP || yyextra->insideJS;
+ if (javaLike && qstrcmp(yytext,"public")==0)
+ {
+ yyextra->current->protection = Public;
+ }
+ else if (javaLike && qstrcmp(yytext,"protected")==0)
+ {
+ yyextra->current->protection = Protected;
+ }
+ else if ((yyextra->insideCS || yyextra->insideD || yyextra->insidePHP || yyextra->insideJS) && qstrcmp(yytext,"internal")==0)
+ {
+ yyextra->current->protection = Package;
+ }
+ else if (javaLike && qstrcmp(yytext,"private")==0)
+ {
+ yyextra->current->protection = Private;
+ }
+ else if (javaLike && qstrcmp(yytext,"static")==0)
{
- BEGIN( Operator );
+ if (YY_START==FindMembers)
+ yyextra->current->name = yytext;
+ else
+ yyextra->current->name += yytext;
+ yyextra->current->stat = TRUE;
}
- else
+ else
+ {
+ if (YY_START==FindMembers)
+ yyextra->current->name = yytext;
+ else
+ yyextra->current->name += yytext;
+ if (yyextra->current->name.left(7)=="static ")
+ {
+ yyextra->current->stat = TRUE;
+ yyextra->current->name= yyextra->current->name.mid(7);
+ }
+ else if (yyextra->current->name.left(7)=="inline ")
+ {
+ if (yyextra->current->type.isEmpty())
+ {
+ yyextra->current->type="inline";
+ }
+ else
+ {
+ yyextra->current->type+="inline ";
+ }
+ yyextra->current->name= yyextra->current->name.mid(7);
+ }
+ else if (yyextra->current->name.left(6)=="const ")
+ {
+ if (yyextra->current->type.isEmpty())
+ {
+ yyextra->current->type="const";
+ }
+ else
+ {
+ yyextra->current->type+="const ";
+ }
+ yyextra->current->name=yyextra->current->name.mid(6);
+ }
+ }
+ QCString tmp=yytext;
+ if (nameIsOperator(tmp))
+ {
+ BEGIN( Operator );
+ }
+ else
{
- yyextra->externC=FALSE; // see bug759247
- BEGIN(FindMembers);
+ yyextra->externC=FALSE; // see bug759247
+ BEGIN(FindMembers);
}
- }
- }
+ }
+ }
<StaticAssert>"(" {
- yyextra->lastSkipRoundContext = FindMembers;
- yyextra->roundCount=0;
+ yyextra->lastSkipRoundContext = FindMembers;
+ yyextra->roundCount=0;
BEGIN(SkipRound);
}
<StaticAssert>{BN}+ { lineCount(yyscanner); }
@@ -2217,10 +2220,10 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
BEGIN(FindMembers);
}
<DeclType>"(" {
- yyextra->current->type+=yytext;
- yyextra->lastRoundContext=FindMembers;
- yyextra->pCopyRoundString=&yyextra->current->type;
- yyextra->roundCount=0;
+ yyextra->current->type+=yytext;
+ yyextra->lastRoundContext=FindMembers;
+ yyextra->pCopyRoundString=&yyextra->current->type;
+ yyextra->roundCount=0;
BEGIN(CopyRound);
}
<DeclType>{BN}+ { lineCount(yyscanner); }
@@ -2228,433 +2231,446 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
unput(*yytext);
BEGIN(FindMembers);
}
-<CSIndexer>"["[^\n\]]*"]" {
- yyextra->current->name+=removeRedundantWhiteSpace(yytext);
- BEGIN(FindMembers);
- }
-<FindMembers>[0-9]{ID} { // some number where we did not expect one
- }
-<FindMembers>"." {
- if (yyextra->insideJava || yyextra->insideCS || yyextra->insideD)
- {
- yyextra->current->name+=".";
- }
- }
-<FindMembers>"::" {
- yyextra->current->name+=yytext;
- }
-<CppQuote>"("{B}*"\"" {
- yyextra->insideCppQuote=TRUE;
- BEGIN(FindMembers);
- }
+<CSIndexer>"["[^\n\]]*"]" {
+ yyextra->current->name+=removeRedundantWhiteSpace(yytext);
+ BEGIN(FindMembers);
+ }
+<FindMembers>[0-9]{ID} { // some number where we did not expect one
+ }
+<FindMembers>"." {
+ if (yyextra->insideJava || yyextra->insideCS || yyextra->insideD)
+ {
+ yyextra->current->name+=".";
+ }
+ }
+<FindMembers>"::" {
+ yyextra->current->name+=yytext;
+ }
+<CppQuote>"("{B}*"\"" {
+ yyextra->insideCppQuote=TRUE;
+ BEGIN(FindMembers);
+ }
<IDLUnionCase>"::"
-<IDLUnionCase>":" { BEGIN(FindMembers); }
-<IDLUnionCase>\n { lineCount(yyscanner); }
+<IDLUnionCase>":" { BEGIN(FindMembers); }
+<IDLUnionCase>\n { lineCount(yyscanner); }
<IDLUnionCase>.
-<TryFunctionBlock>\n { lineCount(yyscanner); }
-<TryFunctionBlock>"{" {
- yyextra->curlyCount=0;
- yyextra->lastCurlyContext = TryFunctionBlockEnd ;
- BEGIN( SkipCurly );
- }
+<TryFunctionBlock>\n { lineCount(yyscanner); }
+<TryFunctionBlock>"{" {
+ yyextra->curlyCount=0;
+ yyextra->lastCurlyContext = TryFunctionBlockEnd ;
+ BEGIN( SkipCurly );
+ }
<TryFunctionBlock>.
-<TryFunctionBlockEnd>{BN}*"catch" { lineCount(yyscanner); BEGIN(TryFunctionBlock); // {BN}* added to fix bug 611193
- }
-<TryFunctionBlockEnd>\n { unput(*yytext); // rule added to fix bug id 601138
- BEGIN( FindMembers );
- }
-<TryFunctionBlockEnd>. { unput(*yytext);
- BEGIN( FindMembers );
- }
-<EndCppQuote>")" {
- yyextra->insideCppQuote=FALSE;
- BEGIN(FindMembers);
- }
-<FindMembers,FindFields>{B}*"#" { if (yyextra->insidePHP)
- REJECT;
- yyextra->lastCPPContext = YY_START;
- BEGIN( SkipCPP ) ;
- }
-<FindMembers,FindFields>{B}*"#"{B}*("cmake")?"define" {
- if (yyextra->insidePHP)
- REJECT;
- yyextra->current->bodyLine = yyextra->yyLineNr;
- yyextra->current->bodyColumn = yyextra->yyColNr;
+<TryFunctionBlockEnd>{BN}*"catch" { lineCount(yyscanner); BEGIN(TryFunctionBlock); // {BN}* added to fix bug 611193
+ }
+<TryFunctionBlockEnd>\n { unput(*yytext); // rule added to fix bug id 601138
+ BEGIN( FindMembers );
+ }
+<TryFunctionBlockEnd>. { unput(*yytext);
+ BEGIN( FindMembers );
+ }
+<EndCppQuote>")" {
+ yyextra->insideCppQuote=FALSE;
+ BEGIN(FindMembers);
+ }
+<FindMembers,FindFields>{B}*"#" { if (yyextra->insidePHP)
+ REJECT;
+ yyextra->lastCPPContext = YY_START;
+ BEGIN( SkipCPP ) ;
+ }
+<FindMembers,FindFields>{B}*"#"{B}*("cmake")?"define" {
+ if (yyextra->insidePHP)
+ REJECT;
+ yyextra->current->bodyLine = yyextra->yyLineNr;
+ yyextra->current->bodyColumn = yyextra->yyColNr;
yyextra->lastDefineContext = YY_START;
- BEGIN( Define );
- }
-<FindMembers,ReadBody,ReadNSBody,ReadBodyIntf,SkipCurly,SkipCurlyCpp>{B}*"#"{B}+[0-9]+{B}+/"\"" { /* line control directive */
+ BEGIN( Define );
+ }
+<FindMembers,ReadBody,ReadNSBody,ReadBodyIntf,SkipCurly,SkipCurlyCpp>{B}*"#"{B}+[0-9]+{B}+/"\"" { /* line control directive */
yyextra->yyLineNr = atoi(&yytext[1]);
- //printf("setting line number to %d\n",yyextra->yyLineNr);
- yyextra->lastPreLineCtrlContext = YY_START;
- if (YY_START==ReadBody ||
- YY_START==ReadNSBody ||
- YY_START==ReadBodyIntf)
- {
- yyextra->current->program+=yytext;
- }
- BEGIN( PreLineCtrl );
- }
-<PreLineCtrl>"\""[^\n\"]*"\"" {
- yyextra->yyFileName = stripQuotes(yytext);
- if (yyextra->lastPreLineCtrlContext==ReadBody ||
- yyextra->lastPreLineCtrlContext==ReadNSBody ||
- yyextra->lastPreLineCtrlContext==ReadBodyIntf)
- {
- yyextra->current->program+=yytext;
- }
- }
-<PreLineCtrl>. {
- if (yyextra->lastPreLineCtrlContext==ReadBody ||
- yyextra->lastPreLineCtrlContext==ReadNSBody ||
- yyextra->lastPreLineCtrlContext==ReadBodyIntf)
- {
- yyextra->current->program+=yytext;
- }
- }
-<PreLineCtrl>\n {
- if (yyextra->lastPreLineCtrlContext==ReadBody ||
- yyextra->lastPreLineCtrlContext==ReadNSBody ||
- yyextra->lastPreLineCtrlContext==ReadBodyIntf)
- {
- yyextra->current->program+=yytext;
- }
+ //printf("setting line number to %d\n",yyextra->yyLineNr);
+ yyextra->lastPreLineCtrlContext = YY_START;
+ if (YY_START==ReadBody ||
+ YY_START==ReadNSBody ||
+ YY_START==ReadBodyIntf)
+ {
+ yyextra->current->program+=yytext;
+ }
+ BEGIN( PreLineCtrl );
+ }
+<PreLineCtrl>"\""[^\n\"]*"\"" {
+ yyextra->yyFileName = stripQuotes(yytext);
+ if (yyextra->lastPreLineCtrlContext==ReadBody ||
+ yyextra->lastPreLineCtrlContext==ReadNSBody ||
+ yyextra->lastPreLineCtrlContext==ReadBodyIntf)
+ {
+ yyextra->current->program+=yytext;
+ }
+ }
+<PreLineCtrl>. {
+ if (yyextra->lastPreLineCtrlContext==ReadBody ||
+ yyextra->lastPreLineCtrlContext==ReadNSBody ||
+ yyextra->lastPreLineCtrlContext==ReadBodyIntf)
+ {
+ yyextra->current->program+=yytext;
+ }
+ }
+<PreLineCtrl>\n {
+ if (yyextra->lastPreLineCtrlContext==ReadBody ||
+ yyextra->lastPreLineCtrlContext==ReadNSBody ||
+ yyextra->lastPreLineCtrlContext==ReadBodyIntf)
+ {
+ yyextra->current->program+=yytext;
+ }
lineCount(yyscanner);
- BEGIN( yyextra->lastPreLineCtrlContext );
- }
+ BEGIN( yyextra->lastPreLineCtrlContext );
+ }
<SkipCPP>.
-<SkipCPP>\\[\r]*"\n"[\r]* { lineCount(yyscanner); }
-<SkipCPP>[\r]*\n[\r]* { lineCount(yyscanner);
- BEGIN( yyextra->lastCPPContext) ;
- }
-<Define>{ID}{B}*"(" {
- yyextra->current->name = yytext;
- yyextra->current->name = yyextra->current->name.left(yyextra->current->name.length()-1).stripWhiteSpace();
- yyextra->current->args = "(";
- yyextra->current->bodyLine = yyextra->yyLineNr;
- yyextra->current->bodyColumn = yyextra->yyColNr;
- yyextra->currentArgumentContext = DefineEnd;
- yyextra->fullArgString=yyextra->current->args.copy();
- yyextra->copyArgString=&yyextra->current->args;
- BEGIN( ReadFuncArgType ) ;
- }
+<SkipCPP>\\[\r]*"\n"[\r]* { lineCount(yyscanner); }
+<SkipCPP>[\r]*\n[\r]* { lineCount(yyscanner);
+ BEGIN( yyextra->lastCPPContext) ;
+ }
+<Define>{ID}{B}*"(" {
+ yyextra->current->name = yytext;
+ yyextra->current->name = yyextra->current->name.left(yyextra->current->name.length()-1).stripWhiteSpace();
+ yyextra->current->args = "(";
+ yyextra->current->bodyLine = yyextra->yyLineNr;
+ yyextra->current->bodyColumn = yyextra->yyColNr;
+ yyextra->currentArgumentContext = DefineEnd;
+ yyextra->fullArgString=yyextra->current->args.copy();
+ yyextra->copyArgString=&yyextra->current->args;
+ BEGIN( ReadFuncArgType ) ;
+ }
/*
-<DefineArg>")" {
- //printf("Define with args\n");
- yyextra->current->args += ')';
- BEGIN( DefineEnd );
- }
-<DefineArg>. {
- yyextra->current->args += *yytext;
- }
+<DefineArg>")" {
+ //printf("Define with args\n");
+ yyextra->current->args += ')';
+ BEGIN( DefineEnd );
+ }
+<DefineArg>. {
+ yyextra->current->args += *yytext;
+ }
*/
-<Define>{ID} {
- //printf("Define '%s' without args\n",yytext);
+<Define>{ID} {
+ //printf("Define '%s' without args\n",yytext);
if (yyextra->clangParser && (yyextra->insideCpp || yyextra->insideObjC))
{
yyextra->current->id = yyextra->clangParser->lookup(yyextra->yyLineNr,yytext);
}
- yyextra->current->bodyLine = yyextra->yyLineNr;
- yyextra->current->bodyColumn = yyextra->yyColNr;
- yyextra->current->name = yytext;
- BEGIN(DefineEnd);
- }
-<DefineEnd>\n {
- //printf("End define: doc=%s docFile=%s docLine=%d\n",yyextra->current->doc.data(),yyextra->current->docFile.data(),yyextra->current->docLine);
- yyextra->current->fileName = yyextra->yyFileName;
- yyextra->current->startLine = yyextra->yyLineNr;
- yyextra->current->startColumn = yyextra->yyColNr;
- yyextra->current->type.resize(0);
- yyextra->current->args = yyextra->current->args.simplifyWhiteSpace();
- yyextra->current->name = yyextra->current->name.stripWhiteSpace();
- yyextra->current->section = Entry::DEFINE_SEC;
- yyextra->current_root->moveToSubEntryAndRefresh(yyextra->current);
+ yyextra->current->bodyLine = yyextra->yyLineNr;
+ yyextra->current->bodyColumn = yyextra->yyColNr;
+ yyextra->current->name = yytext;
+ BEGIN(DefineEnd);
+ }
+<DefineEnd>\n {
+ //printf("End define: doc=%s docFile=%s docLine=%d\n",yyextra->current->doc.data(),yyextra->current->docFile.data(),yyextra->current->docLine);
+ yyextra->current->fileName = yyextra->yyFileName;
+ yyextra->current->startLine = yyextra->yyLineNr;
+ yyextra->current->startColumn = yyextra->yyColNr;
+ yyextra->current->type.resize(0);
+ yyextra->current->args = yyextra->current->args.simplifyWhiteSpace();
+ yyextra->current->name = yyextra->current->name.stripWhiteSpace();
+ yyextra->current->section = Entry::DEFINE_SEC;
+ yyextra->current_root->moveToSubEntryAndRefresh(yyextra->current);
lineCount(yyscanner);
- initEntry(yyscanner);
- BEGIN(yyextra->lastDefineContext);
- }
-<DefinePHPEnd>";" {
- //printf("End define\n");
- yyextra->current->fileName = yyextra->yyFileName;
- yyextra->current->startLine = yyextra->yyLineNr;
- yyextra->current->startColumn = yyextra->yyColNr;
- yyextra->current->type.resize(0);
+ initEntry(yyscanner);
+ BEGIN(yyextra->lastDefineContext);
+ }
+<DefinePHPEnd>";" {
+ //printf("End define\n");
+ yyextra->current->fileName = yyextra->yyFileName;
+ yyextra->current->startLine = yyextra->yyLineNr;
+ yyextra->current->startColumn = yyextra->yyColNr;
+ yyextra->current->type.resize(0);
yyextra->current->type = "const";
QCString init = yyextra->current->initializer.data();
- init = init.simplifyWhiteSpace();
- init = init.left(init.length()-1);
+ init = init.simplifyWhiteSpace();
+ init = init.left(init.length()-1);
yyextra->current->initializer = init;
- yyextra->current->name = yyextra->current->name.stripWhiteSpace();
- yyextra->current->section = Entry::VARIABLE_SEC;
- yyextra->current_root->moveToSubEntryAndRefresh(yyextra->current);
- initEntry(yyscanner);
- BEGIN(FindMembers);
- }
+ yyextra->current->name = yyextra->current->name.stripWhiteSpace();
+ yyextra->current->section = Entry::VARIABLE_SEC;
+ yyextra->current_root->moveToSubEntryAndRefresh(yyextra->current);
+ initEntry(yyscanner);
+ BEGIN(FindMembers);
+ }
<DefinePHPEnd>.
-<DefineEnd>\\[\r]?\n {
+<DefineEnd>\\[\r]?\n {
lineCount(yyscanner);
- }
-<DefineEnd>\" {
- if (yyextra->insideIDL && yyextra->insideCppQuote)
- {
- BEGIN(EndCppQuote);
- }
- else
- {
- yyextra->lastStringContext=DefineEnd;
- BEGIN(SkipString);
- }
- }
-<DefineEnd>.
-<DefinePHP>{ID}["']{BN}*","{BN}* {
- yyextra->current->name = yytext;
- yyextra->current->name = yyextra->current->name.stripWhiteSpace();
- yyextra->current->name = yyextra->current->name.left(yyextra->current->name.length()-1).stripWhiteSpace();
- yyextra->current->name = yyextra->current->name.left(yyextra->current->name.length()-1);
- yyextra->current->bodyLine = yyextra->yyLineNr;
- yyextra->current->bodyColumn = yyextra->yyColNr;
- yyextra->lastRoundContext = DefinePHPEnd;
- yyextra->pCopyRoundGString = &yyextra->current->initializer;
- yyextra->roundCount = 0;
- BEGIN( GCopyRound );
- }
-
-<FindMembers>[\^%] { // ^ and % are C++/CLI extensions
- if (yyextra->insideCli)
- {
- addType(yyscanner);
- yyextra->current->name = yytext ;
- }
- else
- {
- REJECT;
- }
- }
-<FindMembers>[*&]+ {
- yyextra->current->name += yytext ;
- addType(yyscanner);
- }
-<FindMembers,MemberSpec,Function,NextSemi,EnumBaseType,BitFields,ReadInitializer,OldStyleArgs,DefinePHPEnd>";"{BN}*("/**"|"//!"|"/*!"|"///")"<" {
- if (yyextra->current->bodyLine==-1)
- {
- yyextra->current->bodyLine=yyextra->yyLineNr;
- yyextra->current->bodyColumn = yyextra->yyColNr;
- }
- yyextra->docBlockContext = YY_START;
- yyextra->docBlockInBody = FALSE;
- yyextra->docBlockAutoBrief = ( yytext[yyleng-2]=='*' && Config_getBool(JAVADOC_AUTOBRIEF) ) ||
- ( yytext[yyleng-2]=='!' && Config_getBool(QT_AUTOBRIEF) );
+ }
+<DefineEnd>\" {
+ if (yyextra->insideIDL && yyextra->insideCppQuote)
+ {
+ BEGIN(EndCppQuote);
+ }
+ else
+ {
+ yyextra->lastStringContext=DefineEnd;
+ BEGIN(SkipString);
+ }
+ }
+<DefineEnd>.
+<DefinePHP>{ID}["']{BN}*","{BN}* {
+ yyextra->current->name = yytext;
+ yyextra->current->name = yyextra->current->name.stripWhiteSpace();
+ yyextra->current->name = yyextra->current->name.left(yyextra->current->name.length()-1).stripWhiteSpace();
+ yyextra->current->name = yyextra->current->name.left(yyextra->current->name.length()-1);
+ yyextra->current->bodyLine = yyextra->yyLineNr;
+ yyextra->current->bodyColumn = yyextra->yyColNr;
+ yyextra->lastRoundContext = DefinePHPEnd;
+ yyextra->pCopyRoundGString = &yyextra->current->initializer;
+ yyextra->roundCount = 0;
+ BEGIN( GCopyRound );
+ }
+
+<FindMembers>[\^%] { // ^ and % are C++/CLI extensions
+ if (yyextra->insideCli)
+ {
+ addType(yyscanner);
+ yyextra->current->name = yytext ;
+ }
+ else
+ {
+ REJECT;
+ }
+ }
+<FindMembers>[*&]+ {
+ yyextra->current->name += yytext ;
+ addType(yyscanner);
+ }
+<FindMembers,MemberSpec,Function,NextSemi,EnumBaseType,BitFields,ReadInitializer,ReadInitializerPtr,OldStyleArgs,DefinePHPEnd>";"{BN}*("/**"|"//!"|"/*!"|"///")"<" {
+ if (yyextra->current->bodyLine==-1)
+ {
+ yyextra->current->bodyLine=yyextra->yyLineNr;
+ yyextra->current->bodyColumn = yyextra->yyColNr;
+ }
+ yyextra->docBlockContext = YY_START;
+ yyextra->docBlockInBody = FALSE;
+ yyextra->docBlockAutoBrief = ( yytext[yyleng-2]=='*' && Config_getBool(JAVADOC_AUTOBRIEF) ) ||
+ ( yytext[yyleng-2]=='!' && Config_getBool(QT_AUTOBRIEF) );
QCString indent;
indent.fill(' ',computeIndent(yytext,yyextra->column));
yyextra->docBlock=indent;
//printf("indent=%d\n",computeIndent(yytext+1,yyextra->column));
- lineCount(yyscanner);
+ lineCount(yyscanner);
- yyextra->docBlockTerm = ';';
+ yyextra->docBlockTerm = ';';
if (YY_START==EnumBaseType && yyextra->current->section==Entry::ENUM_SEC)
{
yyextra->current->bitfields = ":"+yyextra->current->args;
yyextra->current->args.resize(0);
yyextra->current->section=Entry::VARIABLE_SEC;
}
- if (yytext[yyleng-3]=='/')
- {
- startCommentBlock(yyscanner,TRUE);
- BEGIN( DocLine );
- }
- else
- {
- startCommentBlock(yyscanner,FALSE);
- BEGIN( DocBlock );
- }
- }
-<MemberSpec,FindFields,FindMembers,NextSemi,EnumBaseType,BitFields,ReadInitializer,OldStyleArgs>","{BN}*("/**"|"//!"|"/*!"|"///")"<" {
- yyextra->docBlockContext = YY_START;
- yyextra->docBlockInBody = FALSE;
- yyextra->docBlockAutoBrief = ( yytext[yyleng-2]=='*' && Config_getBool(JAVADOC_AUTOBRIEF) ) ||
- ( yytext[yyleng-2]=='!' && Config_getBool(QT_AUTOBRIEF) );
+ if (yytext[yyleng-3]=='/')
+ {
+ startCommentBlock(yyscanner,TRUE);
+ BEGIN( DocLine );
+ }
+ else
+ {
+ startCommentBlock(yyscanner,FALSE);
+ BEGIN( DocBlock );
+ }
+ }
+<MemberSpec,FindFields,FindMembers,NextSemi,EnumBaseType,BitFields,ReadInitializer,ReadInitializerPtr,OldStyleArgs>","{BN}*("/**"|"//!"|"/*!"|"///")"<" {
+ yyextra->docBlockContext = YY_START;
+ yyextra->docBlockInBody = FALSE;
+ yyextra->docBlockAutoBrief = ( yytext[yyleng-2]=='*' && Config_getBool(JAVADOC_AUTOBRIEF) ) ||
+ ( yytext[yyleng-2]=='!' && Config_getBool(QT_AUTOBRIEF) );
QCString indent;
indent.fill(' ',computeIndent(yytext,yyextra->column));
yyextra->docBlock=indent;
- lineCount(yyscanner);
+ lineCount(yyscanner);
- yyextra->docBlockTerm = ',';
+ yyextra->docBlockTerm = ',';
if (YY_START==EnumBaseType && yyextra->current->section==Entry::ENUM_SEC)
{
yyextra->current->bitfields = ":"+yyextra->current->args;
yyextra->current->args.resize(0);
yyextra->current->section=Entry::VARIABLE_SEC;
}
- if (yytext[yyleng-3]=='/')
- {
- startCommentBlock(yyscanner,TRUE);
- BEGIN( DocLine );
- }
- else
- {
- startCommentBlock(yyscanner,FALSE);
- BEGIN( DocBlock );
- }
- }
-<DefineEnd,FindFields,FindFieldArg,ReadInitializer,OldStyleArgs>{BN}*("/**"|"//!"|"/*!"|"///")"<" {
- if (yyextra->current->bodyLine==-1)
- {
- yyextra->current->bodyLine=yyextra->yyLineNr;
- yyextra->current->bodyColumn = yyextra->yyColNr;
- }
- yyextra->docBlockContext = YY_START;
- yyextra->docBlockInBody = FALSE;
- yyextra->docBlockAutoBrief = ( yytext[yyleng-2]=='*' && Config_getBool(JAVADOC_AUTOBRIEF) ) ||
- ( yytext[yyleng-2]=='!' && Config_getBool(QT_AUTOBRIEF) );
+ if (yytext[yyleng-3]=='/')
+ {
+ startCommentBlock(yyscanner,TRUE);
+ BEGIN( DocLine );
+ }
+ else
+ {
+ startCommentBlock(yyscanner,FALSE);
+ BEGIN( DocBlock );
+ }
+ }
+<DefineEnd,FindFields,FindFieldArg,ReadInitializer,ReadInitializerPtr,OldStyleArgs>{BN}*("/**"|"//!"|"/*!"|"///")"<" {
+ if (yyextra->current->bodyLine==-1)
+ {
+ yyextra->current->bodyLine=yyextra->yyLineNr;
+ yyextra->current->bodyColumn = yyextra->yyColNr;
+ }
+ yyextra->docBlockContext = YY_START;
+ yyextra->docBlockInBody = FALSE;
+ yyextra->docBlockAutoBrief = ( yytext[yyleng-2]=='*' && Config_getBool(JAVADOC_AUTOBRIEF) ) ||
+ ( yytext[yyleng-2]=='!' && Config_getBool(QT_AUTOBRIEF) );
QCString indent;
indent.fill(' ',computeIndent(yytext,yyextra->column));
yyextra->docBlock=indent;
- lineCount(yyscanner);
-
- yyextra->docBlockTerm = 0;
- if (yytext[yyleng-3]=='/')
- {
- startCommentBlock(yyscanner,TRUE);
- BEGIN( DocLine );
- }
- else
- {
- startCommentBlock(yyscanner,FALSE);
- BEGIN( DocBlock );
- }
- }
-
-<FindMembers,FindFields>("//"([!/]){B}*{CMD}"{")|("/*"([!*]){B}*{CMD}"{") {
- //handleGroupStartCommand(yyextra->current->name);
+ lineCount(yyscanner);
+
+ yyextra->docBlockTerm = 0;
+ if (yytext[yyleng-3]=='/')
+ {
+ startCommentBlock(yyscanner,TRUE);
+ BEGIN( DocLine );
+ }
+ else
+ {
+ startCommentBlock(yyscanner,FALSE);
+ BEGIN( DocBlock );
+ }
+ }
+
+<FindMembers,FindFields>("//"([!/]){B}*{CMD}"{")|("/*"([!*]){B}*{CMD}"{") {
+ //handleGroupStartCommand(yyextra->current->name);
if (yyextra->previous && yyextra->previous->section==Entry::GROUPDOC_SEC)
- {
- // link open command to the group defined in the yyextra->previous entry
- yyextra->commentScanner.open(yyextra->previous.get(),yyextra->yyFileName,yyextra->yyLineNr);
- }
- else
- {
- // link open command to the yyextra->current entry
- yyextra->commentScanner.open(yyextra->current.get(),yyextra->yyFileName,yyextra->yyLineNr);
- }
- //yyextra->current = tmp;
- initEntry(yyscanner);
- if (yytext[1]=='/')
- {
- if (yytext[2]=='!' || yytext[2]=='/')
- {
- yyextra->docBlockContext = YY_START;
- yyextra->docBlockInBody = FALSE;
- yyextra->docBlockAutoBrief = FALSE;
- yyextra->docBlock.resize(0);
- yyextra->docBlockTerm = 0;
- startCommentBlock(yyscanner,TRUE);
- BEGIN(DocLine);
- }
- else
- {
- yyextra->lastCContext=YY_START;
- BEGIN(SkipCxxComment);
- }
- }
- else
- {
- if (yytext[2]=='!' || yytext[2]=='*')
- {
- yyextra->docBlockContext = YY_START;
- yyextra->docBlockInBody = FALSE;
- yyextra->docBlock.resize(0);
- yyextra->docBlockAutoBrief = ( yytext[yyleng-2]=='*' && Config_getBool(JAVADOC_AUTOBRIEF) ) ||
- ( yytext[yyleng-2]=='!' && Config_getBool(QT_AUTOBRIEF) );
- yyextra->docBlockTerm = 0;
- startCommentBlock(yyscanner,FALSE);
- BEGIN(DocBlock);
- }
- else
- {
- yyextra->lastCContext=YY_START;
- BEGIN(SkipComment);
- }
- }
- }
-<FindMembers,FindFields,ReadInitializer>"//"([!/]){B}*{CMD}"}".*|"/*"([!*]){B}*{CMD}"}"[^*]*"*/" {
- bool insideEnum = YY_START==FindFields || (YY_START==ReadInitializer && yyextra->lastInitializerContext==FindFields); // see bug746226
- yyextra->commentScanner.close(yyextra->current.get(),yyextra->yyFileName,yyextra->yyLineNr,insideEnum);
- lineCount(yyscanner);
- }
-<FindMembers>"=" { // in PHP code this could also be due to "<?="
- yyextra->current->bodyLine = yyextra->yyLineNr;
- yyextra->current->bodyColumn = yyextra->yyColNr;
+ {
+ // link open command to the group defined in the yyextra->previous entry
+ yyextra->commentScanner.open(yyextra->previous.get(),yyextra->yyFileName,yyextra->yyLineNr);
+ }
+ else
+ {
+ // link open command to the yyextra->current entry
+ yyextra->commentScanner.open(yyextra->current.get(),yyextra->yyFileName,yyextra->yyLineNr);
+ }
+ //yyextra->current = tmp;
+ initEntry(yyscanner);
+ if (yytext[1]=='/')
+ {
+ if (yytext[2]=='!' || yytext[2]=='/')
+ {
+ yyextra->docBlockContext = YY_START;
+ yyextra->docBlockInBody = FALSE;
+ yyextra->docBlockAutoBrief = FALSE;
+ yyextra->docBlock.resize(0);
+ yyextra->docBlockTerm = 0;
+ startCommentBlock(yyscanner,TRUE);
+ BEGIN(DocLine);
+ }
+ else
+ {
+ yyextra->lastCContext=YY_START;
+ BEGIN(SkipCxxComment);
+ }
+ }
+ else
+ {
+ if (yytext[2]=='!' || yytext[2]=='*')
+ {
+ yyextra->docBlockContext = YY_START;
+ yyextra->docBlockInBody = FALSE;
+ yyextra->docBlock.resize(0);
+ yyextra->docBlockAutoBrief = ( yytext[yyleng-2]=='*' && Config_getBool(JAVADOC_AUTOBRIEF) ) ||
+ ( yytext[yyleng-2]=='!' && Config_getBool(QT_AUTOBRIEF) );
+ yyextra->docBlockTerm = 0;
+ startCommentBlock(yyscanner,FALSE);
+ BEGIN(DocBlock);
+ }
+ else
+ {
+ yyextra->lastCContext=YY_START;
+ BEGIN(SkipComment);
+ }
+ }
+ }
+<FindMembers,FindFields,ReadInitializer,ReadInitializerPtr>"//"([!/]){B}*{CMD}"}".*|"/*"([!*]){B}*{CMD}"}"[^*]*"*/" {
+ bool insideEnum = YY_START==FindFields || ((YY_START==ReadInitializer || YY_START==ReadInitializerPtr) && yyextra->lastInitializerContext==FindFields); // see bug746226
+ yyextra->commentScanner.close(yyextra->current.get(),yyextra->yyFileName,yyextra->yyLineNr,insideEnum);
+ lineCount(yyscanner);
+ }
+<FindMembers>"=>" {
+ if (!yyextra->insideCS) REJECT;
+ yyextra->current->bodyLine = yyextra->yyLineNr;
+ yyextra->current->bodyColumn = yyextra->yyColNr;
+ yyextra->current->initializer = yytext;
+ yyextra->lastInitializerContext = YY_START;
+ yyextra->initBracketCount=0;
+ yyextra->current->mtype = yyextra->mtype = Property;
+ yyextra->current->spec |= Entry::Gettable;
+ BEGIN(ReadInitializerPtr);
+ }
+<FindMembers>"=" { // in PHP code this could also be due to "<?="
+ yyextra->current->bodyLine = yyextra->yyLineNr;
+ yyextra->current->bodyColumn = yyextra->yyColNr;
yyextra->current->initializer = yytext;
- yyextra->lastInitializerContext = YY_START;
- yyextra->initBracketCount=0;
- BEGIN(ReadInitializer);
- }
-<UNOIDLAttributeBlock>{BN}*[gs]"et"{BN}+"raises"{BN}*"("{BN}*{SCOPENAME}{BN}*(","{BN}*{SCOPENAME}{BN}*)*")"{BN}*";" {
- lineCount(yyscanner);
- yyextra->current->exception += " ";
- yyextra->current->exception += removeRedundantWhiteSpace(yytext);
- }
-<UNOIDLAttributeBlock>"}" {
- yyextra->current->exception += " }";
- BEGIN(FindMembers);
- }
+ yyextra->lastInitializerContext = YY_START;
+ yyextra->initBracketCount=0;
+ BEGIN(ReadInitializer);
+ }
+<UNOIDLAttributeBlock>{BN}*[gs]"et"{BN}+"raises"{BN}*"("{BN}*{SCOPENAME}{BN}*(","{BN}*{SCOPENAME}{BN}*)*")"{BN}*";" {
+ lineCount(yyscanner);
+ yyextra->current->exception += " ";
+ yyextra->current->exception += removeRedundantWhiteSpace(yytext);
+ }
+<UNOIDLAttributeBlock>"}" {
+ yyextra->current->exception += " }";
+ BEGIN(FindMembers);
+ }
/* Read initializer rules */
-<ReadInitializer>"(" {
- yyextra->lastRoundContext=YY_START;
- yyextra->pCopyRoundGString=&yyextra->current->initializer;
- yyextra->roundCount=0;
- yyextra->current->initializer+=*yytext;
- BEGIN(GCopyRound);
- }
-<ReadInitializer>"[" {
+<ReadInitializer,ReadInitializerPtr>"(" {
+ yyextra->lastRoundContext=YY_START;
+ yyextra->pCopyRoundGString=&yyextra->current->initializer;
+ yyextra->roundCount=0;
+ yyextra->current->initializer+=*yytext;
+ BEGIN(GCopyRound);
+ }
+<ReadInitializer,ReadInitializerPtr>"[" {
if (!yyextra->insidePHP) REJECT;
yyextra->lastSquareContext=YY_START;
yyextra->pCopySquareGString=&yyextra->current->initializer;
yyextra->squareCount=0;
- yyextra->current->initializer+=*yytext;
+ yyextra->current->initializer+=*yytext;
BEGIN(GCopySquare);
}
-<ReadInitializer>"{" {
- yyextra->lastCurlyContext=YY_START;
- yyextra->pCopyCurlyGString=&yyextra->current->initializer;
- yyextra->curlyCount=0;
- yyextra->current->initializer+=*yytext;
- BEGIN(GCopyCurly);
- }
-<ReadInitializer>[;,] {
- //printf(">> initializer '%s' <<\n",yyextra->current->initializer.data());
+<ReadInitializer,ReadInitializerPtr>"{" {
+ yyextra->lastCurlyContext=YY_START;
+ yyextra->pCopyCurlyGString=&yyextra->current->initializer;
+ yyextra->curlyCount=0;
+ yyextra->current->initializer+=*yytext;
+ BEGIN(GCopyCurly);
+ }
+<ReadInitializer,ReadInitializerPtr>[;,] {
+ //printf(">> initializer '%s' <<\n",yyextra->current->initializer.data());
if (*yytext==';' && (yyextra->current_root->spec&Entry::Enum))
- {
- yyextra->current->fileName = yyextra->yyFileName;
- yyextra->current->startLine = yyextra->yyLineNr;
- yyextra->current->startColumn = yyextra->yyColNr;
- yyextra->current->args = yyextra->current->args.simplifyWhiteSpace();
- yyextra->current->name = yyextra->current->name.stripWhiteSpace();
- yyextra->current->section = Entry::VARIABLE_SEC;
- yyextra->current_root->moveToSubEntryAndRefresh(yyextra->current);
- initEntry(yyscanner);
- BEGIN(FindMembers);
- }
- else if (*yytext==';' || (yyextra->lastInitializerContext==FindFields && yyextra->initBracketCount==0)) // yyextra->initBracketCount==0 was added for bug 665778
- {
- unput(*yytext);
- BEGIN(yyextra->lastInitializerContext);
- }
- else if (*yytext==',' && yyextra->initBracketCount==0) // for "int a=0,b=0"
- {
- unput(*yytext);
- BEGIN(yyextra->lastInitializerContext);
- }
- else
- {
- yyextra->current->initializer+=*yytext;
- }
- }
-<ReadInitializer>{RAWBEGIN} { // C++11 raw string
+ {
+ yyextra->current->fileName = yyextra->yyFileName;
+ yyextra->current->startLine = yyextra->yyLineNr;
+ yyextra->current->startColumn = yyextra->yyColNr;
+ yyextra->current->args = yyextra->current->args.simplifyWhiteSpace();
+ yyextra->current->name = yyextra->current->name.stripWhiteSpace();
+ yyextra->current->section = Entry::VARIABLE_SEC;
+ yyextra->current_root->moveToSubEntryAndRefresh(yyextra->current);
+ initEntry(yyscanner);
+ BEGIN(FindMembers);
+ }
+ else if (*yytext==';' || (yyextra->lastInitializerContext==FindFields && yyextra->initBracketCount==0)) // yyextra->initBracketCount==0 was added for bug 665778
+ {
+ unput(*yytext);
+ if (YY_START == ReadInitializerPtr) yyextra->current->initializer.resize(0);
+ BEGIN(yyextra->lastInitializerContext);
+ }
+ else if (*yytext==',' && yyextra->initBracketCount==0) // for "int a=0,b=0"
+ {
+ unput(*yytext);
+ if (YY_START == ReadInitializerPtr) yyextra->current->initializer.resize(0);
+ BEGIN(yyextra->lastInitializerContext);
+ }
+ else
+ {
+ yyextra->current->initializer+=*yytext;
+ }
+ }
+<ReadInitializer,ReadInitializerPtr>{RAWBEGIN} { // C++11 raw string
if (!yyextra->insideCpp)
- {
+ {
REJECT;
}
else
@@ -2691,7 +2707,7 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
}
<RawString>{RAWEND} {
*yyextra->pCopyRawString+=yytext;
- yyextra->fullArgString+=yytext;
+ yyextra->fullArgString+=yytext;
QCString delimiter = yytext+1;
delimiter=delimiter.left(delimiter.length()-1);
if (delimiter==yyextra->delimiter)
@@ -2701,265 +2717,265 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
}
<RawString>[^)]+ {
*yyextra->pCopyRawString+=yytext;
- yyextra->fullArgString+=yytext;
+ yyextra->fullArgString+=yytext;
}
<RawString>. {
*yyextra->pCopyRawString+=yytext;
- yyextra->fullArgString+=yytext;
+ yyextra->fullArgString+=yytext;
}
<RawString>\n {
*yyextra->pCopyRawString+=yytext;
- yyextra->fullArgString+=yytext;
+ yyextra->fullArgString+=yytext;
lineCount(yyscanner);
}
-<ReadInitializer>\" {
- if (yyextra->insideIDL && yyextra->insideCppQuote)
- {
- BEGIN(EndCppQuote);
- }
- else
- {
+<ReadInitializer,ReadInitializerPtr>\" {
+ if (yyextra->insideIDL && yyextra->insideCppQuote)
+ {
+ BEGIN(EndCppQuote);
+ }
+ else
+ {
yyextra->lastStringContext=YY_START;
- yyextra->current->initializer+=yytext;
- yyextra->pCopyQuotedGString=&yyextra->current->initializer;
- BEGIN(CopyGString);
- }
- }
-<ReadInitializer>"->" {
- yyextra->current->initializer+=yytext;
- }
-<ReadInitializer>"<<" {
- yyextra->current->initializer+=yytext;
- }
-<ReadInitializer>">>" {
- yyextra->current->initializer+=yytext;
- }
-<ReadInitializer>[<\[{(] {
- yyextra->initBracketCount++;
- yyextra->current->initializer+=*yytext;
- }
-<ReadInitializer>[>\]})] {
- yyextra->initBracketCount--;
- yyextra->current->initializer+=*yytext;
- }
-<ReadInitializer>\' {
- if (yyextra->insidePHP)
- {
- yyextra->current->initializer+=yytext;
+ yyextra->current->initializer+=yytext;
+ yyextra->pCopyQuotedGString=&yyextra->current->initializer;
+ BEGIN(CopyGString);
+ }
+ }
+<ReadInitializer,ReadInitializerPtr>"->" {
+ yyextra->current->initializer+=yytext;
+ }
+<ReadInitializer,ReadInitializerPtr>"<<" {
+ yyextra->current->initializer+=yytext;
+ }
+<ReadInitializer,ReadInitializerPtr>">>" {
+ yyextra->current->initializer+=yytext;
+ }
+<ReadInitializer,ReadInitializerPtr>[<\[{(] {
+ yyextra->initBracketCount++;
+ yyextra->current->initializer+=*yytext;
+ }
+<ReadInitializer,ReadInitializerPtr>[>\]})] {
+ yyextra->initBracketCount--;
+ yyextra->current->initializer+=*yytext;
+ }
+<ReadInitializer,ReadInitializerPtr>\' {
+ if (yyextra->insidePHP)
+ {
+ yyextra->current->initializer+=yytext;
yyextra->pCopyQuotedGString = &yyextra->current->initializer;
yyextra->lastStringContext=YY_START;
- BEGIN(CopyPHPGString);
- }
- else
- {
- yyextra->current->initializer+=yytext;
- }
- }
-<ReadInitializer>{CHARLIT} {
- if (yyextra->insidePHP)
- {
- REJECT;
- }
- else
- {
- yyextra->current->initializer+=yytext;
- }
- }
-<ReadInitializer>\n {
- yyextra->current->initializer+=*yytext;
+ BEGIN(CopyPHPGString);
+ }
+ else
+ {
+ yyextra->current->initializer+=yytext;
+ }
+ }
+<ReadInitializer,ReadInitializerPtr>{CHARLIT} {
+ if (yyextra->insidePHP)
+ {
+ REJECT;
+ }
+ else
+ {
+ yyextra->current->initializer+=yytext;
+ }
+ }
+<ReadInitializer,ReadInitializerPtr>\n {
+ yyextra->current->initializer+=*yytext;
lineCount(yyscanner);
- }
-<ReadInitializer>"@\"" {
- //printf("yyextra->insideCS=%d\n",yyextra->insideCS);
- yyextra->current->initializer+=yytext;
- if (!yyextra->insideCS && !yyextra->insideObjC)
- {
- REJECT;
- }
- else
- {
- // C#/ObjC verbatim string
- yyextra->lastSkipVerbStringContext=YY_START;
- yyextra->pSkipVerbString=&yyextra->current->initializer;
- BEGIN(SkipVerbString);
- }
- }
-<SkipVerbString>[^\n"]+ {
- *yyextra->pSkipVerbString+=yytext;
- }
-<SkipVerbString>"\"\"" { // quote escape
- *yyextra->pSkipVerbString+=yytext;
- }
-<SkipVerbString>"\"" {
- *yyextra->pSkipVerbString+=*yytext;
- BEGIN(yyextra->lastSkipVerbStringContext);
- }
-<SkipVerbString>\n {
- *yyextra->pSkipVerbString+=*yytext;
+ }
+<ReadInitializer,ReadInitializerPtr>"@\"" {
+ //printf("yyextra->insideCS=%d\n",yyextra->insideCS);
+ yyextra->current->initializer+=yytext;
+ if (!yyextra->insideCS && !yyextra->insideObjC)
+ {
+ REJECT;
+ }
+ else
+ {
+ // C#/ObjC verbatim string
+ yyextra->lastSkipVerbStringContext=YY_START;
+ yyextra->pSkipVerbString=&yyextra->current->initializer;
+ BEGIN(SkipVerbString);
+ }
+ }
+<SkipVerbString>[^\n"]+ {
+ *yyextra->pSkipVerbString+=yytext;
+ }
+<SkipVerbString>"\"\"" { // quote escape
+ *yyextra->pSkipVerbString+=yytext;
+ }
+<SkipVerbString>"\"" {
+ *yyextra->pSkipVerbString+=*yytext;
+ BEGIN(yyextra->lastSkipVerbStringContext);
+ }
+<SkipVerbString>\n {
+ *yyextra->pSkipVerbString+=*yytext;
lineCount(yyscanner);
- }
-<SkipVerbString>. {
- *yyextra->pSkipVerbString+=*yytext;
- }
-<ReadInitializer>"?>" {
- if (yyextra->insidePHP)
- BEGIN( FindMembersPHP );
- else
- yyextra->current->initializer+=yytext;
- }
-<ReadInitializer>. {
- yyextra->current->initializer+=*yytext;
- }
+ }
+<SkipVerbString>. {
+ *yyextra->pSkipVerbString+=*yytext;
+ }
+<ReadInitializer,ReadInitializerPtr>"?>" {
+ if (yyextra->insidePHP)
+ BEGIN( FindMembersPHP );
+ else
+ yyextra->current->initializer+=yytext;
+ }
+<ReadInitializer,ReadInitializerPtr>. {
+ yyextra->current->initializer+=*yytext;
+ }
/* generic quoted string copy rules */
-<CopyString,CopyPHPString>\\. {
- *yyextra->pCopyQuotedString+=yytext;
- }
-<CopyString>\" {
- *yyextra->pCopyQuotedString+=*yytext;
- BEGIN( yyextra->lastStringContext );
- }
-<CopyPHPString>\' {
- *yyextra->pCopyQuotedString+=*yytext;
- BEGIN( yyextra->lastStringContext );
- }
+<CopyString,CopyPHPString>\\. {
+ *yyextra->pCopyQuotedString+=yytext;
+ }
+<CopyString>\" {
+ *yyextra->pCopyQuotedString+=*yytext;
+ BEGIN( yyextra->lastStringContext );
+ }
+<CopyPHPString>\' {
+ *yyextra->pCopyQuotedString+=*yytext;
+ BEGIN( yyextra->lastStringContext );
+ }
<CopyString,CopyPHPString>"/*"|"*/"|"//" {
- *yyextra->pCopyQuotedString+=yytext;
- }
-<CopyString,CopyPHPString>\n {
- *yyextra->pCopyQuotedString+=*yytext;
+ *yyextra->pCopyQuotedString+=yytext;
+ }
+<CopyString,CopyPHPString>\n {
+ *yyextra->pCopyQuotedString+=*yytext;
lineCount(yyscanner);
- }
-<CopyString,CopyPHPString>. {
- *yyextra->pCopyQuotedString+=*yytext;
- }
+ }
+<CopyString,CopyPHPString>. {
+ *yyextra->pCopyQuotedString+=*yytext;
+ }
/* generic quoted growable string copy rules */
-<CopyGString,CopyPHPGString>\\. {
- *yyextra->pCopyQuotedGString+=yytext;
- }
-<CopyGString>\" {
- *yyextra->pCopyQuotedGString+=*yytext;
- BEGIN( yyextra->lastStringContext );
- }
-<CopyPHPGString>\' {
- *yyextra->pCopyQuotedGString+=*yytext;
- BEGIN( yyextra->lastStringContext );
- }
-<CopyGString,CopyPHPGString>"<?php" { // we had an odd number of quotes.
- *yyextra->pCopyQuotedGString += yytext;
- BEGIN( yyextra->lastStringContext );
- }
+<CopyGString,CopyPHPGString>\\. {
+ *yyextra->pCopyQuotedGString+=yytext;
+ }
+<CopyGString>\" {
+ *yyextra->pCopyQuotedGString+=*yytext;
+ BEGIN( yyextra->lastStringContext );
+ }
+<CopyPHPGString>\' {
+ *yyextra->pCopyQuotedGString+=*yytext;
+ BEGIN( yyextra->lastStringContext );
+ }
+<CopyGString,CopyPHPGString>"<?php" { // we had an odd number of quotes.
+ *yyextra->pCopyQuotedGString += yytext;
+ BEGIN( yyextra->lastStringContext );
+ }
<CopyGString,CopyPHPGString>"/*"|"*/"|"//" {
- *yyextra->pCopyQuotedGString+=yytext;
- }
-<CopyGString,CopyPHPGString>\n {
- *yyextra->pCopyQuotedGString+=*yytext;
+ *yyextra->pCopyQuotedGString+=yytext;
+ }
+<CopyGString,CopyPHPGString>\n {
+ *yyextra->pCopyQuotedGString+=*yytext;
lineCount(yyscanner);
- }
-<CopyGString,CopyPHPGString>. {
- *yyextra->pCopyQuotedGString+=*yytext;
- }
+ }
+<CopyGString,CopyPHPGString>. {
+ *yyextra->pCopyQuotedGString+=*yytext;
+ }
/* generic round bracket list copy rules */
-<CopyRound>\" {
- *yyextra->pCopyRoundString+=*yytext;
- yyextra->pCopyQuotedString=yyextra->pCopyRoundString;
- yyextra->lastStringContext=YY_START;
- BEGIN(CopyString);
- }
-<CopyRound>"(" {
- *yyextra->pCopyRoundString+=*yytext;
- yyextra->roundCount++;
- }
-<CopyRound>")" {
- *yyextra->pCopyRoundString+=*yytext;
- if (--yyextra->roundCount<0)
- BEGIN(yyextra->lastRoundContext);
- }
-<CopyRound>\n {
+<CopyRound>\" {
+ *yyextra->pCopyRoundString+=*yytext;
+ yyextra->pCopyQuotedString=yyextra->pCopyRoundString;
+ yyextra->lastStringContext=YY_START;
+ BEGIN(CopyString);
+ }
+<CopyRound>"(" {
+ *yyextra->pCopyRoundString+=*yytext;
+ yyextra->roundCount++;
+ }
+<CopyRound>")" {
+ *yyextra->pCopyRoundString+=*yytext;
+ if (--yyextra->roundCount<0)
+ BEGIN(yyextra->lastRoundContext);
+ }
+<CopyRound>\n {
lineCount(yyscanner);
- *yyextra->pCopyRoundString+=*yytext;
- }
-<CopyRound>\' {
- if (yyextra->insidePHP)
- {
- yyextra->current->initializer+=yytext;
+ *yyextra->pCopyRoundString+=*yytext;
+ }
+<CopyRound>\' {
+ if (yyextra->insidePHP)
+ {
+ yyextra->current->initializer+=yytext;
yyextra->pCopyQuotedString = yyextra->pCopyRoundString;
yyextra->lastStringContext=YY_START;
- BEGIN(CopyPHPString);
- }
- else
- {
- *yyextra->pCopyRoundString+=yytext;
- }
- }
-<CopyRound>{CHARLIT} {
+ BEGIN(CopyPHPString);
+ }
+ else
+ {
+ *yyextra->pCopyRoundString+=yytext;
+ }
+ }
+<CopyRound>{CHARLIT} {
if (yyextra->insidePHP)
- {
- REJECT;
- }
- else
- {
- *yyextra->pCopyRoundString+=yytext;
- }
- }
-<CopyRound>[^"'()\n,]+ {
- *yyextra->pCopyRoundString+=yytext;
- }
-<CopyRound>. {
- *yyextra->pCopyRoundString+=*yytext;
- }
+ {
+ REJECT;
+ }
+ else
+ {
+ *yyextra->pCopyRoundString+=yytext;
+ }
+ }
+<CopyRound>[^"'()\n,]+ {
+ *yyextra->pCopyRoundString+=yytext;
+ }
+<CopyRound>. {
+ *yyextra->pCopyRoundString+=*yytext;
+ }
/* generic round bracket list copy rules for growable strings */
-<GCopyRound>\" {
- *yyextra->pCopyRoundGString+=*yytext;
- yyextra->pCopyQuotedGString=yyextra->pCopyRoundGString;
- yyextra->lastStringContext=YY_START;
- BEGIN(CopyGString);
- }
-<GCopyRound>"(" {
- *yyextra->pCopyRoundGString+=*yytext;
- yyextra->roundCount++;
- }
-<GCopyRound>")" {
- *yyextra->pCopyRoundGString+=*yytext;
- if (--yyextra->roundCount<0)
- BEGIN(yyextra->lastRoundContext);
- }
-<GCopyRound>\n {
+<GCopyRound>\" {
+ *yyextra->pCopyRoundGString+=*yytext;
+ yyextra->pCopyQuotedGString=yyextra->pCopyRoundGString;
+ yyextra->lastStringContext=YY_START;
+ BEGIN(CopyGString);
+ }
+<GCopyRound>"(" {
+ *yyextra->pCopyRoundGString+=*yytext;
+ yyextra->roundCount++;
+ }
+<GCopyRound>")" {
+ *yyextra->pCopyRoundGString+=*yytext;
+ if (--yyextra->roundCount<0)
+ BEGIN(yyextra->lastRoundContext);
+ }
+<GCopyRound>\n {
lineCount(yyscanner);
- *yyextra->pCopyRoundGString+=*yytext;
- }
-<GCopyRound>\' {
- if (yyextra->insidePHP)
- {
- yyextra->current->initializer+=yytext;
+ *yyextra->pCopyRoundGString+=*yytext;
+ }
+<GCopyRound>\' {
+ if (yyextra->insidePHP)
+ {
+ yyextra->current->initializer+=yytext;
yyextra->pCopyQuotedGString = yyextra->pCopyRoundGString;
yyextra->lastStringContext=YY_START;
- BEGIN(CopyPHPGString);
- }
- else
- {
- *yyextra->pCopyRoundGString+=yytext;
- }
- }
-<GCopyRound>{CHARLIT} {
+ BEGIN(CopyPHPGString);
+ }
+ else
+ {
+ *yyextra->pCopyRoundGString+=yytext;
+ }
+ }
+<GCopyRound>{CHARLIT} {
if (yyextra->insidePHP)
- {
- REJECT;
- }
- else
- {
- *yyextra->pCopyRoundGString+=yytext;
- }
- }
-<GCopyRound>[^"'()\n\/,]+ {
- *yyextra->pCopyRoundGString+=yytext;
- }
-<GCopyRound>. {
- *yyextra->pCopyRoundGString+=*yytext;
- }
+ {
+ REJECT;
+ }
+ else
+ {
+ *yyextra->pCopyRoundGString+=yytext;
+ }
+ }
+<GCopyRound>[^"'()\n\/,]+ {
+ *yyextra->pCopyRoundGString+=yytext;
+ }
+<GCopyRound>. {
+ *yyextra->pCopyRoundGString+=*yytext;
+ }
/* generic square bracket list copy rules for growable strings, we should only enter here in case of php, left the test part as in GCopyRound to keep it compatible with the round bracket version */
<GCopySquare>\" {
@@ -2984,7 +3000,7 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
<GCopySquare>\' {
if (yyextra->insidePHP)
{
- yyextra->current->initializer+=yytext;
+ yyextra->current->initializer+=yytext;
yyextra->pCopyQuotedGString = yyextra->pCopySquareGString;
yyextra->lastStringContext=YY_START;
BEGIN(CopyPHPGString);
@@ -2994,14 +3010,14 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
*yyextra->pCopySquareGString+=yytext;
}
}
-<GCopySquare>{CHARLIT} {
+<GCopySquare>{CHARLIT} {
if (yyextra->insidePHP)
{
REJECT;
}
else
{
- *yyextra->pCopySquareGString+=yytext;
+ *yyextra->pCopySquareGString+=yytext;
}
}
<GCopySquare>[^"\[\]\n\/,]+ {
@@ -3012,230 +3028,230 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
}
/* generic curly bracket list copy rules */
-<CopyCurly>\" {
- *yyextra->pCopyCurlyString+=*yytext;
- yyextra->pCopyQuotedString=yyextra->pCopyCurlyString;
- yyextra->lastStringContext=YY_START;
- BEGIN(CopyString);
- }
-<CopyCurly>\' {
- *yyextra->pCopyCurlyString+=*yytext;
- if (yyextra->insidePHP)
- {
- yyextra->pCopyQuotedString=yyextra->pCopyCurlyString;
- yyextra->lastStringContext=YY_START;
- BEGIN(CopyPHPString);
- }
- }
-<CopyCurly>"{" {
- *yyextra->pCopyCurlyString+=*yytext;
- yyextra->curlyCount++;
- }
-<CopyCurly>"}" {
- *yyextra->pCopyCurlyString+=*yytext;
- if (--yyextra->curlyCount<0)
- BEGIN(yyextra->lastCurlyContext);
- }
-<CopyCurly>{CHARLIT} { if (yyextra->insidePHP)
- {
- REJECT;
- }
- else
- {
- *yyextra->pCopyCurlyString+=yytext;
- }
- }
-<CopyCurly>[^"'{}\/\n,]+ {
- *yyextra->pCopyCurlyString+=yytext;
- }
-<CopyCurly>"/" { *yyextra->pCopyCurlyString+=yytext; }
-<CopyCurly>\n {
+<CopyCurly>\" {
+ *yyextra->pCopyCurlyString+=*yytext;
+ yyextra->pCopyQuotedString=yyextra->pCopyCurlyString;
+ yyextra->lastStringContext=YY_START;
+ BEGIN(CopyString);
+ }
+<CopyCurly>\' {
+ *yyextra->pCopyCurlyString+=*yytext;
+ if (yyextra->insidePHP)
+ {
+ yyextra->pCopyQuotedString=yyextra->pCopyCurlyString;
+ yyextra->lastStringContext=YY_START;
+ BEGIN(CopyPHPString);
+ }
+ }
+<CopyCurly>"{" {
+ *yyextra->pCopyCurlyString+=*yytext;
+ yyextra->curlyCount++;
+ }
+<CopyCurly>"}" {
+ *yyextra->pCopyCurlyString+=*yytext;
+ if (--yyextra->curlyCount<0)
+ BEGIN(yyextra->lastCurlyContext);
+ }
+<CopyCurly>{CHARLIT} { if (yyextra->insidePHP)
+ {
+ REJECT;
+ }
+ else
+ {
+ *yyextra->pCopyCurlyString+=yytext;
+ }
+ }
+<CopyCurly>[^"'{}\/\n,]+ {
+ *yyextra->pCopyCurlyString+=yytext;
+ }
+<CopyCurly>"/" { *yyextra->pCopyCurlyString+=yytext; }
+<CopyCurly>\n {
lineCount(yyscanner);
- *yyextra->pCopyCurlyString+=*yytext;
- }
-<CopyCurly>. {
- *yyextra->pCopyCurlyString+=*yytext;
- }
+ *yyextra->pCopyCurlyString+=*yytext;
+ }
+<CopyCurly>. {
+ *yyextra->pCopyCurlyString+=*yytext;
+ }
/* generic curly bracket list copy rules for growable strings */
<GCopyCurly>^"#"{B}+[0-9]+{B}+"\""[^\"\n]+"\""{B}+"1"{B}*\n? { // start of included file marker
}
<GCopyCurly>^"#"{B}+[0-9]+{B}+"\""[^\"\n]+"\""{B}+"2"{B}*\n? { // end of included file marker
- QCString line = QCString(yytext);
- int s = line.find(' ');
- int e = line.find('"',s);
- yyextra->yyLineNr = line.mid(s,e-s).toInt();
- if (yytext[yyleng-1]=='\n')
- {
+ QCString line = QCString(yytext);
+ int s = line.find(' ');
+ int e = line.find('"',s);
+ yyextra->yyLineNr = line.mid(s,e-s).toInt();
+ if (yytext[yyleng-1]=='\n')
+ {
lineCount(yyscanner);
yyextra->column=0;
- }
- }
-<GCopyCurly>\" {
- *yyextra->pCopyCurlyGString+=*yytext;
- yyextra->pCopyQuotedGString=yyextra->pCopyCurlyGString;
- yyextra->lastStringContext=YY_START;
- BEGIN(CopyGString);
- }
-<GCopyCurly>\' {
- *yyextra->pCopyCurlyGString+=*yytext;
- if (yyextra->insidePHP)
- {
- yyextra->pCopyQuotedGString=yyextra->pCopyCurlyGString;
- yyextra->lastStringContext=YY_START;
- BEGIN(CopyPHPGString);
- }
- }
-<GCopyCurly>"{" {
- *yyextra->pCopyCurlyGString+=*yytext;
- yyextra->curlyCount++;
- }
-<GCopyCurly>"}" {
- *yyextra->pCopyCurlyGString+=*yytext;
- if (--yyextra->curlyCount<0)
- BEGIN(yyextra->lastCurlyContext);
- }
-<GCopyCurly>{CHARLIT} { if (yyextra->insidePHP)
- {
- REJECT;
- }
- else
- {
- *yyextra->pCopyCurlyGString+=yytext;
- }
- }
-<GCopyCurly>[^"'{}\/\n,]+ {
- *yyextra->pCopyCurlyGString+=yytext;
- }
-<GCopyCurly>[,]+ {
- *yyextra->pCopyCurlyGString+=yytext;
- }
-<GCopyCurly>"/" { *yyextra->pCopyCurlyGString+=yytext; }
-<GCopyCurly>\n {
+ }
+ }
+<GCopyCurly>\" {
+ *yyextra->pCopyCurlyGString+=*yytext;
+ yyextra->pCopyQuotedGString=yyextra->pCopyCurlyGString;
+ yyextra->lastStringContext=YY_START;
+ BEGIN(CopyGString);
+ }
+<GCopyCurly>\' {
+ *yyextra->pCopyCurlyGString+=*yytext;
+ if (yyextra->insidePHP)
+ {
+ yyextra->pCopyQuotedGString=yyextra->pCopyCurlyGString;
+ yyextra->lastStringContext=YY_START;
+ BEGIN(CopyPHPGString);
+ }
+ }
+<GCopyCurly>"{" {
+ *yyextra->pCopyCurlyGString+=*yytext;
+ yyextra->curlyCount++;
+ }
+<GCopyCurly>"}" {
+ *yyextra->pCopyCurlyGString+=*yytext;
+ if (--yyextra->curlyCount<0)
+ BEGIN(yyextra->lastCurlyContext);
+ }
+<GCopyCurly>{CHARLIT} { if (yyextra->insidePHP)
+ {
+ REJECT;
+ }
+ else
+ {
+ *yyextra->pCopyCurlyGString+=yytext;
+ }
+ }
+<GCopyCurly>[^"'{}\/\n,]+ {
+ *yyextra->pCopyCurlyGString+=yytext;
+ }
+<GCopyCurly>[,]+ {
+ *yyextra->pCopyCurlyGString+=yytext;
+ }
+<GCopyCurly>"/" { *yyextra->pCopyCurlyGString+=yytext; }
+<GCopyCurly>\n {
lineCount(yyscanner);
- *yyextra->pCopyCurlyGString+=*yytext;
- }
-<GCopyCurly>. {
- *yyextra->pCopyCurlyGString+=*yytext;
- }
+ *yyextra->pCopyCurlyGString+=*yytext;
+ }
+<GCopyCurly>. {
+ *yyextra->pCopyCurlyGString+=*yytext;
+ }
/* ---------------------- */
-<FindMembers>":" {
- if (yyextra->current->type.isEmpty() &&
+<FindMembers>":" {
+ if (yyextra->current->type.isEmpty() &&
yyextra->current->name=="enum") // see bug 69041, C++11 style anon enum: 'enum : unsigned int {...}'
- {
+ {
yyextra->current->section=Entry::ENUM_SEC;
- yyextra->current->name.resize(0);
+ yyextra->current->name.resize(0);
yyextra->current->args.resize(0);
- BEGIN(EnumBaseType);
- }
- else
+ BEGIN(EnumBaseType);
+ }
+ else
{
if (yyextra->current->type.isEmpty()) // anonymous padding field, e.g. "int :7;"
- {
- addType(yyscanner);
- yyextra->current->name.sprintf("__pad%d__",yyextra->padCount++);
- }
- BEGIN(BitFields);
- yyextra->current->bitfields+=":";
- }
- }
-<BitFields>. {
- yyextra->current->bitfields+=*yytext;
- }
-<EnumBaseType>. {
- yyextra->current->args+=*yytext;
- }
-<EnumBaseType>\n {
+ {
+ addType(yyscanner);
+ yyextra->current->name.sprintf("__pad%d__",yyextra->padCount++);
+ }
+ BEGIN(BitFields);
+ yyextra->current->bitfields+=":";
+ }
+ }
+<BitFields>. {
+ yyextra->current->bitfields+=*yytext;
+ }
+<EnumBaseType>. {
+ yyextra->current->args+=*yytext;
+ }
+<EnumBaseType>\n {
lineCount(yyscanner);
- yyextra->current->args+=' ';
- }
-<FindMembers>[;,] {
- QCString oldType = yyextra->current->type;
- if (yyextra->current->bodyLine==-1)
- {
- yyextra->current->bodyLine = yyextra->yyLineNr;
- yyextra->current->bodyColumn = yyextra->yyColNr;
- }
+ yyextra->current->args+=' ';
+ }
+<FindMembers>[;,] {
+ QCString oldType = yyextra->current->type;
+ if (yyextra->current->bodyLine==-1)
+ {
+ yyextra->current->bodyLine = yyextra->yyLineNr;
+ yyextra->current->bodyColumn = yyextra->yyColNr;
+ }
if ( yyextra->insidePHP && yyextra->current->type.left(3) == "var" )
{
yyextra->current->type = yyextra->current->type.mid(3);
}
- if (yyextra->isTypedef && yyextra->current->type.left(8)!="typedef ")
- {
- yyextra->current->type.prepend("typedef ");
- }
- bool stat = yyextra->current->stat;
- if (!yyextra->current->name.isEmpty() && yyextra->current->section!=Entry::ENUM_SEC)
- {
- yyextra->current->type=yyextra->current->type.simplifyWhiteSpace();
- yyextra->current->args=removeRedundantWhiteSpace(yyextra->current->args);
- yyextra->current->name=yyextra->current->name.stripWhiteSpace();
- if (yyextra->current->section==Entry::CLASS_SEC) // remove spec for "struct Bla bla;"
- {
- yyextra->current->spec = 0;
- }
- yyextra->current->section = Entry::VARIABLE_SEC ;
- yyextra->current->fileName = yyextra->yyFileName;
- yyextra->current->startLine = yyextra->yyBegLineNr;
- yyextra->current->startColumn = yyextra->yyBegColNr;
- yyextra->current_root->moveToSubEntryAndRefresh( yyextra->current ) ;
+ if (yyextra->isTypedef && yyextra->current->type.left(8)!="typedef ")
+ {
+ yyextra->current->type.prepend("typedef ");
+ }
+ bool stat = yyextra->current->stat;
+ if (!yyextra->current->name.isEmpty() && yyextra->current->section!=Entry::ENUM_SEC)
+ {
+ yyextra->current->type=yyextra->current->type.simplifyWhiteSpace();
+ yyextra->current->args=removeRedundantWhiteSpace(yyextra->current->args);
+ yyextra->current->name=yyextra->current->name.stripWhiteSpace();
+ if (yyextra->current->section==Entry::CLASS_SEC) // remove spec for "struct Bla bla;"
+ {
+ yyextra->current->spec = 0;
+ }
+ yyextra->current->section = Entry::VARIABLE_SEC ;
+ yyextra->current->fileName = yyextra->yyFileName;
+ yyextra->current->startLine = yyextra->yyBegLineNr;
+ yyextra->current->startColumn = yyextra->yyBegColNr;
+ yyextra->current_root->moveToSubEntryAndRefresh( yyextra->current ) ;
initEntry(yyscanner);
- }
- if ( *yytext == ',')
- {
- yyextra->current->stat = stat; // the static attribute holds for all variables
- yyextra->current->name.resize(0);
- yyextra->current->args.resize(0);
- yyextra->current->brief.resize(0);
- yyextra->current->doc.resize(0);
- yyextra->current->initializer.resize(0);
- yyextra->current->bitfields.resize(0);
- int i=oldType.length();
- while (i>0 && (oldType[i-1]=='*' || oldType[i-1]=='&' || oldType[i-1]==' ')) i--;
- yyextra->current->type = oldType.left(i);
- }
- else
- {
+ }
+ if ( *yytext == ',')
+ {
+ yyextra->current->stat = stat; // the static attribute holds for all variables
+ yyextra->current->name.resize(0);
+ yyextra->current->args.resize(0);
+ yyextra->current->brief.resize(0);
+ yyextra->current->doc.resize(0);
+ yyextra->current->initializer.resize(0);
+ yyextra->current->bitfields.resize(0);
+ int i=oldType.length();
+ while (i>0 && (oldType[i-1]=='*' || oldType[i-1]=='&' || oldType[i-1]==' ')) i--;
+ yyextra->current->type = oldType.left(i);
+ }
+ else
+ {
yyextra->mtype = Method;
yyextra->virt = Normal;
- yyextra->current->groups.clear();
- initEntry(yyscanner);
- }
- }
+ yyextra->current->groups.clear();
+ initEntry(yyscanner);
+ }
+ }
-<FindMembers>"[" {
+<FindMembers>"[" {
if (yyextra->insideSlice)
{
- yyextra->squareCount=1;
+ yyextra->squareCount=1;
yyextra->lastSquareContext = YY_START;
yyextra->current->metaData += "[";
BEGIN( SliceMetadata );
}
- else if (!yyextra->insideCS &&
- (yyextra->current->name.isEmpty() ||
- yyextra->current->name=="typedef"
- )
- ) // IDL function property
- {
- yyextra->squareCount=1;
- yyextra->lastSquareContext = YY_START;
- yyextra->idlAttr.resize(0);
- yyextra->idlProp.resize(0);
- yyextra->current->mtype = yyextra->mtype;
-
- if (Config_getBool(IDL_PROPERTY_SUPPORT) &&
- yyextra->current->mtype == Property)
- { // we are yyextra->inside the properties section of a dispinterface
- yyextra->odlProp = true;
- yyextra->current->spec |= Entry::Gettable;
- yyextra->current->spec |= Entry::Settable;
- }
-
- BEGIN( IDLAttribute );
- }
+ else if (!yyextra->insideCS &&
+ (yyextra->current->name.isEmpty() ||
+ yyextra->current->name=="typedef"
+ )
+ ) // IDL function property
+ {
+ yyextra->squareCount=1;
+ yyextra->lastSquareContext = YY_START;
+ yyextra->idlAttr.resize(0);
+ yyextra->idlProp.resize(0);
+ yyextra->current->mtype = yyextra->mtype;
+
+ if (Config_getBool(IDL_PROPERTY_SUPPORT) &&
+ yyextra->current->mtype == Property)
+ { // we are yyextra->inside the properties section of a dispinterface
+ yyextra->odlProp = true;
+ yyextra->current->spec |= Entry::Gettable;
+ yyextra->current->spec |= Entry::Settable;
+ }
+
+ BEGIN( IDLAttribute );
+ }
else if (yyextra->insideCS &&
yyextra->current->name.isEmpty())
{
@@ -3246,20 +3262,20 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
yyextra->current->args.resize(0);
BEGIN( SkipSquare );
}
- else
- {
- yyextra->current->args += yytext ;
- yyextra->squareCount=1;
- yyextra->externC=FALSE; // see bug759247
- BEGIN( Array ) ;
- }
- }
+ else
+ {
+ yyextra->current->args += yytext ;
+ yyextra->squareCount=1;
+ yyextra->externC=FALSE; // see bug759247
+ BEGIN( Array ) ;
+ }
+ }
<SliceMetadata>"[" { // Global metadata.
- yyextra->squareCount++;
+ yyextra->squareCount++;
yyextra->current->metaData += "[";
}
<SliceMetadata>{BN}* {
- lineCount(yyscanner);
+ lineCount(yyscanner);
}
<SliceMetadata>\"[^\"]*\" {
yyextra->current->metaData += yytext;
@@ -3288,294 +3304,294 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
BEGIN (yyextra->lastModifierContext);
}
}
-<IDLAttribute>"]" {
- // end of IDL function attribute
- if (--yyextra->squareCount<=0)
- {
- lineCount(yyscanner);
- if (yyextra->current->mtype == Property)
- BEGIN( IDLPropName );
- else
- BEGIN( yyextra->lastSquareContext );
- }
- }
-<IDLAttribute>"propput" {
+<IDLAttribute>"]" {
+ // end of IDL function attribute
+ if (--yyextra->squareCount<=0)
+ {
+ lineCount(yyscanner);
+ if (yyextra->current->mtype == Property)
+ BEGIN( IDLPropName );
+ else
+ BEGIN( yyextra->lastSquareContext );
+ }
+ }
+<IDLAttribute>"propput" {
if (Config_getBool(IDL_PROPERTY_SUPPORT))
- {
- yyextra->current->mtype = Property;
- }
- yyextra->current->spec |= Entry::Settable;
- }
-<IDLAttribute>"propget" {
+ {
+ yyextra->current->mtype = Property;
+ }
+ yyextra->current->spec |= Entry::Settable;
+ }
+<IDLAttribute>"propget" {
if (Config_getBool(IDL_PROPERTY_SUPPORT))
- {
- yyextra->current->mtype = Property;
- }
- yyextra->current->spec |= Entry::Gettable;
- }
+ {
+ yyextra->current->mtype = Property;
+ }
+ yyextra->current->spec |= Entry::Gettable;
+ }
<IDLAttribute>"property" { // UNO IDL property
- yyextra->current->spec |= Entry::Property;
- }
+ yyextra->current->spec |= Entry::Property;
+ }
<IDLAttribute>"attribute" { // UNO IDL attribute
- yyextra->current->spec |= Entry::Attribute;
- }
+ yyextra->current->spec |= Entry::Attribute;
+ }
<IDLAttribute>"optional" { // on UNO IDL interface/service/attribute/property
yyextra->current->spec |= Entry::Optional;
}
<IDLAttribute>"readonly" { // on UNO IDL attribute or property
- if (Config_getBool(IDL_PROPERTY_SUPPORT) && yyextra->odlProp)
- {
- yyextra->current->spec ^= Entry::Settable;
- }
- else
- {
- yyextra->current->spec |= Entry::Readonly;
- }
- }
+ if (Config_getBool(IDL_PROPERTY_SUPPORT) && yyextra->odlProp)
+ {
+ yyextra->current->spec ^= Entry::Settable;
+ }
+ else
+ {
+ yyextra->current->spec |= Entry::Readonly;
+ }
+ }
<IDLAttribute>"bound" { // on UNO IDL attribute or property
- yyextra->current->spec |= Entry::Bound;
- }
+ yyextra->current->spec |= Entry::Bound;
+ }
<IDLAttribute>"removable" { // on UNO IDL property
- yyextra->current->spec |= Entry::Removable;
- }
+ yyextra->current->spec |= Entry::Removable;
+ }
<IDLAttribute>"constrained" { // on UNO IDL property
- yyextra->current->spec |= Entry::Constrained;
- }
+ yyextra->current->spec |= Entry::Constrained;
+ }
<IDLAttribute>"transient" { // on UNO IDL property
- yyextra->current->spec |= Entry::Transient;
- }
+ yyextra->current->spec |= Entry::Transient;
+ }
<IDLAttribute>"maybevoid" { // on UNO IDL property
- yyextra->current->spec |= Entry::MaybeVoid;
- }
+ yyextra->current->spec |= Entry::MaybeVoid;
+ }
<IDLAttribute>"maybedefault" { // on UNO IDL property
- yyextra->current->spec |= Entry::MaybeDefault;
- }
+ yyextra->current->spec |= Entry::MaybeDefault;
+ }
<IDLAttribute>"maybeambiguous" { // on UNO IDL property
- yyextra->current->spec |= Entry::MaybeAmbiguous;
- }
-<IDLAttribute>. {
- }
-<IDLPropName>{BN}*{ID}{BN}* {
- // return type (probably HRESULT) - skip it
-
- if (yyextra->odlProp)
- { // property type
- yyextra->idlProp = yytext;
- }
- }
-<IDLPropName>{ID}{BN}*"(" {
- yyextra->current->name = yytext;
- yyextra->current->name = yyextra->current->name.left(yyextra->current->name.length()-1).stripWhiteSpace();
- yyextra->current->startLine = yyextra->yyLineNr;
- yyextra->current->startColumn = yyextra->yyColNr;
- BEGIN( IDLProp );
- }
-<IDLPropName>{BN}*"("{BN}*{ID}{BN}*")"{BN}* {
- if (yyextra->odlProp)
- {
- yyextra->idlProp += yytext;
- }
- }
-<IDLPropName>{ID}{BN}*/";" {
- if (yyextra->odlProp)
- {
- yyextra->current->name = yytext;
- yyextra->idlProp = yyextra->idlProp.stripWhiteSpace();
- yyextra->odlProp = false;
-
- BEGIN( IDLProp );
- }
- }
-<IDLProp>{BN}*"["[^\]]*"]"{BN}* { // attribute of a parameter
- yyextra->idlAttr = yytext;
- yyextra->idlAttr=yyextra->idlAttr.stripWhiteSpace();
- }
-<IDLProp>{ID} { // property type
- yyextra->idlProp = yytext;
- }
-<IDLProp>{BN}*{ID}{BN}*"," { // Rare: Another parameter ([propput] HRESULT Item(int index, [in] Type theRealProperty);)
- if (!yyextra->current->args)
- yyextra->current->args = "(";
- else
- yyextra->current->args += ", ";
- yyextra->current->args += yyextra->idlAttr;
- yyextra->current->args += " ";
- yyextra->current->args += yyextra->idlProp; // prop was actually type of extra parameter
- yyextra->current->args += " ";
- yyextra->current->args += yytext;
- yyextra->current->args = yyextra->current->args.left(yyextra->current->args.length() - 1); // strip comma
- yyextra->idlProp.resize(0);
- yyextra->idlAttr.resize(0);
- BEGIN( IDLProp );
- }
-<IDLProp>{BN}*{ID}{BN}*")"{BN}* {
- // the parameter name for the property - just skip.
- }
-<IDLProp>";" {
- yyextra->current->fileName = yyextra->yyFileName;
- yyextra->current->type = yyextra->idlProp;
- yyextra->current->args = yyextra->current->args.simplifyWhiteSpace();
- if (yyextra->current->args)
- yyextra->current->args += ")";
- yyextra->current->name = yyextra->current->name.stripWhiteSpace();
- yyextra->current->section = Entry::VARIABLE_SEC;
- yyextra->current_root->moveToSubEntryAndRefresh(yyextra->current);
- initEntry(yyscanner);
- BEGIN( FindMembers );
- }
-<IDLProp>. { // spaces, *, or other stuff
- //yyextra->idlProp+=yytext;
- }
-<Array>"]" { yyextra->current->args += *yytext ;
- if (--yyextra->squareCount<=0)
- BEGIN( FindMembers ) ;
- }
-<FuncFuncArray>"]" { yyextra->current->args += *yytext ;
- if (--yyextra->squareCount<=0)
- BEGIN( Function ) ;
- }
-<Array,FuncFuncArray>"[" { yyextra->current->args += *yytext ;
- yyextra->squareCount++;
- }
-<Array,FuncFuncArray>. { yyextra->current->args += *yytext ; }
-<SkipSquare>"[" { yyextra->squareCount++; }
-<SkipSquare>"]" {
- if (--yyextra->squareCount<=0)
- BEGIN( yyextra->lastSquareContext );
- }
-<SkipSquare>\" {
- yyextra->lastStringContext=YY_START;
- BEGIN( SkipString );
- }
+ yyextra->current->spec |= Entry::MaybeAmbiguous;
+ }
+<IDLAttribute>. {
+ }
+<IDLPropName>{BN}*{ID}{BN}* {
+ // return type (probably HRESULT) - skip it
+
+ if (yyextra->odlProp)
+ { // property type
+ yyextra->idlProp = yytext;
+ }
+ }
+<IDLPropName>{ID}{BN}*"(" {
+ yyextra->current->name = yytext;
+ yyextra->current->name = yyextra->current->name.left(yyextra->current->name.length()-1).stripWhiteSpace();
+ yyextra->current->startLine = yyextra->yyLineNr;
+ yyextra->current->startColumn = yyextra->yyColNr;
+ BEGIN( IDLProp );
+ }
+<IDLPropName>{BN}*"("{BN}*{ID}{BN}*")"{BN}* {
+ if (yyextra->odlProp)
+ {
+ yyextra->idlProp += yytext;
+ }
+ }
+<IDLPropName>{ID}{BN}*/";" {
+ if (yyextra->odlProp)
+ {
+ yyextra->current->name = yytext;
+ yyextra->idlProp = yyextra->idlProp.stripWhiteSpace();
+ yyextra->odlProp = false;
+
+ BEGIN( IDLProp );
+ }
+ }
+<IDLProp>{BN}*"["[^\]]*"]"{BN}* { // attribute of a parameter
+ yyextra->idlAttr = yytext;
+ yyextra->idlAttr=yyextra->idlAttr.stripWhiteSpace();
+ }
+<IDLProp>{ID} { // property type
+ yyextra->idlProp = yytext;
+ }
+<IDLProp>{BN}*{ID}{BN}*"," { // Rare: Another parameter ([propput] HRESULT Item(int index, [in] Type theRealProperty);)
+ if (!yyextra->current->args)
+ yyextra->current->args = "(";
+ else
+ yyextra->current->args += ", ";
+ yyextra->current->args += yyextra->idlAttr;
+ yyextra->current->args += " ";
+ yyextra->current->args += yyextra->idlProp; // prop was actually type of extra parameter
+ yyextra->current->args += " ";
+ yyextra->current->args += yytext;
+ yyextra->current->args = yyextra->current->args.left(yyextra->current->args.length() - 1); // strip comma
+ yyextra->idlProp.resize(0);
+ yyextra->idlAttr.resize(0);
+ BEGIN( IDLProp );
+ }
+<IDLProp>{BN}*{ID}{BN}*")"{BN}* {
+ // the parameter name for the property - just skip.
+ }
+<IDLProp>";" {
+ yyextra->current->fileName = yyextra->yyFileName;
+ yyextra->current->type = yyextra->idlProp;
+ yyextra->current->args = yyextra->current->args.simplifyWhiteSpace();
+ if (yyextra->current->args)
+ yyextra->current->args += ")";
+ yyextra->current->name = yyextra->current->name.stripWhiteSpace();
+ yyextra->current->section = Entry::VARIABLE_SEC;
+ yyextra->current_root->moveToSubEntryAndRefresh(yyextra->current);
+ initEntry(yyscanner);
+ BEGIN( FindMembers );
+ }
+<IDLProp>. { // spaces, *, or other stuff
+ //yyextra->idlProp+=yytext;
+ }
+<Array>"]" { yyextra->current->args += *yytext ;
+ if (--yyextra->squareCount<=0)
+ BEGIN( FindMembers ) ;
+ }
+<FuncFuncArray>"]" { yyextra->current->args += *yytext ;
+ if (--yyextra->squareCount<=0)
+ BEGIN( Function ) ;
+ }
+<Array,FuncFuncArray>"[" { yyextra->current->args += *yytext ;
+ yyextra->squareCount++;
+ }
+<Array,FuncFuncArray>. { yyextra->current->args += *yytext ; }
+<SkipSquare>"[" { yyextra->squareCount++; }
+<SkipSquare>"]" {
+ if (--yyextra->squareCount<=0)
+ BEGIN( yyextra->lastSquareContext );
+ }
+<SkipSquare>\" {
+ yyextra->lastStringContext=YY_START;
+ BEGIN( SkipString );
+ }
<SkipSquare>[^\n\[\]\"]+
-<FindMembers>"<" { addType(yyscanner);
- yyextra->current->type += yytext ;
- BEGIN( Sharp ) ;
- }
-<Sharp>">" { yyextra->current->type += *yytext ;
- if (--yyextra->sharpCount<=0)
- BEGIN( FindMembers ) ;
- }
-<Sharp>"<" { yyextra->current->type += *yytext ;
- yyextra->sharpCount++;
- }
-<Sharp>{BN}+ {
+<FindMembers>"<" { addType(yyscanner);
+ yyextra->current->type += yytext ;
+ BEGIN( Sharp ) ;
+ }
+<Sharp>">" { yyextra->current->type += *yytext ;
+ if (--yyextra->sharpCount<=0)
+ BEGIN( FindMembers ) ;
+ }
+<Sharp>"<" { yyextra->current->type += *yytext ;
+ yyextra->sharpCount++;
+ }
+<Sharp>{BN}+ {
yyextra->current->type += ' ';
- lineCount(yyscanner);
- }
-<Sharp>. { yyextra->current->type += *yytext ; }
-<FindFields>{ID} {
+ lineCount(yyscanner);
+ }
+<Sharp>. { yyextra->current->type += *yytext ; }
+<FindFields>{ID} {
if (yyextra->clangParser && (yyextra->insideCpp || yyextra->insideObjC))
{
yyextra->current->id = yyextra->clangParser->lookup(yyextra->yyLineNr,yytext);
}
- yyextra->current->bodyLine = yyextra->yyLineNr;
- yyextra->current->bodyColumn = yyextra->yyColNr;
- yyextra->current->name = yytext;
- }
-<FindFields>"(" {
- // Java enum initializer
- unput('(');
- yyextra->lastInitializerContext = YY_START;
- yyextra->initBracketCount=0;
+ yyextra->current->bodyLine = yyextra->yyLineNr;
+ yyextra->current->bodyColumn = yyextra->yyColNr;
+ yyextra->current->name = yytext;
+ }
+<FindFields>"(" {
+ // Java enum initializer
+ unput('(');
+ yyextra->lastInitializerContext = YY_START;
+ yyextra->initBracketCount=0;
yyextra->current->initializer = "=";
- BEGIN(ReadInitializer);
- }
-<FindFields>"=" {
- yyextra->lastInitializerContext = YY_START;
- yyextra->initBracketCount=0;
+ BEGIN(ReadInitializer);
+ }
+<FindFields>"=" {
+ yyextra->lastInitializerContext = YY_START;
+ yyextra->initBracketCount=0;
yyextra->current->initializer = yytext;
- BEGIN(ReadInitializer);
- }
+ BEGIN(ReadInitializer);
+ }
<FindFields>";" {
- if (yyextra->insideJava) // yyextra->last enum field in Java class
- {
- if (!yyextra->current->name.isEmpty())
- {
- yyextra->current->fileName = yyextra->yyFileName;
- yyextra->current->startLine = yyextra->yyLineNr;
- yyextra->current->startColumn = yyextra->yyColNr;
- if (!(yyextra->current_root->spec&Entry::Enum))
- {
- yyextra->current->type = "@"; // enum marker
- }
- yyextra->current->args = yyextra->current->args.simplifyWhiteSpace();
- yyextra->current->name = yyextra->current->name.stripWhiteSpace();
- yyextra->current->section = Entry::VARIABLE_SEC;
- yyextra->current_root->moveToSubEntryAndRefresh(yyextra->current);
- initEntry(yyscanner);
- }
-
- BEGIN( FindMembers );
- }
- else
- {
- REJECT;
- }
- }
-<SkipRemainder>\n {
+ if (yyextra->insideJava) // yyextra->last enum field in Java class
+ {
+ if (!yyextra->current->name.isEmpty())
+ {
+ yyextra->current->fileName = yyextra->yyFileName;
+ yyextra->current->startLine = yyextra->yyLineNr;
+ yyextra->current->startColumn = yyextra->yyColNr;
+ if (!(yyextra->current_root->spec&Entry::Enum))
+ {
+ yyextra->current->type = "@"; // enum marker
+ }
+ yyextra->current->args = yyextra->current->args.simplifyWhiteSpace();
+ yyextra->current->name = yyextra->current->name.stripWhiteSpace();
+ yyextra->current->section = Entry::VARIABLE_SEC;
+ yyextra->current_root->moveToSubEntryAndRefresh(yyextra->current);
+ initEntry(yyscanner);
+ }
+
+ BEGIN( FindMembers );
+ }
+ else
+ {
+ REJECT;
+ }
+ }
+<SkipRemainder>\n {
lineCount(yyscanner);
}
<SkipRemainder>[^\n]*
-<FindFields>"," {
- //printf("adding '%s' '%s' '%s' to enum '%s' (mGrpId=%d)\n",
- // yyextra->current->type.data(), yyextra->current->name.data(),
- // yyextra->current->args.data(), yyextra->current_root->name.data(),yyextra->current->mGrpId);
- if (!yyextra->current->name.isEmpty())
- {
- yyextra->current->fileName = yyextra->yyFileName;
- yyextra->current->startLine = yyextra->yyLineNr;
- yyextra->current->startColumn = yyextra->yyColNr;
- if (!(yyextra->current_root->spec&Entry::Enum))
- {
- yyextra->current->type = "@"; // enum marker
- }
- yyextra->current->args = yyextra->current->args.simplifyWhiteSpace();
- yyextra->current->name = yyextra->current->name.stripWhiteSpace();
- yyextra->current->section = Entry::VARIABLE_SEC;
- // add to the scope of the enum
- if (!yyextra->insideCS && !yyextra->insideJava &&
- !(yyextra->current_root->spec&Entry::Strong))
+<FindFields>"," {
+ //printf("adding '%s' '%s' '%s' to enum '%s' (mGrpId=%d)\n",
+ // yyextra->current->type.data(), yyextra->current->name.data(),
+ // yyextra->current->args.data(), yyextra->current_root->name.data(),yyextra->current->mGrpId);
+ if (!yyextra->current->name.isEmpty())
+ {
+ yyextra->current->fileName = yyextra->yyFileName;
+ yyextra->current->startLine = yyextra->yyLineNr;
+ yyextra->current->startColumn = yyextra->yyColNr;
+ if (!(yyextra->current_root->spec&Entry::Enum))
+ {
+ yyextra->current->type = "@"; // enum marker
+ }
+ yyextra->current->args = yyextra->current->args.simplifyWhiteSpace();
+ yyextra->current->name = yyextra->current->name.stripWhiteSpace();
+ yyextra->current->section = Entry::VARIABLE_SEC;
+ // add to the scope of the enum
+ if (!yyextra->insideCS && !yyextra->insideJava &&
+ !(yyextra->current_root->spec&Entry::Strong))
// for C# and Java 1.5+ enum values always have to be explicitly qualified,
// same for C++11 style enums (enum class Name {})
- {
- // add to the scope surrounding the enum (copy!)
+ {
+ // add to the scope surrounding the enum (copy!)
// we cannot during it directly as that would invalidate the iterator in parseCompounds.
//printf("*** adding outer scope entry for %s\n",yyextra->current->name.data());
yyextra->outerScopeEntries.emplace_back(yyextra->current_root->parent(), std::make_shared<Entry>(*yyextra->current));
- }
- yyextra->current_root->moveToSubEntryAndRefresh(yyextra->current);
- initEntry(yyscanner);
- }
- else // probably a redundant ,
- {
- yyextra->current->reset();
- initEntry(yyscanner);
- }
- }
-<FindFields>"[" { // attribute list in IDL
- yyextra->squareCount=1;
- yyextra->lastSquareContext = YY_START;
- BEGIN(SkipSquare);
- }
+ }
+ yyextra->current_root->moveToSubEntryAndRefresh(yyextra->current);
+ initEntry(yyscanner);
+ }
+ else // probably a redundant ,
+ {
+ yyextra->current->reset();
+ initEntry(yyscanner);
+ }
+ }
+<FindFields>"[" { // attribute list in IDL
+ yyextra->squareCount=1;
+ yyextra->lastSquareContext = YY_START;
+ BEGIN(SkipSquare);
+ }
/*
-<FindFieldArg>"," { unput(*yytext); BEGIN(FindFields); }
+<FindFieldArg>"," { unput(*yytext); BEGIN(FindFields); }
*/
-<ReadBody,ReadNSBody,ReadBodyIntf>[^\r\n\#{}"@'/<]* { yyextra->current->program += yytext ; }
-<ReadBody,ReadNSBody,ReadBodyIntf>"//".* { yyextra->current->program += yytext ; }
-<ReadBody,ReadNSBody,ReadBodyIntf>"#".* { if (!yyextra->insidePHP)
- REJECT;
- // append PHP comment.
- yyextra->current->program += yytext ;
- }
-<ReadBody,ReadNSBody,ReadBodyIntf>@\" { yyextra->current->program += yytext ;
+<ReadBody,ReadNSBody,ReadBodyIntf>[^\r\n\#{}"@'/<]* { yyextra->current->program += yytext ; }
+<ReadBody,ReadNSBody,ReadBodyIntf>"//".* { yyextra->current->program += yytext ; }
+<ReadBody,ReadNSBody,ReadBodyIntf>"#".* { if (!yyextra->insidePHP)
+ REJECT;
+ // append PHP comment.
+ yyextra->current->program += yytext ;
+ }
+<ReadBody,ReadNSBody,ReadBodyIntf>@\" { yyextra->current->program += yytext ;
yyextra->pSkipVerbString = &yyextra->current->program;
yyextra->lastSkipVerbStringContext=YY_START;
BEGIN( SkipVerbString );
- }
-<ReadBody,ReadNSBody,ReadBodyIntf>"<<<" { if (yyextra->insidePHP)
+ }
+<ReadBody,ReadNSBody,ReadBodyIntf>"<<<" { if (yyextra->insidePHP)
{
- yyextra->current->program += yytext ;
+ yyextra->current->program += yytext ;
yyextra->pCopyHereDocGString = &yyextra->current->program;
yyextra->lastHereDocContext=YY_START;
BEGIN( CopyHereDoc );
@@ -3584,61 +3600,61 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
{
REJECT;
}
- }
-<ReadBody,ReadNSBody,ReadBodyIntf>\" { yyextra->current->program += yytext ;
+ }
+<ReadBody,ReadNSBody,ReadBodyIntf>\" { yyextra->current->program += yytext ;
yyextra->pCopyQuotedGString = &yyextra->current->program;
yyextra->lastStringContext=YY_START;
BEGIN( CopyGString );
- }
-<ReadBody,ReadNSBody,ReadBodyIntf>"/*"{B}* { yyextra->current->program += yytext ;
- yyextra->lastContext = YY_START ;
- BEGIN( Comment ) ;
- }
-<ReadBody,ReadNSBody,ReadBodyIntf>"/*"{BL} { yyextra->current->program += yytext ;
- ++yyextra->yyLineNr ;
- yyextra->lastContext = YY_START ;
- BEGIN( Comment ) ;
- }
-<ReadBody,ReadNSBody,ReadBodyIntf>"'" {
- if (!yyextra->insidePHP)
- {
- yyextra->current->program += yytext;
- }
- else
- { // begin of single quoted string
- yyextra->current->program += yytext;
+ }
+<ReadBody,ReadNSBody,ReadBodyIntf>"/*"{B}* { yyextra->current->program += yytext ;
+ yyextra->lastContext = YY_START ;
+ BEGIN( Comment ) ;
+ }
+<ReadBody,ReadNSBody,ReadBodyIntf>"/*"{BL} { yyextra->current->program += yytext ;
+ ++yyextra->yyLineNr ;
+ yyextra->lastContext = YY_START ;
+ BEGIN( Comment ) ;
+ }
+<ReadBody,ReadNSBody,ReadBodyIntf>"'" {
+ if (!yyextra->insidePHP)
+ {
+ yyextra->current->program += yytext;
+ }
+ else
+ { // begin of single quoted string
+ yyextra->current->program += yytext;
yyextra->pCopyQuotedGString = &yyextra->current->program;
yyextra->lastStringContext=YY_START;
- BEGIN(CopyPHPGString);
- }
- }
-<ReadBody,ReadNSBody,ReadBodyIntf>{CHARLIT} {
- if (yyextra->insidePHP)
- {
- REJECT; // for PHP code single quotes
- // are used for strings of arbitrary length
- }
- else
- {
- yyextra->current->program += yytext;
- }
+ BEGIN(CopyPHPGString);
+ }
+ }
+<ReadBody,ReadNSBody,ReadBodyIntf>{CHARLIT} {
+ if (yyextra->insidePHP)
+ {
+ REJECT; // for PHP code single quotes
+ // are used for strings of arbitrary length
+ }
+ else
+ {
+ yyextra->current->program += yytext;
+ }
}
<ReadBody,ReadNSBody,ReadBodyIntf>"{" { yyextra->current->program += yytext ;
- ++yyextra->curlyCount ;
- }
-<ReadBodyIntf>"}" {
- yyextra->current->program += yytext ;
- --yyextra->curlyCount ;
- }
-<ReadBody,ReadNSBody>"}" { //err("ReadBody count=%d\n",yyextra->curlyCount);
- if ( yyextra->curlyCount>0 )
- {
- yyextra->current->program += yytext ;
- --yyextra->curlyCount ;
- }
- else
- {
- yyextra->current->endBodyLine = yyextra->yyLineNr;
+ ++yyextra->curlyCount ;
+ }
+<ReadBodyIntf>"}" {
+ yyextra->current->program += yytext ;
+ --yyextra->curlyCount ;
+ }
+<ReadBody,ReadNSBody>"}" { //err("ReadBody count=%d\n",yyextra->curlyCount);
+ if ( yyextra->curlyCount>0 )
+ {
+ yyextra->current->program += yytext ;
+ --yyextra->curlyCount ;
+ }
+ else
+ {
+ yyextra->current->endBodyLine = yyextra->yyLineNr;
std::shared_ptr<Entry> original_root = yyextra->current_root; // save root this namespace is in
if (yyextra->current->section == Entry::NAMESPACE_SEC && yyextra->current->type == "namespace")
{
@@ -3677,817 +3693,817 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
yyextra->current->briefLine = briefLine;
yyextra->current->briefFile = briefFile;
}
- QCString &cn = yyextra->current->name;
- QCString rn = yyextra->current_root->name.copy();
- //printf("cn='%s' rn='%s' yyextra->isTypedef=%d\n",cn.data(),rn.data(),yyextra->isTypedef);
- if (!cn.isEmpty() && !rn.isEmpty())
- {
- prependScope(yyscanner);
- }
- if (yyextra->isTypedef && cn.isEmpty())
- {
- //printf("Typedef Name\n");
- BEGIN( TypedefName );
- }
- else
- {
- if ((yyextra->current->section == Entry::ENUM_SEC) || (yyextra->current->spec&Entry::Enum))
- {
- yyextra->current->program+=','; // add field terminator
- }
- // add compound definition to the tree
- yyextra->current->args=removeRedundantWhiteSpace(yyextra->current->args);
- // was: yyextra->current->args.simplifyWhiteSpace();
- yyextra->current->type = yyextra->current->type.simplifyWhiteSpace();
- yyextra->current->name = yyextra->current->name.stripWhiteSpace();
- //printf("adding '%s' '%s' '%s' brief=%s yyextra->insideObjC=%d %x\n",yyextra->current->type.data(),yyextra->current->name.data(),yyextra->current->args.data(),yyextra->current->brief.data(),yyextra->insideObjC,yyextra->current->section);
- if (yyextra->insideObjC &&
- ((yyextra->current->spec&Entry::Interface) || (yyextra->current->spec==Entry::Category))
- ) // method definition follows
- {
- BEGIN( ReadBodyIntf ) ;
- }
- else
- {
- yyextra->memspecEntry = yyextra->current;
- yyextra->current_root->moveToSubEntryAndKeep( yyextra->current ) ;
- yyextra->current = std::make_shared<Entry>(*yyextra->current);
- if (yyextra->current->section==Entry::NAMESPACE_SEC ||
- (yyextra->current->spec==Entry::Interface) ||
- yyextra->insideJava || yyextra->insidePHP || yyextra->insideCS || yyextra->insideD || yyextra->insideJS ||
+ QCString &cn = yyextra->current->name;
+ QCString rn = yyextra->current_root->name.copy();
+ //printf("cn='%s' rn='%s' yyextra->isTypedef=%d\n",cn.data(),rn.data(),yyextra->isTypedef);
+ if (!cn.isEmpty() && !rn.isEmpty())
+ {
+ prependScope(yyscanner);
+ }
+ if (yyextra->isTypedef && cn.isEmpty())
+ {
+ //printf("Typedef Name\n");
+ BEGIN( TypedefName );
+ }
+ else
+ {
+ if ((yyextra->current->section == Entry::ENUM_SEC) || (yyextra->current->spec&Entry::Enum))
+ {
+ yyextra->current->program+=','; // add field terminator
+ }
+ // add compound definition to the tree
+ yyextra->current->args=removeRedundantWhiteSpace(yyextra->current->args);
+ // was: yyextra->current->args.simplifyWhiteSpace();
+ yyextra->current->type = yyextra->current->type.simplifyWhiteSpace();
+ yyextra->current->name = yyextra->current->name.stripWhiteSpace();
+ //printf("adding '%s' '%s' '%s' brief=%s yyextra->insideObjC=%d %x\n",yyextra->current->type.data(),yyextra->current->name.data(),yyextra->current->args.data(),yyextra->current->brief.data(),yyextra->insideObjC,yyextra->current->section);
+ if (yyextra->insideObjC &&
+ ((yyextra->current->spec&Entry::Interface) || (yyextra->current->spec==Entry::Category))
+ ) // method definition follows
+ {
+ BEGIN( ReadBodyIntf ) ;
+ }
+ else
+ {
+ yyextra->memspecEntry = yyextra->current;
+ yyextra->current_root->moveToSubEntryAndKeep( yyextra->current ) ;
+ yyextra->current = std::make_shared<Entry>(*yyextra->current);
+ if (yyextra->current->section==Entry::NAMESPACE_SEC ||
+ (yyextra->current->spec==Entry::Interface) ||
+ yyextra->insideJava || yyextra->insidePHP || yyextra->insideCS || yyextra->insideD || yyextra->insideJS ||
yyextra->insideSlice
- )
- { // namespaces and interfaces and java classes ends with a closing bracket without semicolon
+ )
+ { // namespaces and interfaces and java classes ends with a closing bracket without semicolon
yyextra->current->reset();
yyextra->current_root = original_root; // restore scope from before namespace descent
- initEntry(yyscanner);
- yyextra->memspecEntry.reset();
- BEGIN( FindMembers ) ;
- }
- else
- {
+ initEntry(yyscanner);
+ yyextra->memspecEntry.reset();
+ BEGIN( FindMembers ) ;
+ }
+ else
+ {
static QRegExp re("@[0-9]+$");
- if (!yyextra->isTypedef && yyextra->memspecEntry &&
+ if (!yyextra->isTypedef && yyextra->memspecEntry &&
yyextra->memspecEntry->name.find(re)==-1) // not typedef or anonymous type (see bug691071)
- {
- // enabled the next two lines for bug 623424
- yyextra->current->doc.resize(0);
- yyextra->current->brief.resize(0);
- }
- BEGIN( MemberSpec ) ;
- }
- }
- }
- }
- }
-<ReadBody>"}"{BN}+"typedef"{BN}+ { //err("ReadBody count=%d\n",yyextra->curlyCount);
- lineCount(yyscanner);
- if ( yyextra->curlyCount>0 )
- {
- yyextra->current->program += yytext ;
- --yyextra->curlyCount ;
- }
- else
- {
- yyextra->isTypedef = TRUE;
- yyextra->current->endBodyLine = yyextra->yyLineNr;
- QCString &cn = yyextra->current->name;
- QCString rn = yyextra->current_root->name.copy();
- if (!cn.isEmpty() && !rn.isEmpty())
- {
- prependScope(yyscanner);
- }
- BEGIN( TypedefName );
- }
- }
-<TypedefName>("const"|"volatile"){BN} { // late "const" or "volatile" keyword
- lineCount(yyscanner);
- yyextra->current->type.prepend(yytext);
- }
-<TypedefName>{ID} {
- if ((yyextra->current->section == Entry::ENUM_SEC) || (yyextra->current->spec&Entry::Enum))
- {
- yyextra->current->program+=","; // add field terminator
- }
- yyextra->current->name=yytext;
- prependScope(yyscanner);
- yyextra->current->args = yyextra->current->args.simplifyWhiteSpace();
- yyextra->current->type = yyextra->current->type.simplifyWhiteSpace();
- //printf("Adding compound %s %s %s\n",yyextra->current->type.data(),yyextra->current->name.data(),yyextra->current->args.data());
- if (!yyextra->firstTypedefEntry)
- {
- yyextra->firstTypedefEntry = yyextra->current;
- }
- yyextra->current_root->moveToSubEntryAndRefresh( yyextra->current ) ;
- initEntry(yyscanner);
- yyextra->isTypedef=TRUE; // to undo reset by initEntry(yyscanner)
- BEGIN(MemberSpecSkip);
- }
-<TypedefName>";" { /* typedef of anonymous type */
- yyextra->current->name.sprintf("@%d",yyextra->anonCount++);
- if ((yyextra->current->section == Entry::ENUM_SEC) || (yyextra->current->spec&Entry::Enum))
- {
- yyextra->current->program+=','; // add field terminator
- }
- // add compound definition to the tree
- yyextra->current->args = yyextra->current->args.simplifyWhiteSpace();
- yyextra->current->type = yyextra->current->type.simplifyWhiteSpace();
- yyextra->memspecEntry = yyextra->current;
- yyextra->current_root->moveToSubEntryAndRefresh( yyextra->current ) ;
- initEntry(yyscanner);
- unput(';');
- BEGIN( MemberSpec ) ;
- }
+ {
+ // enabled the next two lines for bug 623424
+ yyextra->current->doc.resize(0);
+ yyextra->current->brief.resize(0);
+ }
+ BEGIN( MemberSpec ) ;
+ }
+ }
+ }
+ }
+ }
+<ReadBody>"}"{BN}+"typedef"{BN}+ { //err("ReadBody count=%d\n",yyextra->curlyCount);
+ lineCount(yyscanner);
+ if ( yyextra->curlyCount>0 )
+ {
+ yyextra->current->program += yytext ;
+ --yyextra->curlyCount ;
+ }
+ else
+ {
+ yyextra->isTypedef = TRUE;
+ yyextra->current->endBodyLine = yyextra->yyLineNr;
+ QCString &cn = yyextra->current->name;
+ QCString rn = yyextra->current_root->name.copy();
+ if (!cn.isEmpty() && !rn.isEmpty())
+ {
+ prependScope(yyscanner);
+ }
+ BEGIN( TypedefName );
+ }
+ }
+<TypedefName>("const"|"volatile"){BN} { // late "const" or "volatile" keyword
+ lineCount(yyscanner);
+ yyextra->current->type.prepend(yytext);
+ }
+<TypedefName>{ID} {
+ if ((yyextra->current->section == Entry::ENUM_SEC) || (yyextra->current->spec&Entry::Enum))
+ {
+ yyextra->current->program+=","; // add field terminator
+ }
+ yyextra->current->name=yytext;
+ prependScope(yyscanner);
+ yyextra->current->args = yyextra->current->args.simplifyWhiteSpace();
+ yyextra->current->type = yyextra->current->type.simplifyWhiteSpace();
+ //printf("Adding compound %s %s %s\n",yyextra->current->type.data(),yyextra->current->name.data(),yyextra->current->args.data());
+ if (!yyextra->firstTypedefEntry)
+ {
+ yyextra->firstTypedefEntry = yyextra->current;
+ }
+ yyextra->current_root->moveToSubEntryAndRefresh( yyextra->current ) ;
+ initEntry(yyscanner);
+ yyextra->isTypedef=TRUE; // to undo reset by initEntry(yyscanner)
+ BEGIN(MemberSpecSkip);
+ }
+<TypedefName>";" { /* typedef of anonymous type */
+ yyextra->current->name.sprintf("@%d",anonCount++);
+ if ((yyextra->current->section == Entry::ENUM_SEC) || (yyextra->current->spec&Entry::Enum))
+ {
+ yyextra->current->program+=','; // add field terminator
+ }
+ // add compound definition to the tree
+ yyextra->current->args = yyextra->current->args.simplifyWhiteSpace();
+ yyextra->current->type = yyextra->current->type.simplifyWhiteSpace();
+ yyextra->memspecEntry = yyextra->current;
+ yyextra->current_root->moveToSubEntryAndRefresh( yyextra->current ) ;
+ initEntry(yyscanner);
+ unput(';');
+ BEGIN( MemberSpec ) ;
+ }
<MemberSpec>([*&]*{BN}*)*{ID}{BN}*("["[^\]\n]*"]")* { // the [] part could be improved.
- lineCount(yyscanner);
- int i=0,l=(int)yyleng,j;
- while (i<l && (!isId(yytext[i]))) i++;
- yyextra->msName = QCString(yytext).right(l-i).stripWhiteSpace();
- j=yyextra->msName.find("[");
- if (j!=-1)
- {
- yyextra->msArgs=yyextra->msName.right(yyextra->msName.length()-j);
- yyextra->msName=yyextra->msName.left(j);
- }
- yyextra->msType=QCString(yytext).left(i);
-
- // handle *pName in: typedef { ... } name, *pName;
- if (yyextra->firstTypedefEntry)
- {
- if (yyextra->firstTypedefEntry->spec&Entry::Struct)
- {
- yyextra->msType.prepend("struct "+yyextra->firstTypedefEntry->name);
- }
- else if (yyextra->firstTypedefEntry->spec&Entry::Union)
- {
- yyextra->msType.prepend("union "+yyextra->firstTypedefEntry->name);
- }
- else if (yyextra->firstTypedefEntry->section==Entry::ENUM_SEC)
- {
- yyextra->msType.prepend("enum "+yyextra->firstTypedefEntry->name);
- }
- else
- {
- yyextra->msType.prepend(yyextra->firstTypedefEntry->name);
- }
- }
- }
-<MemberSpec>"(" { // function with struct return type
- addType(yyscanner);
- yyextra->current->name = yyextra->msName;
- yyextra->current->spec = 0;
- unput('(');
- BEGIN(FindMembers);
- }
-<MemberSpec>[,;] {
- if (yyextra->msName.isEmpty() && !yyextra->current->name.isEmpty())
- {
- // see if the compound does not have a name or is yyextra->inside another
- // anonymous compound. If so we insert a
- // special 'anonymous' variable.
- //Entry *p=yyextra->current_root;
+ lineCount(yyscanner);
+ int i=0,l=(int)yyleng,j;
+ while (i<l && (!isId(yytext[i]))) i++;
+ yyextra->msName = QCString(yytext).right(l-i).stripWhiteSpace();
+ j=yyextra->msName.find("[");
+ if (j!=-1)
+ {
+ yyextra->msArgs=yyextra->msName.right(yyextra->msName.length()-j);
+ yyextra->msName=yyextra->msName.left(j);
+ }
+ yyextra->msType=QCString(yytext).left(i);
+
+ // handle *pName in: typedef { ... } name, *pName;
+ if (yyextra->firstTypedefEntry)
+ {
+ if (yyextra->firstTypedefEntry->spec&Entry::Struct)
+ {
+ yyextra->msType.prepend("struct "+yyextra->firstTypedefEntry->name);
+ }
+ else if (yyextra->firstTypedefEntry->spec&Entry::Union)
+ {
+ yyextra->msType.prepend("union "+yyextra->firstTypedefEntry->name);
+ }
+ else if (yyextra->firstTypedefEntry->section==Entry::ENUM_SEC)
+ {
+ yyextra->msType.prepend("enum "+yyextra->firstTypedefEntry->name);
+ }
+ else
+ {
+ yyextra->msType.prepend(yyextra->firstTypedefEntry->name);
+ }
+ }
+ }
+<MemberSpec>"(" { // function with struct return type
+ addType(yyscanner);
+ yyextra->current->name = yyextra->msName;
+ yyextra->current->spec = 0;
+ unput('(');
+ BEGIN(FindMembers);
+ }
+<MemberSpec>[,;] {
+ if (yyextra->msName.isEmpty() && !yyextra->current->name.isEmpty())
+ {
+ // see if the compound does not have a name or is yyextra->inside another
+ // anonymous compound. If so we insert a
+ // special 'anonymous' variable.
+ //Entry *p=yyextra->current_root;
const Entry *p=yyextra->current.get();
- while (p)
- {
- // only look for class scopes, not namespace scopes
- if ((p->section & Entry::COMPOUND_MASK) && !p->name.isEmpty())
- {
- //printf("Trying scope '%s'\n",p->name.data());
- int i=p->name.findRev("::");
- int pi = (i==-1) ? 0 : i+2;
- if (p->name.at(pi)=='@')
- {
- // anonymous compound yyextra->inside -> insert dummy variable name
- //printf("Adding anonymous variable for scope %s\n",p->name.data());
- yyextra->msName.sprintf("@%d",yyextra->anonCount++);
- break;
- }
- }
- //p=p->parent;
- if (p==yyextra->current.get()) p=yyextra->current_root.get(); else p=p->parent();
- }
- }
- //printf("yyextra->msName=%s yyextra->current->name=%s\n",yyextra->msName.data(),yyextra->current->name.data());
- if (!yyextra->msName.isEmpty()
- /*&& yyextra->msName!=yyextra->current->name*/) // skip typedef T {} T;, removed due to bug608493
- {
- bool typedefHidesStruct = Config_getBool(TYPEDEF_HIDES_STRUCT);
- // case 1: typedef struct _S { ... } S_t;
- // -> omit typedef and use S_t as the struct name
- if (typedefHidesStruct &&
- yyextra->isTypedef &&
- ((yyextra->current->spec&(Entry::Struct|Entry::Union)) ||
- yyextra->current->section==Entry::ENUM_SEC )&&
- yyextra->msType.stripWhiteSpace().isEmpty() &&
- yyextra->memspecEntry)
- {
- yyextra->memspecEntry->name=yyextra->msName;
- }
- else // case 2: create a typedef field
- {
+ while (p)
+ {
+ // only look for class scopes, not namespace scopes
+ if ((p->section & Entry::COMPOUND_MASK) && !p->name.isEmpty())
+ {
+ //printf("Trying scope '%s'\n",p->name.data());
+ int i=p->name.findRev("::");
+ int pi = (i==-1) ? 0 : i+2;
+ if (p->name.at(pi)=='@')
+ {
+ // anonymous compound yyextra->inside -> insert dummy variable name
+ //printf("Adding anonymous variable for scope %s\n",p->name.data());
+ yyextra->msName.sprintf("@%d",anonCount++);
+ break;
+ }
+ }
+ //p=p->parent;
+ if (p==yyextra->current.get()) p=yyextra->current_root.get(); else p=p->parent();
+ }
+ }
+ //printf("yyextra->msName=%s yyextra->current->name=%s\n",yyextra->msName.data(),yyextra->current->name.data());
+ if (!yyextra->msName.isEmpty()
+ /*&& yyextra->msName!=yyextra->current->name*/) // skip typedef T {} T;, removed due to bug608493
+ {
+ bool typedefHidesStruct = Config_getBool(TYPEDEF_HIDES_STRUCT);
+ // case 1: typedef struct _S { ... } S_t;
+ // -> omit typedef and use S_t as the struct name
+ if (typedefHidesStruct &&
+ yyextra->isTypedef &&
+ ((yyextra->current->spec&(Entry::Struct|Entry::Union)) ||
+ yyextra->current->section==Entry::ENUM_SEC )&&
+ yyextra->msType.stripWhiteSpace().isEmpty() &&
+ yyextra->memspecEntry)
+ {
+ yyextra->memspecEntry->name=yyextra->msName;
+ }
+ else // case 2: create a typedef field
+ {
std::shared_ptr<Entry> varEntry=std::make_shared<Entry>();
- varEntry->lang = yyextra->language;
- varEntry->protection = yyextra->current->protection ;
- varEntry->mtype = yyextra->current->mtype;
- varEntry->virt = yyextra->current->virt;
- varEntry->stat = yyextra->current->stat;
- varEntry->section = Entry::VARIABLE_SEC;
- varEntry->name = yyextra->msName.stripWhiteSpace();
- varEntry->type = yyextra->current->type.simplifyWhiteSpace()+" ";
- varEntry->args = yyextra->msArgs;
- if (yyextra->isTypedef)
- {
- varEntry->type.prepend("typedef ");
- // //printf("yyextra->current->name = %s %s\n",yyextra->current->name.data(),yyextra->msName.data());
- }
- if (typedefHidesStruct &&
- yyextra->isTypedef &&
- (yyextra->current->spec&(Entry::Struct|Entry::Union)) &&
- yyextra->memspecEntry
- ) // case 1: use S_t as type for pS_t in "typedef struct _S {} S_t, *pS_t;"
- {
- varEntry->type+=yyextra->memspecEntry->name+yyextra->msType;
- }
- else // case 2: use _S as type for for pS_t
- {
- varEntry->type+=yyextra->current->name+yyextra->msType;
- }
- varEntry->fileName = yyextra->yyFileName;
- varEntry->startLine = yyextra->yyLineNr;
- varEntry->startColumn = yyextra->yyColNr;
- varEntry->doc = yyextra->current->doc.copy();
- varEntry->brief = yyextra->current->brief.copy();
- varEntry->mGrpId = yyextra->current->mGrpId;
+ varEntry->lang = yyextra->language;
+ varEntry->protection = yyextra->current->protection ;
+ varEntry->mtype = yyextra->current->mtype;
+ varEntry->virt = yyextra->current->virt;
+ varEntry->stat = yyextra->current->stat;
+ varEntry->section = Entry::VARIABLE_SEC;
+ varEntry->name = yyextra->msName.stripWhiteSpace();
+ varEntry->type = yyextra->current->type.simplifyWhiteSpace()+" ";
+ varEntry->args = yyextra->msArgs;
+ if (yyextra->isTypedef)
+ {
+ varEntry->type.prepend("typedef ");
+ // //printf("yyextra->current->name = %s %s\n",yyextra->current->name.data(),yyextra->msName.data());
+ }
+ if (typedefHidesStruct &&
+ yyextra->isTypedef &&
+ (yyextra->current->spec&(Entry::Struct|Entry::Union)) &&
+ yyextra->memspecEntry
+ ) // case 1: use S_t as type for pS_t in "typedef struct _S {} S_t, *pS_t;"
+ {
+ varEntry->type+=yyextra->memspecEntry->name+yyextra->msType;
+ }
+ else // case 2: use _S as type for for pS_t
+ {
+ varEntry->type+=yyextra->current->name+yyextra->msType;
+ }
+ varEntry->fileName = yyextra->yyFileName;
+ varEntry->startLine = yyextra->yyLineNr;
+ varEntry->startColumn = yyextra->yyColNr;
+ varEntry->doc = yyextra->current->doc.copy();
+ varEntry->brief = yyextra->current->brief.copy();
+ varEntry->mGrpId = yyextra->current->mGrpId;
varEntry->initializer = yyextra->current->initializer;
varEntry->groups = yyextra->current->groups;
varEntry->sli = yyextra->current->sli;
- //printf("Add: type='%s',name='%s',args='%s' brief=%s doc=%s\n",
- // varEntry->type.data(),varEntry->name.data(),
- // varEntry->args.data(),varEntry->brief.data(),varEntry->doc.data());
- yyextra->current_root->moveToSubEntryAndKeep(varEntry);
- }
- }
- if (*yytext==';') // end of a struct/class ...
- {
- if (!yyextra->isTypedef && yyextra->msName.isEmpty() && yyextra->memspecEntry && (yyextra->current->section&Entry::COMPOUND_MASK))
- { // case where a class/struct has a doc block after it
- if (!yyextra->current->doc.isEmpty())
- {
- yyextra->memspecEntry->doc += yyextra->current->doc;
- }
- if (!yyextra->current->brief.isEmpty())
- {
- yyextra->memspecEntry->brief += yyextra->current->brief;
- }
- }
- yyextra->msType.resize(0);
- yyextra->msName.resize(0);
- yyextra->msArgs.resize(0);
- yyextra->isTypedef=FALSE;
- yyextra->firstTypedefEntry.reset();
- yyextra->memspecEntry.reset();
- yyextra->current->reset();
- initEntry(yyscanner);
- BEGIN( FindMembers );
- }
- else
- {
- yyextra->current->doc.resize(0);
- yyextra->current->brief.resize(0);
- }
-
- }
-<MemberSpec>"=" {
- yyextra->lastInitializerContext=YY_START;
- yyextra->initBracketCount=0;
+ //printf("Add: type='%s',name='%s',args='%s' brief=%s doc=%s\n",
+ // varEntry->type.data(),varEntry->name.data(),
+ // varEntry->args.data(),varEntry->brief.data(),varEntry->doc.data());
+ yyextra->current_root->moveToSubEntryAndKeep(varEntry);
+ }
+ }
+ if (*yytext==';') // end of a struct/class ...
+ {
+ if (!yyextra->isTypedef && yyextra->msName.isEmpty() && yyextra->memspecEntry && (yyextra->current->section&Entry::COMPOUND_MASK))
+ { // case where a class/struct has a doc block after it
+ if (!yyextra->current->doc.isEmpty())
+ {
+ yyextra->memspecEntry->doc += yyextra->current->doc;
+ }
+ if (!yyextra->current->brief.isEmpty())
+ {
+ yyextra->memspecEntry->brief += yyextra->current->brief;
+ }
+ }
+ yyextra->msType.resize(0);
+ yyextra->msName.resize(0);
+ yyextra->msArgs.resize(0);
+ yyextra->isTypedef=FALSE;
+ yyextra->firstTypedefEntry.reset();
+ yyextra->memspecEntry.reset();
+ yyextra->current->reset();
+ initEntry(yyscanner);
+ BEGIN( FindMembers );
+ }
+ else
+ {
+ yyextra->current->doc.resize(0);
+ yyextra->current->brief.resize(0);
+ }
+
+ }
+<MemberSpec>"=" {
+ yyextra->lastInitializerContext=YY_START;
+ yyextra->initBracketCount=0;
yyextra->current->initializer = yytext;
- BEGIN(ReadInitializer);
- /* BEGIN(MemberSpecSkip); */
- }
+ BEGIN(ReadInitializer);
+ /* BEGIN(MemberSpecSkip); */
+ }
/*
-<MemberSpecSkip>"{" {
- yyextra->curlyCount=0;
- yyextra->lastCurlyContext = MemberSpecSkip;
- yyextra->previous = yyextra->current;
- BEGIN(SkipCurly);
- }
+<MemberSpecSkip>"{" {
+ yyextra->curlyCount=0;
+ yyextra->lastCurlyContext = MemberSpecSkip;
+ yyextra->previous = yyextra->current;
+ BEGIN(SkipCurly);
+ }
*/
-<MemberSpecSkip>"," { BEGIN(MemberSpec); }
-<MemberSpecSkip>";" { unput(';'); BEGIN(MemberSpec); }
+<MemberSpecSkip>"," { BEGIN(MemberSpec); }
+<MemberSpecSkip>";" { unput(';'); BEGIN(MemberSpec); }
<ReadBody,ReadNSBody,ReadBodyIntf>{BN}{1,80} { yyextra->current->program += yytext ;
- lineCount(yyscanner) ;
- }
-<ReadBodyIntf>"@end"/[^a-z_A-Z0-9] { // end of Objective C block
- yyextra->current_root->moveToSubEntryAndRefresh( yyextra->current ) ;
- initEntry(yyscanner);
- yyextra->language = yyextra->current->lang = SrcLangExt_Cpp; // see bug746361
- yyextra->insideObjC=FALSE;
- BEGIN( FindMembers );
- }
-<ReadBody,ReadNSBody,ReadBodyIntf>. { yyextra->current->program += yytext ; }
+ lineCount(yyscanner) ;
+ }
+<ReadBodyIntf>"@end"/[^a-z_A-Z0-9] { // end of Objective C block
+ yyextra->current_root->moveToSubEntryAndRefresh( yyextra->current ) ;
+ initEntry(yyscanner);
+ yyextra->language = yyextra->current->lang = SrcLangExt_Cpp; // see bug746361
+ yyextra->insideObjC=FALSE;
+ BEGIN( FindMembers );
+ }
+<ReadBody,ReadNSBody,ReadBodyIntf>. { yyextra->current->program += yytext ; }
<FindMembers>"("/{BN}*"::"*{BN}*({TSCOPE}{BN}*"::")*{TSCOPE}{BN}*")"{BN}*"(" | /* typedef void (A<int>::func_t)(args...) */
<FindMembers>("("({BN}*"::"*{BN}*{TSCOPE}{BN}*"::")*({BN}*[*&\^]{BN}*)+)+ { /* typedef void (A::*ptr_t)(args...) or int (*func(int))[], the ^ is for Obj-C blocks */
- if (yyextra->insidePHP) // reference parameter
- {
- REJECT
- }
- else
- {
- yyextra->current->bodyLine = yyextra->yyLineNr;
- yyextra->current->bodyColumn = yyextra->yyColNr;
- lineCount(yyscanner);
- addType(yyscanner);
- yyextra->funcPtrType=yytext;
- yyextra->roundCount=0;
- //yyextra->current->type += yytext;
- BEGIN( FuncPtr );
- }
- }
-<FuncPtr>{SCOPENAME} {
- yyextra->current->name = yytext;
- if (nameIsOperator(yyextra->current->name))
- {
- BEGIN( FuncPtrOperator );
- }
- else
- {
- if (yyextra->current->name=="const" || yyextra->current->name=="volatile")
- {
- yyextra->funcPtrType += yyextra->current->name;
- }
- else
- {
- BEGIN( EndFuncPtr );
- }
- }
- }
-<FuncPtr>. {
- //printf("error: FuncPtr '%c' unexpected at line %d of %s\n",*yytext,yyextra->yyLineNr,yyextra->yyFileName);
- }
-<FuncPtrOperator>"("{BN}*")"{BN}*/"(" {
- yyextra->current->name += yytext;
- yyextra->current->name = yyextra->current->name.simplifyWhiteSpace();
- lineCount(yyscanner);
- }
-<FuncPtrOperator>\n {
+ if (yyextra->insidePHP) // reference parameter
+ {
+ REJECT
+ }
+ else
+ {
+ yyextra->current->bodyLine = yyextra->yyLineNr;
+ yyextra->current->bodyColumn = yyextra->yyColNr;
+ lineCount(yyscanner);
+ addType(yyscanner);
+ yyextra->funcPtrType=yytext;
+ yyextra->roundCount=0;
+ //yyextra->current->type += yytext;
+ BEGIN( FuncPtr );
+ }
+ }
+<FuncPtr>{SCOPENAME} {
+ yyextra->current->name = yytext;
+ if (nameIsOperator(yyextra->current->name))
+ {
+ BEGIN( FuncPtrOperator );
+ }
+ else
+ {
+ if (yyextra->current->name=="const" || yyextra->current->name=="volatile")
+ {
+ yyextra->funcPtrType += yyextra->current->name;
+ }
+ else
+ {
+ BEGIN( EndFuncPtr );
+ }
+ }
+ }
+<FuncPtr>. {
+ //printf("error: FuncPtr '%c' unexpected at line %d of %s\n",*yytext,yyextra->yyLineNr,yyextra->yyFileName);
+ }
+<FuncPtrOperator>"("{BN}*")"{BN}*/"(" {
+ yyextra->current->name += yytext;
+ yyextra->current->name = yyextra->current->name.simplifyWhiteSpace();
+ lineCount(yyscanner);
+ }
+<FuncPtrOperator>\n {
+ lineCount(yyscanner);
+ yyextra->current->name += *yytext;
+ }
+<FuncPtrOperator>"(" {
+ unput(*yytext);
+ BEGIN( EndFuncPtr );
+ }
+<FuncPtrOperator>. {
+ yyextra->current->name += *yytext;
+ }
+<EndFuncPtr>")"{BN}*/";" { // a variable with extra braces
+ lineCount(yyscanner);
+ yyextra->current->type+=yyextra->funcPtrType.data()+1;
+ BEGIN(FindMembers);
+ }
+<EndFuncPtr>")"{BN}*/"(" { // a function pointer
+ lineCount(yyscanner);
+ yyextra->current->type+=yyextra->funcPtrType+")";
+ BEGIN(FindMembers);
+ }
+<EndFuncPtr>")"{BN}*/"[" { // an array of variables
lineCount(yyscanner);
- yyextra->current->name += *yytext;
- }
-<FuncPtrOperator>"(" {
- unput(*yytext);
- BEGIN( EndFuncPtr );
- }
-<FuncPtrOperator>. {
- yyextra->current->name += *yytext;
- }
-<EndFuncPtr>")"{BN}*/";" { // a variable with extra braces
- lineCount(yyscanner);
- yyextra->current->type+=yyextra->funcPtrType.data()+1;
- BEGIN(FindMembers);
- }
-<EndFuncPtr>")"{BN}*/"(" { // a function pointer
- lineCount(yyscanner);
- yyextra->current->type+=yyextra->funcPtrType+")";
- BEGIN(FindMembers);
- }
-<EndFuncPtr>")"{BN}*/"[" { // an array of variables
- lineCount(yyscanner);
- yyextra->current->type+=yyextra->funcPtrType.data();
- yyextra->current->args += ")";
- BEGIN(FindMembers);
- }
-<EndFuncPtr>"(" { // a function returning a function or
+ yyextra->current->type+=yyextra->funcPtrType.data();
+ yyextra->current->args += ")";
+ BEGIN(FindMembers);
+ }
+<EndFuncPtr>"(" { // a function returning a function or
// a function returning a pointer to an array
- yyextra->current->args += *yytext ;
- //yyextra->roundCount=0;
- //BEGIN( FuncFunc );
- yyextra->current->bodyLine = yyextra->yyLineNr;
- yyextra->current->bodyColumn = yyextra->yyColNr;
- yyextra->currentArgumentContext = FuncFuncEnd;
- yyextra->fullArgString=yyextra->current->args.copy();
- yyextra->copyArgString=&yyextra->current->args;
- BEGIN( ReadFuncArgType ) ;
- }
-<EndFuncPtr>"["[^\n\]]*"]" {
- yyextra->funcPtrType+=yytext;
- }
-<EndFuncPtr>")" {
- BEGIN(FindMembers);
- }
-<FuncFunc>"(" {
- yyextra->current->args += *yytext ;
- ++yyextra->roundCount;
- }
-<FuncFunc>")" {
- yyextra->current->args += *yytext ;
- if ( yyextra->roundCount )
- --yyextra->roundCount;
- else
- {
- BEGIN(FuncFuncEnd);
- }
- }
-<FuncFuncEnd>")"{BN}*"(" {
- lineCount(yyscanner);
- yyextra->current->type+=yyextra->funcPtrType+")(";
- BEGIN(FuncFuncType);
- }
-<FuncFuncEnd>")"{BN}*/[;{] {
- lineCount(yyscanner);
- yyextra->current->type+=yyextra->funcPtrType.data()+1;
- BEGIN(Function);
- }
-<FuncFuncEnd>")"{BN}*/"[" { // function returning a pointer to an array
+ yyextra->current->args += *yytext ;
+ //yyextra->roundCount=0;
+ //BEGIN( FuncFunc );
+ yyextra->current->bodyLine = yyextra->yyLineNr;
+ yyextra->current->bodyColumn = yyextra->yyColNr;
+ yyextra->currentArgumentContext = FuncFuncEnd;
+ yyextra->fullArgString=yyextra->current->args.copy();
+ yyextra->copyArgString=&yyextra->current->args;
+ BEGIN( ReadFuncArgType ) ;
+ }
+<EndFuncPtr>"["[^\n\]]*"]" {
+ yyextra->funcPtrType+=yytext;
+ }
+<EndFuncPtr>")" {
+ BEGIN(FindMembers);
+ }
+<FuncFunc>"(" {
+ yyextra->current->args += *yytext ;
+ ++yyextra->roundCount;
+ }
+<FuncFunc>")" {
+ yyextra->current->args += *yytext ;
+ if ( yyextra->roundCount )
+ --yyextra->roundCount;
+ else
+ {
+ BEGIN(FuncFuncEnd);
+ }
+ }
+<FuncFuncEnd>")"{BN}*"(" {
+ lineCount(yyscanner);
+ yyextra->current->type+=yyextra->funcPtrType+")(";
+ BEGIN(FuncFuncType);
+ }
+<FuncFuncEnd>")"{BN}*/[;{] {
lineCount(yyscanner);
- yyextra->current->type+=yyextra->funcPtrType;
- yyextra->current->args+=")";
- BEGIN(FuncFuncArray);
- }
-<FuncFuncEnd>. {
- yyextra->current->args += *yytext;
- }
-<FuncFuncType>"(" {
- yyextra->current->type += *yytext;
- yyextra->roundCount++;
- }
-<FuncFuncType>")" {
- yyextra->current->type += *yytext;
- if (yyextra->roundCount)
- --yyextra->roundCount;
- else
- BEGIN(Function);
- }
-<FuncFuncType>{BN}*","{BN}* { lineCount(yyscanner) ; yyextra->current->type += ", " ; }
-<FuncFuncType>{BN}+ { lineCount(yyscanner) ; yyextra->current->type += ' ' ; }
-<FuncFuncType>. {
- yyextra->current->type += *yytext;
- }
+ yyextra->current->type+=yyextra->funcPtrType.data()+1;
+ BEGIN(Function);
+ }
+<FuncFuncEnd>")"{BN}*/"[" { // function returning a pointer to an array
+ lineCount(yyscanner);
+ yyextra->current->type+=yyextra->funcPtrType;
+ yyextra->current->args+=")";
+ BEGIN(FuncFuncArray);
+ }
+<FuncFuncEnd>. {
+ yyextra->current->args += *yytext;
+ }
+<FuncFuncType>"(" {
+ yyextra->current->type += *yytext;
+ yyextra->roundCount++;
+ }
+<FuncFuncType>")" {
+ yyextra->current->type += *yytext;
+ if (yyextra->roundCount)
+ --yyextra->roundCount;
+ else
+ BEGIN(Function);
+ }
+<FuncFuncType>{BN}*","{BN}* { lineCount(yyscanner) ; yyextra->current->type += ", " ; }
+<FuncFuncType>{BN}+ { lineCount(yyscanner) ; yyextra->current->type += ' ' ; }
+<FuncFuncType>. {
+ yyextra->current->type += *yytext;
+ }
<FindMembers>"("/{BN}*{ID}{BN}*"*"{BN}*{ID}*")"{BN}*"(" { // for catching typedef void (__stdcall *f)() like definitions
- if (yyextra->current->type.left(7)=="typedef" && yyextra->current->bodyLine==-1)
- // the bodyLine check is to prevent this guard to be true more than once
- {
- yyextra->current->bodyLine = yyextra->yyLineNr;
- yyextra->current->bodyColumn = yyextra->yyColNr;
- BEGIN( GetCallType );
- }
- else if (!yyextra->current->name.isEmpty()) // normal function
- {
- yyextra->current->args = yytext;
- yyextra->current->bodyLine = yyextra->yyLineNr;
- yyextra->current->bodyColumn = yyextra->yyColNr;
- yyextra->currentArgumentContext = FuncQual;
- yyextra->fullArgString=yyextra->current->args.copy();
- yyextra->copyArgString=&yyextra->current->args;
- BEGIN( ReadFuncArgType ) ;
- //printf(">>> Read function arguments!\n");
- }
- }
-<GetCallType>{BN}*{ID}{BN}*"*" {
- lineCount(yyscanner);
- addType(yyscanner);
- yyextra->funcPtrType="(";
- yyextra->funcPtrType+=yytext;
- yyextra->roundCount=0;
- BEGIN( FuncPtr );
- }
-<FindMembers>"(" {
+ if (yyextra->current->type.left(7)=="typedef" && yyextra->current->bodyLine==-1)
+ // the bodyLine check is to prevent this guard to be true more than once
+ {
+ yyextra->current->bodyLine = yyextra->yyLineNr;
+ yyextra->current->bodyColumn = yyextra->yyColNr;
+ BEGIN( GetCallType );
+ }
+ else if (!yyextra->current->name.isEmpty()) // normal function
+ {
+ yyextra->current->args = yytext;
+ yyextra->current->bodyLine = yyextra->yyLineNr;
+ yyextra->current->bodyColumn = yyextra->yyColNr;
+ yyextra->currentArgumentContext = FuncQual;
+ yyextra->fullArgString=yyextra->current->args.copy();
+ yyextra->copyArgString=&yyextra->current->args;
+ BEGIN( ReadFuncArgType ) ;
+ //printf(">>> Read function arguments!\n");
+ }
+ }
+<GetCallType>{BN}*{ID}{BN}*"*" {
+ lineCount(yyscanner);
+ addType(yyscanner);
+ yyextra->funcPtrType="(";
+ yyextra->funcPtrType+=yytext;
+ yyextra->roundCount=0;
+ BEGIN( FuncPtr );
+ }
+<FindMembers>"(" {
if (!yyextra->current->name.isEmpty())
- {
- yyextra->current->args = yytext;
- yyextra->current->bodyLine = yyextra->yyLineNr;
- yyextra->current->bodyColumn = yyextra->yyColNr;
- yyextra->currentArgumentContext = FuncQual;
- yyextra->fullArgString=yyextra->current->args.copy();
- yyextra->copyArgString=&yyextra->current->args;
- BEGIN( ReadFuncArgType ) ;
- //printf(">>> Read function arguments yyextra->current->argList.size()=%d\n",yyextra->current->argList.size());
- }
- }
+ {
+ yyextra->current->args = yytext;
+ yyextra->current->bodyLine = yyextra->yyLineNr;
+ yyextra->current->bodyColumn = yyextra->yyColNr;
+ yyextra->currentArgumentContext = FuncQual;
+ yyextra->fullArgString=yyextra->current->args.copy();
+ yyextra->copyArgString=&yyextra->current->args;
+ BEGIN( ReadFuncArgType ) ;
+ //printf(">>> Read function arguments yyextra->current->argList.size()=%d\n",yyextra->current->argList.size());
+ }
+ }
/*
-<FindMembers>"("{BN}*("void"{BN}*)?")" {
- lineCount(yyscanner);
- yyextra->current->args = "()";
- BEGIN( FuncQual );
- }
+<FindMembers>"("{BN}*("void"{BN}*)?")" {
+ lineCount(yyscanner);
+ yyextra->current->args = "()";
+ BEGIN( FuncQual );
+ }
*/
/*- Function argument reading rules ---------------------------------------*/
-<ReadFuncArgType>[^ \/\r\t\n\)\(\"\'#]+ { *yyextra->copyArgString+=yytext;
- yyextra->fullArgString+=yytext;
- }
-<CopyArgString,CopyArgPHPString>[^\n\\\"\']+ { *yyextra->copyArgString+=yytext;
- yyextra->fullArgString+=yytext;
- }
-<CopyArgRound>[^\/\n\)\(\"\']+ {
- *yyextra->copyArgString+=yytext;
- yyextra->fullArgString+=yytext;
- }
-<ReadFuncArgType,ReadTempArgs>{BN}* {
- *yyextra->copyArgString+=" ";
- yyextra->fullArgString+=" ";
- lineCount(yyscanner);
- }
-<ReadFuncArgType,CopyArgRound,CopyArgSharp,ReadTempArgs>{RAWBEGIN} {
+<ReadFuncArgType>[^ \/\r\t\n\)\(\"\'#]+ { *yyextra->copyArgString+=yytext;
+ yyextra->fullArgString+=yytext;
+ }
+<CopyArgString,CopyArgPHPString>[^\n\\\"\']+ { *yyextra->copyArgString+=yytext;
+ yyextra->fullArgString+=yytext;
+ }
+<CopyArgRound>[^\/\n\)\(\"\']+ {
+ *yyextra->copyArgString+=yytext;
+ yyextra->fullArgString+=yytext;
+ }
+<ReadFuncArgType,ReadTempArgs>{BN}* {
+ *yyextra->copyArgString+=" ";
+ yyextra->fullArgString+=" ";
+ lineCount(yyscanner);
+ }
+<ReadFuncArgType,CopyArgRound,CopyArgSharp,ReadTempArgs>{RAWBEGIN} {
yyextra->delimiter = yytext+2;
yyextra->delimiter=yyextra->delimiter.left(yyextra->delimiter.length()-1);
yyextra->lastRawStringContext = YY_START;
yyextra->pCopyRawString = yyextra->copyArgString;
*yyextra->pCopyRawString+=yytext;
- yyextra->fullArgString+=yytext;
+ yyextra->fullArgString+=yytext;
BEGIN(RawString);
}
-<ReadFuncArgType,CopyArgRound,CopyArgSharp,ReadTempArgs>\" {
- *yyextra->copyArgString+=*yytext;
- yyextra->fullArgString+=*yytext;
- yyextra->lastCopyArgStringContext = YY_START;
- BEGIN( CopyArgString );
- }
-<ReadFuncArgType,ReadTempArgs>"(" {
- *yyextra->copyArgString+=*yytext;
- yyextra->fullArgString+=*yytext;
- yyextra->argRoundCount=0;
- yyextra->lastCopyArgContext = YY_START;
- BEGIN( CopyArgRound );
- }
-<ReadFuncArgType>")" {
- *yyextra->copyArgString+=*yytext;
- yyextra->fullArgString+=*yytext;
+<ReadFuncArgType,CopyArgRound,CopyArgSharp,ReadTempArgs>\" {
+ *yyextra->copyArgString+=*yytext;
+ yyextra->fullArgString+=*yytext;
+ yyextra->lastCopyArgStringContext = YY_START;
+ BEGIN( CopyArgString );
+ }
+<ReadFuncArgType,ReadTempArgs>"(" {
+ *yyextra->copyArgString+=*yytext;
+ yyextra->fullArgString+=*yytext;
+ yyextra->argRoundCount=0;
+ yyextra->lastCopyArgContext = YY_START;
+ BEGIN( CopyArgRound );
+ }
+<ReadFuncArgType>")" {
+ *yyextra->copyArgString+=*yytext;
+ yyextra->fullArgString+=*yytext;
yyextra->current->argList = *stringToArgumentList(yyextra->language, yyextra->fullArgString);
- if (yyextra->insideJS)
- {
- fixArgumentListForJavaScript(yyextra->current->argList);
- }
+ if (yyextra->insideJS)
+ {
+ fixArgumentListForJavaScript(yyextra->current->argList);
+ }
handleParametersCommentBlocks(yyscanner,yyextra->current->argList);
- /* remember the yyextra->current documentation block, since
- we could overwrite it with the documentation of
- a function argument, which we then have to correct later
- on
- */
- yyextra->docBackup = yyextra->current->doc;
- yyextra->briefBackup = yyextra->current->brief;
-
- BEGIN( yyextra->currentArgumentContext );
- }
- /* a special comment */
-<ReadFuncArgType,ReadTempArgs>("/*"[*!]|"//"[/!])("<"?) {
+ /* remember the yyextra->current documentation block, since
+ we could overwrite it with the documentation of
+ a function argument, which we then have to correct later
+ on
+ */
+ yyextra->docBackup = yyextra->current->doc;
+ yyextra->briefBackup = yyextra->current->brief;
+
+ BEGIN( yyextra->currentArgumentContext );
+ }
+ /* a special comment */
+<ReadFuncArgType,ReadTempArgs>("/*"[*!]|"//"[/!])("<"?) {
if (yyextra->currentArgumentContext==DefineEnd)
- {
- // for defines we interpret a comment
- // as documentation for the define
- int i;for (i=(int)yyleng-1;i>=0;i--)
- {
- unput(yytext[i]);
- }
+ {
+ // for defines we interpret a comment
+ // as documentation for the define
+ int i;for (i=(int)yyleng-1;i>=0;i--)
+ {
+ unput(yytext[i]);
+ }
yyextra->current->argList = *stringToArgumentList(yyextra->language, yyextra->fullArgString);
handleParametersCommentBlocks(yyscanner,yyextra->current->argList);
- BEGIN( yyextra->currentArgumentContext );
- }
- else // not a define
- {
- // for functions we interpret a comment
- // as documentation for the argument
- yyextra->fullArgString+=yytext;
- yyextra->lastCopyArgChar=0;
- yyextra->lastCommentInArgContext=YY_START;
- if (yytext[1]=='/')
- BEGIN( CopyArgCommentLine );
- else
- BEGIN( CopyArgComment );
- }
- }
- /* a non-special comment */
-<ReadFuncArgType,ReadTempArgs>"/**/" { /* empty comment */ }
-<ReadFuncArgType,ReadTempArgs>"/*" {
- yyextra->lastCContext = YY_START;
- BEGIN( SkipComment );
- }
-<ReadFuncArgType,ReadTempArgs>"//" {
- yyextra->lastCContext = YY_START;
- BEGIN( SkipCxxComment );
- }
+ BEGIN( yyextra->currentArgumentContext );
+ }
+ else // not a define
+ {
+ // for functions we interpret a comment
+ // as documentation for the argument
+ yyextra->fullArgString+=yytext;
+ yyextra->lastCopyArgChar=0;
+ yyextra->lastCommentInArgContext=YY_START;
+ if (yytext[1]=='/')
+ BEGIN( CopyArgCommentLine );
+ else
+ BEGIN( CopyArgComment );
+ }
+ }
+ /* a non-special comment */
+<ReadFuncArgType,ReadTempArgs>"/**/" { /* empty comment */ }
+<ReadFuncArgType,ReadTempArgs>"/*" {
+ yyextra->lastCContext = YY_START;
+ BEGIN( SkipComment );
+ }
+<ReadFuncArgType,ReadTempArgs>"//" {
+ yyextra->lastCContext = YY_START;
+ BEGIN( SkipCxxComment );
+ }
/*
-<ReadFuncArgType,ReadTempArgs>"'#" { if (yyextra->insidePHP)
+<ReadFuncArgType,ReadTempArgs>"'#" { if (yyextra->insidePHP)
+ REJECT;
+ *yyextra->copyArgString+=yytext;
+ yyextra->fullArgString+=yytext;
+ }
+<ReadFuncArgType,ReadTempArgs>"#" {
+ if (!yyextra->insidePHP)
REJECT;
- *yyextra->copyArgString+=yytext;
- yyextra->fullArgString+=yytext;
- }
-<ReadFuncArgType,ReadTempArgs>"#" {
- if (!yyextra->insidePHP)
- REJECT;
- yyextra->lastCContext = YY_START;
- BEGIN( SkipCxxComment );
- }
+ yyextra->lastCContext = YY_START;
+ BEGIN( SkipCxxComment );
+ }
*/
- /* ')' followed by a special comment */
-<ReadFuncArgType>")"{BN}*("/*"[*!]|"//"[/!])"<" {
- lineCount(yyscanner);
+ /* ')' followed by a special comment */
+<ReadFuncArgType>")"{BN}*("/*"[*!]|"//"[/!])"<" {
+ lineCount(yyscanner);
if (yyextra->currentArgumentContext==DefineEnd)
- {
- // for defines we interpret a comment
- // as documentation for the define
- int i;for (i=(int)yyleng-1;i>0;i--)
- {
- unput(yytext[i]);
- }
- *yyextra->copyArgString+=*yytext;
- yyextra->fullArgString+=*yytext;
+ {
+ // for defines we interpret a comment
+ // as documentation for the define
+ int i;for (i=(int)yyleng-1;i>0;i--)
+ {
+ unput(yytext[i]);
+ }
+ *yyextra->copyArgString+=*yytext;
+ yyextra->fullArgString+=*yytext;
yyextra->current->argList = *stringToArgumentList(yyextra->language, yyextra->fullArgString);
handleParametersCommentBlocks(yyscanner,yyextra->current->argList);
- BEGIN( yyextra->currentArgumentContext );
- }
- else
- {
- // for functions we interpret a comment
- // as documentation for the yyextra->last argument
- yyextra->lastCopyArgChar=*yytext;
- QCString text=&yytext[1];
- text=text.stripWhiteSpace();
- yyextra->lastCommentInArgContext=YY_START;
- yyextra->fullArgString+=text;
- if (text.find("//")!=-1)
- BEGIN( CopyArgCommentLine );
- else
- BEGIN( CopyArgComment );
- }
- }
-<CopyArgComment>^{B}*"*"+/{BN}+
-<CopyArgComment>[^\n\\\@\*]+ { yyextra->fullArgString+=yytext; }
-<CopyArgComment>"*/" { yyextra->fullArgString+=yytext;
- if (yyextra->lastCopyArgChar!=0)
- unput(yyextra->lastCopyArgChar);
- BEGIN( yyextra->lastCommentInArgContext );
- }
-<CopyArgCommentLine>\n { yyextra->fullArgString+=yytext;
+ BEGIN( yyextra->currentArgumentContext );
+ }
+ else
+ {
+ // for functions we interpret a comment
+ // as documentation for the yyextra->last argument
+ yyextra->lastCopyArgChar=*yytext;
+ QCString text=&yytext[1];
+ text=text.stripWhiteSpace();
+ yyextra->lastCommentInArgContext=YY_START;
+ yyextra->fullArgString+=text;
+ if (text.find("//")!=-1)
+ BEGIN( CopyArgCommentLine );
+ else
+ BEGIN( CopyArgComment );
+ }
+ }
+<CopyArgComment>^{B}*"*"+/{BN}+
+<CopyArgComment>[^\n\\\@\*]+ { yyextra->fullArgString+=yytext; }
+<CopyArgComment>"*/" { yyextra->fullArgString+=yytext;
+ if (yyextra->lastCopyArgChar!=0)
+ unput(yyextra->lastCopyArgChar);
+ BEGIN( yyextra->lastCommentInArgContext );
+ }
+<CopyArgCommentLine>\n { yyextra->fullArgString+=yytext;
lineCount(yyscanner);
- if (yyextra->lastCopyArgChar!=0)
- unput(yyextra->lastCopyArgChar);
- BEGIN( yyextra->lastCommentInArgContext );
- }
-<CopyArgCommentLine>{CMD}("verbatim"|"latexonly"|"htmlonly"|"xmlonly"|"manonly"|"rtfonly"|"docbookonly"|"dot"|"code")/[^a-z_A-Z0-9\-] { // verbatim command (which could contain nested comments!)
- yyextra->docBlockName=&yytext[1];
- yyextra->fullArgString+=yytext;
- BEGIN(CopyArgVerbatim);
- }
-<CopyArgCommentLine>{CMD}("f$"|"f["|"f{") {
- yyextra->docBlockName=&yytext[1];
- if (yyextra->docBlockName.at(1)=='[')
- {
- yyextra->docBlockName.at(1)='}';
- }
- if (yyextra->docBlockName.at(1)=='{')
- {
- yyextra->docBlockName.at(1)='}';
- }
- yyextra->fullArgString+=yytext;
- BEGIN(CopyArgVerbatim);
+ if (yyextra->lastCopyArgChar!=0)
+ unput(yyextra->lastCopyArgChar);
+ BEGIN( yyextra->lastCommentInArgContext );
+ }
+<CopyArgCommentLine>{CMD}("verbatim"|"latexonly"|"htmlonly"|"xmlonly"|"manonly"|"rtfonly"|"docbookonly"|"dot"|"code")/[^a-z_A-Z0-9\-] { // verbatim command (which could contain nested comments!)
+ yyextra->docBlockName=&yytext[1];
+ yyextra->fullArgString+=yytext;
+ BEGIN(CopyArgVerbatim);
+ }
+<CopyArgCommentLine>{CMD}("f$"|"f["|"f{") {
+ yyextra->docBlockName=&yytext[1];
+ if (yyextra->docBlockName.at(1)=='[')
+ {
+ yyextra->docBlockName.at(1)='}';
+ }
+ if (yyextra->docBlockName.at(1)=='{')
+ {
+ yyextra->docBlockName.at(1)='}';
+ }
+ yyextra->fullArgString+=yytext;
+ BEGIN(CopyArgVerbatim);
}
<CopyArgVerbatim>[\\@]("endverbatim"|"endlatexonly"|"endhtmlonly"|"endxmlonly"|"enddocbookonly"|"endmanonly"|"endrtfonly"|"enddot"|"endcode"|"f$"|"f]"|"f}")/[^a-z_A-Z0-9\-] { // end of verbatim block
- yyextra->fullArgString+=yytext;
- if (yytext[1]=='f') // end of formula
- {
- BEGIN(CopyArgCommentLine);
- }
- if (&yytext[4]==yyextra->docBlockName)
- {
- BEGIN(CopyArgCommentLine);
- }
- }
-<CopyArgCommentLine>[^\\\@\n]+ { yyextra->fullArgString+=yytext; }
-<CopyArgCommentLine>. { yyextra->fullArgString+=*yytext; }
-<CopyArgComment,CopyArgVerbatim>\n { yyextra->fullArgString+=*yytext; lineCount(yyscanner); }
-<CopyArgComment,CopyArgVerbatim>. { yyextra->fullArgString+=*yytext; }
+ yyextra->fullArgString+=yytext;
+ if (yytext[1]=='f') // end of formula
+ {
+ BEGIN(CopyArgCommentLine);
+ }
+ if (&yytext[4]==yyextra->docBlockName)
+ {
+ BEGIN(CopyArgCommentLine);
+ }
+ }
+<CopyArgCommentLine>[^\\\@\n]+ { yyextra->fullArgString+=yytext; }
+<CopyArgCommentLine>. { yyextra->fullArgString+=*yytext; }
+<CopyArgComment,CopyArgVerbatim>\n { yyextra->fullArgString+=*yytext; lineCount(yyscanner); }
+<CopyArgComment,CopyArgVerbatim>. { yyextra->fullArgString+=*yytext; }
<CopyArgComment>{CMD}("brief"|"short"){B}+ {
- warn(yyextra->yyFileName,yyextra->yyLineNr,
- "Ignoring %cbrief command inside argument documentation",*yytext
- );
+ warn(yyextra->yyFileName,yyextra->yyLineNr,
+ "Ignoring %cbrief command inside argument documentation",*yytext
+ );
yyextra->fullArgString+=' ';
}
-<ReadTempArgs>"<" {
- *yyextra->copyArgString+=*yytext;
- yyextra->fullArgString+=*yytext;
- yyextra->argSharpCount=1;
- BEGIN( CopyArgSharp );
- }
-<ReadTempArgs>">" {
- *yyextra->copyArgString+=*yytext;
- yyextra->fullArgString+=*yytext;
- //printf("end template list '%s'\n",yyextra->copyArgString->data());
+<ReadTempArgs>"<" {
+ *yyextra->copyArgString+=*yytext;
+ yyextra->fullArgString+=*yytext;
+ yyextra->argSharpCount=1;
+ BEGIN( CopyArgSharp );
+ }
+<ReadTempArgs>">" {
+ *yyextra->copyArgString+=*yytext;
+ yyextra->fullArgString+=*yytext;
+ //printf("end template list '%s'\n",yyextra->copyArgString->data());
*yyextra->currentArgumentList = *stringToArgumentList(yyextra->language, yyextra->fullArgString);
- BEGIN( yyextra->currentArgumentContext );
- }
-<CopyArgRound>"(" {
- yyextra->argRoundCount++;
- *yyextra->copyArgString+=*yytext;
- yyextra->fullArgString+=*yytext;
- }
-<CopyArgRound>")" {
- *yyextra->copyArgString+=*yytext;
- yyextra->fullArgString+=*yytext;
- if (yyextra->argRoundCount>0)
- yyextra->argRoundCount--;
- else
- BEGIN( yyextra->lastCopyArgContext );
- }
+ BEGIN( yyextra->currentArgumentContext );
+ }
+<CopyArgRound>"(" {
+ yyextra->argRoundCount++;
+ *yyextra->copyArgString+=*yytext;
+ yyextra->fullArgString+=*yytext;
+ }
+<CopyArgRound>")" {
+ *yyextra->copyArgString+=*yytext;
+ yyextra->fullArgString+=*yytext;
+ if (yyextra->argRoundCount>0)
+ yyextra->argRoundCount--;
+ else
+ BEGIN( yyextra->lastCopyArgContext );
+ }
<CopyArgSharp>"(" {
- *yyextra->copyArgString+=*yytext;
- yyextra->fullArgString+=*yytext;
- yyextra->argRoundCount=0;
- yyextra->lastCopyArgContext = YY_START;
- BEGIN( CopyArgRound );
- }
-<CopyArgSharp>"<" {
- yyextra->argSharpCount++;
- //printf("yyextra->argSharpCount++=%d copy\n",yyextra->argSharpCount);
- *yyextra->copyArgString+=*yytext;
- yyextra->fullArgString+=*yytext;
- }
-<CopyArgSharp>">" {
- *yyextra->copyArgString+=*yytext;
- yyextra->fullArgString+=*yytext;
- yyextra->argSharpCount--;
- if (yyextra->argSharpCount>0)
- {
- //printf("yyextra->argSharpCount--=%d copy\n",yyextra->argSharpCount);
- }
- else
- {
- BEGIN( ReadTempArgs );
- //printf("end of yyextra->argSharpCount\n");
- }
- }
-<CopyArgString,CopyArgPHPString>\\. {
- *yyextra->copyArgString+=yytext;
- yyextra->fullArgString+=yytext;
- }
-<CopyArgString>\" {
- *yyextra->copyArgString+=*yytext;
- yyextra->fullArgString+=*yytext;
- BEGIN( yyextra->lastCopyArgStringContext );
- }
-<CopyArgPHPString>\' {
- *yyextra->copyArgString+=*yytext;
- yyextra->fullArgString+=*yytext;
- BEGIN( yyextra->lastCopyArgStringContext );
- }
-<ReadFuncArgType,ReadTempArgs,CopyArgRound,CopyArgSharp>{CHARLIT} {
+ *yyextra->copyArgString+=*yytext;
+ yyextra->fullArgString+=*yytext;
+ yyextra->argRoundCount=0;
+ yyextra->lastCopyArgContext = YY_START;
+ BEGIN( CopyArgRound );
+ }
+<CopyArgSharp>"<" {
+ yyextra->argSharpCount++;
+ //printf("yyextra->argSharpCount++=%d copy\n",yyextra->argSharpCount);
+ *yyextra->copyArgString+=*yytext;
+ yyextra->fullArgString+=*yytext;
+ }
+<CopyArgSharp>">" {
+ *yyextra->copyArgString+=*yytext;
+ yyextra->fullArgString+=*yytext;
+ yyextra->argSharpCount--;
+ if (yyextra->argSharpCount>0)
+ {
+ //printf("yyextra->argSharpCount--=%d copy\n",yyextra->argSharpCount);
+ }
+ else
+ {
+ BEGIN( ReadTempArgs );
+ //printf("end of yyextra->argSharpCount\n");
+ }
+ }
+<CopyArgString,CopyArgPHPString>\\. {
+ *yyextra->copyArgString+=yytext;
+ yyextra->fullArgString+=yytext;
+ }
+<CopyArgString>\" {
+ *yyextra->copyArgString+=*yytext;
+ yyextra->fullArgString+=*yytext;
+ BEGIN( yyextra->lastCopyArgStringContext );
+ }
+<CopyArgPHPString>\' {
+ *yyextra->copyArgString+=*yytext;
+ yyextra->fullArgString+=*yytext;
+ BEGIN( yyextra->lastCopyArgStringContext );
+ }
+<ReadFuncArgType,ReadTempArgs,CopyArgRound,CopyArgSharp>{CHARLIT} {
if (yyextra->insidePHP)
- {
- REJECT;
- }
- else
- {
- *yyextra->copyArgString+=yytext;
- yyextra->fullArgString+=yytext;
- }
- }
-<ReadFuncArgType,ReadTempArgs,CopyArgRound,CopyArgSharp>\' {
- *yyextra->copyArgString+=yytext;
- yyextra->fullArgString+=yytext;
- if (yyextra->insidePHP)
- {
- yyextra->lastCopyArgStringContext=YY_START;
- BEGIN(CopyArgPHPString);
- }
- }
-<ReadFuncArgType,ReadTempArgs,CopyArgString,CopyArgPHPString,CopyArgRound,CopyArgSharp>\n {
+ {
+ REJECT;
+ }
+ else
+ {
+ *yyextra->copyArgString+=yytext;
+ yyextra->fullArgString+=yytext;
+ }
+ }
+<ReadFuncArgType,ReadTempArgs,CopyArgRound,CopyArgSharp>\' {
+ *yyextra->copyArgString+=yytext;
+ yyextra->fullArgString+=yytext;
+ if (yyextra->insidePHP)
+ {
+ yyextra->lastCopyArgStringContext=YY_START;
+ BEGIN(CopyArgPHPString);
+ }
+ }
+<ReadFuncArgType,ReadTempArgs,CopyArgString,CopyArgPHPString,CopyArgRound,CopyArgSharp>\n {
lineCount(yyscanner);
- *yyextra->copyArgString+=*yytext;
- yyextra->fullArgString+=*yytext;
- }
-<ReadFuncArgType,ReadTempArgs,CopyArgString,CopyArgPHPString,CopyArgRound,CopyArgSharp>. {
- *yyextra->copyArgString+=*yytext;
- yyextra->fullArgString+=*yytext;
- }
+ *yyextra->copyArgString+=*yytext;
+ yyextra->fullArgString+=*yytext;
+ }
+<ReadFuncArgType,ReadTempArgs,CopyArgString,CopyArgPHPString,CopyArgRound,CopyArgSharp>. {
+ *yyextra->copyArgString+=*yytext;
+ yyextra->fullArgString+=*yytext;
+ }
/*------------------------------------------------------------------------*/
-<FuncRound>"(" { yyextra->current->args += *yytext ;
- ++yyextra->roundCount ;
- }
-<FuncRound>")" { yyextra->current->args += *yytext ;
- if ( yyextra->roundCount )
- --yyextra->roundCount ;
- else
- BEGIN( FuncQual ) ;
- }
+<FuncRound>"(" { yyextra->current->args += *yytext ;
+ ++yyextra->roundCount ;
+ }
+<FuncRound>")" { yyextra->current->args += *yytext ;
+ if ( yyextra->roundCount )
+ --yyextra->roundCount ;
+ else
+ BEGIN( FuncQual ) ;
+ }
/*
-<FuncQual>"#" { if (yyextra->insidePHP)
- REJECT;
- yyextra->lastCPPContext = YY_START;
- BEGIN(SkipCPP);
- }
+<FuncQual>"#" { if (yyextra->insidePHP)
+ REJECT;
+ yyextra->lastCPPContext = YY_START;
+ BEGIN(SkipCPP);
+ }
*/
<FuncQual>[{:;,] {
- if ( qstrcmp(yytext,";")==0 &&
- yyextra->insidePHP &&
- !containsWord(yyextra->current->type,"function") )
+ if ( qstrcmp(yytext,";")==0 &&
+ yyextra->insidePHP &&
+ !containsWord(yyextra->current->type,"function") )
{
yyextra->current->reset();
initEntry(yyscanner);
@@ -4499,54 +4515,54 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
}
}
<FuncQual>{BN}*"abstract"{BN}* { // pure virtual member function
- lineCount(yyscanner) ;
+ lineCount(yyscanner) ;
yyextra->current->virt = Pure;
- yyextra->current->args += " override ";
+ yyextra->current->args += " override ";
}
<FuncQual,TrailingReturn>{BN}*"override"{BN}* { // C++11 overridden virtual member function
- lineCount(yyscanner) ;
+ lineCount(yyscanner) ;
yyextra->current->spec |= Entry::Override;
- yyextra->current->args += " override ";
+ yyextra->current->args += " override ";
BEGIN(FuncQual);
}
<FuncQual,TrailingReturn>{BN}*"final"{BN}* { // C++11 final method
- lineCount(yyscanner) ;
+ lineCount(yyscanner) ;
yyextra->current->spec |= Entry::Final;
- yyextra->current->args += " final ";
+ yyextra->current->args += " final ";
BEGIN(FuncQual);
}
<FuncQual>{BN}*"sealed"{BN}* { // sealed member function
- lineCount(yyscanner) ;
+ lineCount(yyscanner) ;
yyextra->current->spec |= Entry::Sealed;
- yyextra->current->args += " sealed ";
+ yyextra->current->args += " sealed ";
}
<FuncQual>{BN}*"new"{BN}* { // new member function
- lineCount(yyscanner) ;
+ lineCount(yyscanner) ;
yyextra->current->spec |= Entry::New;
- yyextra->current->args += " new ";
- }
-<FuncQual>{BN}*"const"{BN}* { // const member function
- lineCount(yyscanner) ;
- yyextra->current->args += " const ";
- yyextra->current->argList.setConstSpecifier(TRUE);
- }
-<FuncQual>{BN}*"volatile"{BN}* { // volatile member function
- lineCount(yyscanner) ;
- yyextra->current->args += " volatile ";
- yyextra->current->argList.setVolatileSpecifier(TRUE);
- }
-<FuncQual>{BN}*"noexcept"{BN}* { // noexcept qualifier
- lineCount(yyscanner) ;
- yyextra->current->args += " noexcept ";
- yyextra->current->spec |= Entry::NoExcept;
- }
-<FuncQual>{BN}*"noexcept"{BN}*"(" { // noexcept expression
- lineCount(yyscanner) ;
- yyextra->current->args += " noexcept(";
- yyextra->current->spec |= Entry::NoExcept;
- yyextra->lastRoundContext=FuncQual;
- yyextra->pCopyRoundString=&yyextra->current->args;
- yyextra->roundCount=0;
+ yyextra->current->args += " new ";
+ }
+<FuncQual>{BN}*"const"{BN}* { // const member function
+ lineCount(yyscanner) ;
+ yyextra->current->args += " const ";
+ yyextra->current->argList.setConstSpecifier(TRUE);
+ }
+<FuncQual>{BN}*"volatile"{BN}* { // volatile member function
+ lineCount(yyscanner) ;
+ yyextra->current->args += " volatile ";
+ yyextra->current->argList.setVolatileSpecifier(TRUE);
+ }
+<FuncQual>{BN}*"noexcept"{BN}* { // noexcept qualifier
+ lineCount(yyscanner) ;
+ yyextra->current->args += " noexcept ";
+ yyextra->current->spec |= Entry::NoExcept;
+ }
+<FuncQual>{BN}*"noexcept"{BN}*"(" { // noexcept expression
+ lineCount(yyscanner) ;
+ yyextra->current->args += " noexcept(";
+ yyextra->current->spec |= Entry::NoExcept;
+ yyextra->lastRoundContext=FuncQual;
+ yyextra->pCopyRoundString=&yyextra->current->args;
+ yyextra->roundCount=0;
BEGIN(CopyRound);
}
<FuncQual>{BN}*"&" {
@@ -4558,36 +4574,57 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
yyextra->current->argList.setRefQualifier(RefQualifierRValue);
}
-<FuncQual,TrailingReturn>{BN}*"="{BN}*"0"{BN}* { // pure virtual member function
- lineCount(yyscanner) ;
- yyextra->current->args += " = 0";
- yyextra->current->virt = Pure;
- yyextra->current->argList.setPureSpecifier(TRUE);
+<FuncQual,TrailingReturn>{BN}*"="{BN}*"0"{BN}* { // pure virtual member function
+ lineCount(yyscanner) ;
+ yyextra->current->args += " = 0";
+ yyextra->current->virt = Pure;
+ yyextra->current->argList.setPureSpecifier(TRUE);
BEGIN(FuncQual);
- }
+ }
<FuncQual,TrailingReturn>{BN}*"="{BN}*"delete"{BN}* { // C++11 explicitly delete member
lineCount(yyscanner);
yyextra->current->args += " = delete";
- yyextra->current->spec |= Entry::Delete;
- yyextra->current->argList.setIsDeleted(TRUE);
+ yyextra->current->spec |= Entry::Delete;
+ yyextra->current->argList.setIsDeleted(TRUE);
BEGIN(FuncQual);
}
<FuncQual,TrailingReturn>{BN}*"="{BN}*"default"{BN}* { // C++11 explicitly defaulted constructor/assignment operator
lineCount(yyscanner);
yyextra->current->args += " = default";
- yyextra->current->spec |= Entry::Default;
+ yyextra->current->spec |= Entry::Default;
BEGIN(FuncQual);
}
<FuncQual>{BN}*"->"{BN}* {
lineCount(yyscanner);
yyextra->current->argList.setTrailingReturnType(" -> ");
yyextra->current->args += " -> ";
+ yyextra->roundCount=0;
BEGIN(TrailingReturn);
}
<TrailingReturn>[{;] {
+ if (yyextra->roundCount>0) REJECT;
unput(*yytext);
BEGIN(FuncQual);
}
+<TrailingReturn>"(" {
+ yyextra->roundCount++;
+ yyextra->current->argList.setTrailingReturnType(yyextra->current->argList.trailingReturnType()+yytext);
+ yyextra->current->args+=yytext;
+ }
+<TrailingReturn>")" {
+ if (yyextra->roundCount>0)
+ {
+ yyextra->roundCount--;
+ }
+ else
+ {
+ warn(yyextra->yyFileName,yyextra->yyLineNr,
+ "Found ')' without opening '(' for trailing return type '%s)...'",
+ yyextra->current->argList.trailingReturnType().data());
+ }
+ yyextra->current->argList.setTrailingReturnType(yyextra->current->argList.trailingReturnType()+yytext);
+ yyextra->current->args+=yytext;
+ }
<TrailingReturn>. {
yyextra->current->argList.setTrailingReturnType(yyextra->current->argList.trailingReturnType()+yytext);
yyextra->current->args+=yytext;
@@ -4597,207 +4634,207 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
yyextra->current->argList.setTrailingReturnType(yyextra->current->argList.trailingReturnType()+yytext);
yyextra->current->args+=' ';
}
-<FuncRound,FuncFunc>{BN}*","{BN}* {
- lineCount(yyscanner) ;
- yyextra->current->args += ", " ;
- }
-<FuncQual,FuncRound,FuncFunc>{BN}+ {
- lineCount(yyscanner) ;
- yyextra->current->args += ' ' ;
- }
+<FuncRound,FuncFunc>{BN}*","{BN}* {
+ lineCount(yyscanner) ;
+ yyextra->current->args += ", " ;
+ }
+<FuncQual,FuncRound,FuncFunc>{BN}+ {
+ lineCount(yyscanner) ;
+ yyextra->current->args += ' ' ;
+ }
<Function,FuncQual,FuncRound,FuncFunc>"#" { if (yyextra->insidePHP)
- REJECT;
- yyextra->lastCPPContext = YY_START;
- BEGIN(SkipCPP);
- }
-<FuncQual>"=" {
- if (yyextra->insideCli &&
- (yyextra->current_root->section&Entry::COMPOUND_MASK)
- )
- {
- BEGIN(CliOverride);
- }
- else
- {
+ REJECT;
+ yyextra->lastCPPContext = YY_START;
+ BEGIN(SkipCPP);
+ }
+<FuncQual>"=" {
+ if (yyextra->insideCli &&
+ (yyextra->current_root->section&Entry::COMPOUND_MASK)
+ )
+ {
+ BEGIN(CliOverride);
+ }
+ else
+ {
// typically an initialized function pointer
- yyextra->lastInitializerContext=YY_START;
- yyextra->initBracketCount=0;
+ yyextra->lastInitializerContext=YY_START;
+ yyextra->initBracketCount=0;
yyextra->current->initializer = yytext;
- BEGIN(ReadInitializer);
- }
- }
-<CliOverride>{ID} {
- }
-<CliOverride>"{" {
- unput(*yytext);
- BEGIN(FuncQual);
- }
-<CliOverride>\n {
+ BEGIN(ReadInitializer);
+ }
+ }
+<CliOverride>{ID} {
+ }
+<CliOverride>"{" {
+ unput(*yytext);
+ BEGIN(FuncQual);
+ }
+<CliOverride>\n {
lineCount(yyscanner);
- }
-<CliOverride>. {
- }
-<FuncPtrInit>[{;] {
- unput(*yytext);
- BEGIN(FuncQual);
- }
-<FuncPtrInit>\" {
- yyextra->current->args += *yytext;
- yyextra->pCopyQuotedString=&yyextra->current->args;
- yyextra->lastStringContext=FuncPtrInit;
- BEGIN(CopyString);
- }
-<FuncPtrInit>\' {
- yyextra->current->args += *yytext;
- if (yyextra->insidePHP)
- {
- yyextra->pCopyQuotedString=&yyextra->current->args;
- yyextra->lastStringContext=FuncPtrInit;
- BEGIN(CopyPHPString);
- }
- }
-<FuncPtrInit>{CHARLIT} {
+ }
+<CliOverride>. {
+ }
+<FuncPtrInit>[{;] {
+ unput(*yytext);
+ BEGIN(FuncQual);
+ }
+<FuncPtrInit>\" {
+ yyextra->current->args += *yytext;
+ yyextra->pCopyQuotedString=&yyextra->current->args;
+ yyextra->lastStringContext=FuncPtrInit;
+ BEGIN(CopyString);
+ }
+<FuncPtrInit>\' {
+ yyextra->current->args += *yytext;
if (yyextra->insidePHP)
- {
- REJECT;
- }
- else
- {
- yyextra->current->args += yytext;
- }
- }
-<FuncPtrInit>{ID} {
- yyextra->current->args += yytext;
- }
-<FuncPtrInit>. {
- yyextra->current->args += *yytext;
- }
-<FuncPtrInit>\n {
- yyextra->current->args += *yytext;
+ {
+ yyextra->pCopyQuotedString=&yyextra->current->args;
+ yyextra->lastStringContext=FuncPtrInit;
+ BEGIN(CopyPHPString);
+ }
+ }
+<FuncPtrInit>{CHARLIT} {
+ if (yyextra->insidePHP)
+ {
+ REJECT;
+ }
+ else
+ {
+ yyextra->current->args += yytext;
+ }
+ }
+<FuncPtrInit>{ID} {
+ yyextra->current->args += yytext;
+ }
+<FuncPtrInit>. {
+ yyextra->current->args += *yytext;
+ }
+<FuncPtrInit>\n {
+ yyextra->current->args += *yytext;
lineCount(yyscanner);
- }
-<FuncQual>{ID} { // typically a K&R style C function
+ }
+<FuncQual>{ID} { // typically a K&R style C function
if (yyextra->insideCS && qstrcmp(yytext,"where")==0)
- {
- // type constraint for a method
- yyextra->current->typeConstr.clear();
- yyextra->current->typeConstr.push_back(Argument());
- yyextra->lastCSConstraint = YY_START;
- BEGIN( CSConstraintName );
- }
- else if (checkForKnRstyleC(yyscanner))
- {
- yyextra->current->args = yytext;
- yyextra->oldStyleArgType.resize(0);
- BEGIN(OldStyleArgs);
- }
- else
- {
- yyextra->current->args += yytext;
- }
- }
-<OldStyleArgs>[,;] {
- QCString oldStyleArgPtr;
- QCString oldStyleArgName;
- splitKnRArg(yyscanner,oldStyleArgPtr,oldStyleArgName);
- QCString doc,brief;
- if (yyextra->current->doc!=yyextra->docBackup)
- {
+ {
+ // type constraint for a method
+ yyextra->current->typeConstr.clear();
+ yyextra->current->typeConstr.push_back(Argument());
+ yyextra->lastCSConstraint = YY_START;
+ BEGIN( CSConstraintName );
+ }
+ else if (checkForKnRstyleC(yyscanner))
+ {
+ yyextra->current->args = yytext;
+ yyextra->oldStyleArgType.resize(0);
+ BEGIN(OldStyleArgs);
+ }
+ else
+ {
+ yyextra->current->args += yytext;
+ }
+ }
+<OldStyleArgs>[,;] {
+ QCString oldStyleArgPtr;
+ QCString oldStyleArgName;
+ splitKnRArg(yyscanner,oldStyleArgPtr,oldStyleArgName);
+ QCString doc,brief;
+ if (yyextra->current->doc!=yyextra->docBackup)
+ {
doc=yyextra->current->doc.copy();
- yyextra->current->doc=yyextra->docBackup;
- }
- if (yyextra->current->brief!=yyextra->briefBackup)
- {
+ yyextra->current->doc=yyextra->docBackup;
+ }
+ if (yyextra->current->brief!=yyextra->briefBackup)
+ {
brief=yyextra->current->brief.copy();
- yyextra->current->brief=yyextra->briefBackup;
- }
- addKnRArgInfo(yyscanner,yyextra->oldStyleArgType+oldStyleArgPtr,
- oldStyleArgName,brief,doc);
- yyextra->current->args.resize(0);
- if (*yytext==';') yyextra->oldStyleArgType.resize(0);
- }
-<OldStyleArgs>{ID} { yyextra->current->args += yytext; }
-<OldStyleArgs>"{" {
+ yyextra->current->brief=yyextra->briefBackup;
+ }
+ addKnRArgInfo(yyscanner,yyextra->oldStyleArgType+oldStyleArgPtr,
+ oldStyleArgName,brief,doc);
+ yyextra->current->args.resize(0);
+ if (*yytext==';') yyextra->oldStyleArgType.resize(0);
+ }
+<OldStyleArgs>{ID} { yyextra->current->args += yytext; }
+<OldStyleArgs>"{" {
if (yyextra->current->argList.empty())
{
yyextra->current->argList.setNoParameters(TRUE);
}
- yyextra->current->args = argListToString(yyextra->current->argList);
- unput('{');
- BEGIN(FuncQual);
- }
-<OldStyleArgs>. { yyextra->current->args += *yytext; }
-<FuncQual,FuncRound,FuncFunc>. { yyextra->current->args += *yytext; }
-<FuncQual>{BN}*"try:" |
-<FuncQual>{BN}*"try"{BN}+ { /* try-function-block */
- yyextra->insideTryBlock=TRUE;
- lineCount(yyscanner);
- if (yytext[yyleng-1]==':')
- {
- unput(':');
- BEGIN( Function );
- }
- }
-<FuncQual>{BN}*"throw"{BN}*"(" { // C++ style throw clause
- yyextra->current->exception = " throw (" ;
- yyextra->roundCount=0;
- lineCount(yyscanner) ;
- BEGIN( ExcpRound ) ;
- }
+ yyextra->current->args = argListToString(yyextra->current->argList);
+ unput('{');
+ BEGIN(FuncQual);
+ }
+<OldStyleArgs>. { yyextra->current->args += *yytext; }
+<FuncQual,FuncRound,FuncFunc>. { yyextra->current->args += *yytext; }
+<FuncQual>{BN}*"try:" |
+<FuncQual>{BN}*"try"{BN}+ { /* try-function-block */
+ yyextra->insideTryBlock=TRUE;
+ lineCount(yyscanner);
+ if (yytext[yyleng-1]==':')
+ {
+ unput(':');
+ BEGIN( Function );
+ }
+ }
+<FuncQual>{BN}*"throw"{BN}*"(" { // C++ style throw clause
+ yyextra->current->exception = " throw (" ;
+ yyextra->roundCount=0;
+ lineCount(yyscanner) ;
+ BEGIN( ExcpRound ) ;
+ }
<FuncQual>{BN}*"raises"{BN}*"(" {
- yyextra->current->exception = " raises (" ;
- lineCount(yyscanner) ;
- yyextra->roundCount=0;
- BEGIN( ExcpRound ) ;
- }
-<FuncQual>{BN}*"throws"{BN}+ { // Java style throw clause
- yyextra->current->exception = " throws " ;
- lineCount(yyscanner) ;
- BEGIN( ExcpList );
- }
-<ExcpRound>"(" { yyextra->current->exception += *yytext ;
- ++yyextra->roundCount ;
- }
-<ExcpRound>")" { yyextra->current->exception += *yytext ;
- if ( yyextra->roundCount )
- --yyextra->roundCount ;
- else
- BEGIN( FuncQual ) ;
- }
-<ExcpRound>. {
- yyextra->current->exception += *yytext;
- }
-<ExcpList>"{" {
- unput('{'); BEGIN( FuncQual );
- }
-<ExcpList>";" {
- unput(';'); BEGIN( FuncQual );
- }
-<ExcpList>"\n" {
- yyextra->current->exception += ' ';
+ yyextra->current->exception = " raises (" ;
+ lineCount(yyscanner) ;
+ yyextra->roundCount=0;
+ BEGIN( ExcpRound ) ;
+ }
+<FuncQual>{BN}*"throws"{BN}+ { // Java style throw clause
+ yyextra->current->exception = " throws " ;
+ lineCount(yyscanner) ;
+ BEGIN( ExcpList );
+ }
+<ExcpRound>"(" { yyextra->current->exception += *yytext ;
+ ++yyextra->roundCount ;
+ }
+<ExcpRound>")" { yyextra->current->exception += *yytext ;
+ if ( yyextra->roundCount )
+ --yyextra->roundCount ;
+ else
+ BEGIN( FuncQual ) ;
+ }
+<ExcpRound>. {
+ yyextra->current->exception += *yytext;
+ }
+<ExcpList>"{" {
+ unput('{'); BEGIN( FuncQual );
+ }
+<ExcpList>";" {
+ unput(';'); BEGIN( FuncQual );
+ }
+<ExcpList>"\n" {
+ yyextra->current->exception += ' ';
lineCount(yyscanner);
- }
-<ExcpList>. {
- yyextra->current->exception += *yytext;
- }
-<Function>"(" { yyextra->current->type += yyextra->current->name ;
- yyextra->current->name = yyextra->current->args ;
- yyextra->current->args = yytext ;
- yyextra->roundCount=0;
- BEGIN( FuncRound ) ;
- }
-<Function>":" {
- if (!yyextra->insidePHP) BEGIN(SkipInits);
- }
-<Function>[;{,] {
- yyextra->current->name=yyextra->current->name.simplifyWhiteSpace();
- yyextra->current->type=yyextra->current->type.simplifyWhiteSpace();
- yyextra->current->args=removeRedundantWhiteSpace(yyextra->current->args);
- // was: yyextra->current->args.simplifyWhiteSpace();
- yyextra->current->fileName = yyextra->yyFileName;
- yyextra->current->startLine = yyextra->yyBegLineNr;
- yyextra->current->startColumn = yyextra->yyBegColNr;
- static QRegExp re("([^)]*[*&][^)]*)"); // (...*...)
+ }
+<ExcpList>. {
+ yyextra->current->exception += *yytext;
+ }
+<Function>"(" { yyextra->current->type += yyextra->current->name ;
+ yyextra->current->name = yyextra->current->args ;
+ yyextra->current->args = yytext ;
+ yyextra->roundCount=0;
+ BEGIN( FuncRound ) ;
+ }
+<Function>":" {
+ if (!yyextra->insidePHP) BEGIN(SkipInits);
+ }
+<Function>[;{,] {
+ yyextra->current->name=yyextra->current->name.simplifyWhiteSpace();
+ yyextra->current->type=yyextra->current->type.simplifyWhiteSpace();
+ yyextra->current->args=removeRedundantWhiteSpace(yyextra->current->args);
+ // was: yyextra->current->args.simplifyWhiteSpace();
+ yyextra->current->fileName = yyextra->yyFileName;
+ yyextra->current->startLine = yyextra->yyBegLineNr;
+ yyextra->current->startColumn = yyextra->yyBegColNr;
+ static QRegExp re("([^)]*[*&][^)]*)"); // (...*...)
int ts=yyextra->current->type.find('<');
int te=yyextra->current->type.findRev('>');
int ti=yyextra->current->type.find(re,0);
@@ -4806,117 +4843,117 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
bool isFunction = ti==-1 || // not a (...*...) pattern
(ts!=-1 && ts<te && ts<ti && ti<te); // (...*...) is part of a template argument list
bool isVariable = (!yyextra->current->type.isEmpty() &&
- (!isFunction || yyextra->current->type.left(8)=="typedef "));
+ (!isFunction || yyextra->current->type.left(8)=="typedef "));
//printf("type=%s ts=%d te=%d ti=%d isFunction=%d\n",
// yyextra->current->type.data(),ts,te,ti,isFunction);
- if (*yytext!=';' || (yyextra->current_root->section&Entry::COMPOUND_MASK) )
- {
- int tempArg=yyextra->current->name.find('<');
- QCString tempName;
- if (tempArg==-1) tempName=yyextra->current->name; else tempName=yyextra->current->name.left(tempArg);
- if (isVariable)
- {
- //printf("Scanner.l: found in class variable: '%s' '%s' '%s'\n", yyextra->current->type.data(),yyextra->current->name.data(),yyextra->current->args.data());
- if (yyextra->isTypedef && yyextra->current->type.left(8)!="typedef ")
- {
- yyextra->current->type.prepend("typedef ");
- }
- yyextra->current->section = Entry::VARIABLE_SEC ;
- }
- else
- {
- //printf("Scanner.l: found in class function: '%s' '%s' '%s'\n", yyextra->current->type.data(),yyextra->current->name.data(),yyextra->current->args.data());
- yyextra->current->section = Entry::FUNCTION_SEC ;
- yyextra->current->proto = *yytext==';';
- }
- }
- else // a global function prototype or function variable
- {
- //printf("Scanner.l: prototype? type='%s' name='%s' args='%s'\n",yyextra->current->type.data(),yyextra->current->name.data(),yyextra->current->args.data());
- if (isVariable)
- {
- if (yyextra->isTypedef && yyextra->current->type.left(8)!="typedef ")
- {
- yyextra->current->type.prepend("typedef ");
- }
- //printf("Scanner.l: found function variable!\n");
- yyextra->current->section = Entry::VARIABLE_SEC;
- }
- else
- {
- //printf("Scanner.l: found prototype\n");
- yyextra->current->section = Entry::FUNCTION_SEC;
- yyextra->current->proto = TRUE;
- }
- }
- //printf("Adding entry '%s'\n",yyextra->current->name.data());
- if ( yyextra->insidePHP)
- {
- if (findAndRemoveWord(yyextra->current->type,"final"))
- {
- yyextra->current->spec |= Entry::Final;
- }
- if (findAndRemoveWord(yyextra->current->type,"abstract"))
- {
- yyextra->current->spec |= Entry::Abstract;
- }
- }
- if ( yyextra->insidePHP && !containsWord(yyextra->current->type,"function"))
- {
- initEntry(yyscanner);
- if ( *yytext == '{' )
- {
- yyextra->lastCurlyContext = FindMembers;
- yyextra->curlyCount=0;
- BEGIN( SkipCurly );
- }
- else
- {
- BEGIN( FindMembers );
- }
- }
- else
- {
- if ( yyextra->insidePHP)
- {
- findAndRemoveWord(yyextra->current->type,"function");
- }
- yyextra->previous = yyextra->current;
- yyextra->current_root->moveToSubEntryAndRefresh(yyextra->current);
- initEntry(yyscanner);
- // Objective C 2.0: Required/Optional section
- if (yyextra->previous->spec & (Entry::Optional | Entry::Required))
- {
- yyextra->current->spec |= yyextra->previous->spec & (Entry::Optional|Entry::Required);
- }
- yyextra->lastCurlyContext = FindMembers;
- if ( *yytext == ',' )
- {
- yyextra->current->type = yyextra->previous->type;
- // we need to strip any trailing * and & (see bugs 623023 and 649103 for test cases)
- int i=yyextra->current->type.length();
- while (i>0 && (yyextra->current->type[i-1]=='*' || yyextra->current->type[i-1]=='&' || yyextra->current->type[i-1]==' ')) i--;
- yyextra->current->type = yyextra->current->type.left(i);
- }
- if ( *yytext == '{' )
- {
- if ( !yyextra->insidePHP && (yyextra->current_root->section & Entry::COMPOUND_MASK) )
- {
- yyextra->previous->spec |= Entry::Inline;
- }
- //addToBody(yytext);
- yyextra->curlyCount=0;
- BEGIN( SkipCurly ) ;
- }
- else
- {
- if (yyextra->previous->section!=Entry::VARIABLE_SEC)
- yyextra->previous->bodyLine=-1; // a function/member declaration
- BEGIN( FindMembers ) ;
- }
- }
+ if (*yytext!=';' || (yyextra->current_root->section&Entry::COMPOUND_MASK) )
+ {
+ int tempArg=yyextra->current->name.find('<');
+ QCString tempName;
+ if (tempArg==-1) tempName=yyextra->current->name; else tempName=yyextra->current->name.left(tempArg);
+ if (isVariable)
+ {
+ //printf("Scanner.l: found in class variable: '%s' '%s' '%s'\n", yyextra->current->type.data(),yyextra->current->name.data(),yyextra->current->args.data());
+ if (yyextra->isTypedef && yyextra->current->type.left(8)!="typedef ")
+ {
+ yyextra->current->type.prepend("typedef ");
+ }
+ yyextra->current->section = Entry::VARIABLE_SEC ;
+ }
+ else
+ {
+ //printf("Scanner.l: found in class function: '%s' '%s' '%s'\n", yyextra->current->type.data(),yyextra->current->name.data(),yyextra->current->args.data());
+ yyextra->current->section = Entry::FUNCTION_SEC ;
+ yyextra->current->proto = *yytext==';';
+ }
+ }
+ else // a global function prototype or function variable
+ {
+ //printf("Scanner.l: prototype? type='%s' name='%s' args='%s'\n",yyextra->current->type.data(),yyextra->current->name.data(),yyextra->current->args.data());
+ if (isVariable)
+ {
+ if (yyextra->isTypedef && yyextra->current->type.left(8)!="typedef ")
+ {
+ yyextra->current->type.prepend("typedef ");
+ }
+ //printf("Scanner.l: found function variable!\n");
+ yyextra->current->section = Entry::VARIABLE_SEC;
+ }
+ else
+ {
+ //printf("Scanner.l: found prototype\n");
+ yyextra->current->section = Entry::FUNCTION_SEC;
+ yyextra->current->proto = TRUE;
+ }
+ }
+ //printf("Adding entry '%s'\n",yyextra->current->name.data());
+ if ( yyextra->insidePHP)
+ {
+ if (findAndRemoveWord(yyextra->current->type,"final"))
+ {
+ yyextra->current->spec |= Entry::Final;
+ }
+ if (findAndRemoveWord(yyextra->current->type,"abstract"))
+ {
+ yyextra->current->spec |= Entry::Abstract;
+ }
+ }
+ if ( yyextra->insidePHP && !containsWord(yyextra->current->type,"function"))
+ {
+ initEntry(yyscanner);
+ if ( *yytext == '{' )
+ {
+ yyextra->lastCurlyContext = FindMembers;
+ yyextra->curlyCount=0;
+ BEGIN( SkipCurly );
+ }
+ else
+ {
+ BEGIN( FindMembers );
+ }
+ }
+ else
+ {
+ if ( yyextra->insidePHP)
+ {
+ findAndRemoveWord(yyextra->current->type,"function");
+ }
+ yyextra->previous = yyextra->current;
+ yyextra->current_root->moveToSubEntryAndRefresh(yyextra->current);
+ initEntry(yyscanner);
+ // Objective C 2.0: Required/Optional section
+ if (yyextra->previous->spec & (Entry::Optional | Entry::Required))
+ {
+ yyextra->current->spec |= yyextra->previous->spec & (Entry::Optional|Entry::Required);
+ }
+ yyextra->lastCurlyContext = FindMembers;
+ if ( *yytext == ',' )
+ {
+ yyextra->current->type = yyextra->previous->type;
+ // we need to strip any trailing * and & (see bugs 623023 and 649103 for test cases)
+ int i=yyextra->current->type.length();
+ while (i>0 && (yyextra->current->type[i-1]=='*' || yyextra->current->type[i-1]=='&' || yyextra->current->type[i-1]==' ')) i--;
+ yyextra->current->type = yyextra->current->type.left(i);
+ }
+ if ( *yytext == '{' )
+ {
+ if ( !yyextra->insidePHP && (yyextra->current_root->section & Entry::COMPOUND_MASK) )
+ {
+ yyextra->previous->spec |= Entry::Inline;
+ }
+ //addToBody(yytext);
+ yyextra->curlyCount=0;
+ BEGIN( SkipCurly ) ;
+ }
+ else
+ {
+ if (yyextra->previous->section!=Entry::VARIABLE_SEC)
+ yyextra->previous->bodyLine=-1; // a function/member declaration
+ BEGIN( FindMembers ) ;
+ }
+ }
}
<SkipInits>">"{BN}*"{" { // C++11 style initializer (see bug 790788)
lineCount(yyscanner);
@@ -4932,7 +4969,7 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
++yyextra->curlyCount;
}
<SkipC11Inits>"}" {
- if ( --yyextra->curlyCount<=0 )
+ if ( --yyextra->curlyCount<=0 )
{
BEGIN(SkipInits);
}
@@ -4940,116 +4977,116 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
<SkipC11Attribute>"]]" {
BEGIN(yyextra->lastC11AttributeContext);
}
-<SkipInits>"{" { // C++11 style initializer
- unput('{');
- BEGIN( Function );
- }
-<SkipCurly>"{" {
- //addToBody(yytext);
- ++yyextra->curlyCount ;
- }
+<SkipInits>"{" { // C++11 style initializer
+ unput('{');
+ BEGIN( Function );
+ }
+<SkipCurly>"{" {
+ //addToBody(yytext);
+ ++yyextra->curlyCount ;
+ }
<SkipCurly>"}"/{BN}*("/*!"|"/**"|"//!"|"///")"<!--" | /* see bug710917 */
-<SkipCurly>"}" {
- //addToBody(yytext);
- if( yyextra->curlyCount )
- {
- --yyextra->curlyCount ;
- }
- else
- {
- if (!yyextra->current->sli.empty() && yyextra->previous) // copy special list items
- {
+<SkipCurly>"}" {
+ //addToBody(yytext);
+ if( yyextra->curlyCount )
+ {
+ --yyextra->curlyCount ;
+ }
+ else
+ {
+ if (!yyextra->current->sli.empty() && yyextra->previous) // copy special list items
+ {
yyextra->previous->sli = yyextra->current->sli;
- yyextra->current->sli.clear();
- }
- if (yyextra->previous) yyextra->previous->endBodyLine=yyextra->yyLineNr;
- BEGIN( yyextra->lastCurlyContext ) ;
- }
- }
-<SkipCurly>"}"{BN}*("/*!"|"/**"|"//!"|"///")"<" {
- lineCount(yyscanner);
- if ( yyextra->curlyCount )
- {
- //addToBody(yytext);
- --yyextra->curlyCount ;
- }
- else
- {
- yyextra->current->endBodyLine=yyextra->yyLineNr;
- yyextra->tempEntry = yyextra->current; // temporarily switch to the previous entry
- yyextra->current = yyextra->previous;
-
- yyextra->docBlockContext = SkipCurlyEndDoc;
- yyextra->docBlockInBody = FALSE;
- yyextra->docBlockAutoBrief = ( yytext[yyleng-2]=='*' && Config_getBool(JAVADOC_AUTOBRIEF) ) ||
- ( yytext[yyleng-2]=='!' && Config_getBool(QT_AUTOBRIEF) );
- yyextra->docBlock.resize(0);
- yyextra->docBlockTerm = '}';
- if (yytext[yyleng-3]=='/')
- {
- startCommentBlock(yyscanner,TRUE);
- BEGIN( DocLine );
- }
- else
- {
- startCommentBlock(yyscanner,FALSE);
- BEGIN( DocBlock );
- }
- }
- }
+ yyextra->current->sli.clear();
+ }
+ if (yyextra->previous) yyextra->previous->endBodyLine=yyextra->yyLineNr;
+ BEGIN( yyextra->lastCurlyContext ) ;
+ }
+ }
+<SkipCurly>"}"{BN}*("/*!"|"/**"|"//!"|"///")"<" {
+ lineCount(yyscanner);
+ if ( yyextra->curlyCount )
+ {
+ //addToBody(yytext);
+ --yyextra->curlyCount ;
+ }
+ else
+ {
+ yyextra->current->endBodyLine=yyextra->yyLineNr;
+ yyextra->tempEntry = yyextra->current; // temporarily switch to the previous entry
+ yyextra->current = yyextra->previous;
+
+ yyextra->docBlockContext = SkipCurlyEndDoc;
+ yyextra->docBlockInBody = FALSE;
+ yyextra->docBlockAutoBrief = ( yytext[yyleng-2]=='*' && Config_getBool(JAVADOC_AUTOBRIEF) ) ||
+ ( yytext[yyleng-2]=='!' && Config_getBool(QT_AUTOBRIEF) );
+ yyextra->docBlock.resize(0);
+ yyextra->docBlockTerm = '}';
+ if (yytext[yyleng-3]=='/')
+ {
+ startCommentBlock(yyscanner,TRUE);
+ BEGIN( DocLine );
+ }
+ else
+ {
+ startCommentBlock(yyscanner,FALSE);
+ BEGIN( DocBlock );
+ }
+ }
+ }
<SkipCurlyEndDoc>"}"{BN}*("/*!"|"/**"|"//!"|"///")"<" { // desc is followed by another one
- yyextra->docBlockContext = SkipCurlyEndDoc;
- yyextra->docBlockInBody = FALSE;
- yyextra->docBlockAutoBrief = ( yytext[yyleng-2]=='*' && Config_getBool(JAVADOC_AUTOBRIEF) ) ||
- ( yytext[yyleng-2]=='!' && Config_getBool(QT_AUTOBRIEF) );
- yyextra->docBlock.resize(0);
- yyextra->docBlockTerm = '}';
- if (yytext[yyleng-3]=='/')
- {
- startCommentBlock(yyscanner,TRUE);
- BEGIN( DocLine );
- }
- else
- {
- startCommentBlock(yyscanner,FALSE);
- BEGIN( DocBlock );
- }
- }
-<SkipCurlyEndDoc>"}" {
- //addToBody("}");
+ yyextra->docBlockContext = SkipCurlyEndDoc;
+ yyextra->docBlockInBody = FALSE;
+ yyextra->docBlockAutoBrief = ( yytext[yyleng-2]=='*' && Config_getBool(JAVADOC_AUTOBRIEF) ) ||
+ ( yytext[yyleng-2]=='!' && Config_getBool(QT_AUTOBRIEF) );
+ yyextra->docBlock.resize(0);
+ yyextra->docBlockTerm = '}';
+ if (yytext[yyleng-3]=='/')
+ {
+ startCommentBlock(yyscanner,TRUE);
+ BEGIN( DocLine );
+ }
+ else
+ {
+ startCommentBlock(yyscanner,FALSE);
+ BEGIN( DocBlock );
+ }
+ }
+<SkipCurlyEndDoc>"}" {
+ //addToBody("}");
if (yyextra->tempEntry) // we can only switch back to yyextra->current if no new item was created
- {
- yyextra->current = yyextra->tempEntry;
- yyextra->tempEntry.reset();
- }
- BEGIN( yyextra->lastCurlyContext );
- }
-<SkipCurly>\" {
- //addToBody(yytext);
- yyextra->lastStringContext=SkipCurly;
- BEGIN( SkipString );
- }
-<SkipCurly>^{B}*"#" {
- if (yyextra->insidePHP)
- REJECT;
- //addToBody(yytext);
- BEGIN( SkipCurlyCpp );
- }
-<SkipCurly,SkipC11Inits,SkipInits,SkipC11Attribute>\n {
+ {
+ yyextra->current = yyextra->tempEntry;
+ yyextra->tempEntry.reset();
+ }
+ BEGIN( yyextra->lastCurlyContext );
+ }
+<SkipCurly>\" {
+ //addToBody(yytext);
+ yyextra->lastStringContext=SkipCurly;
+ BEGIN( SkipString );
+ }
+<SkipCurly>^{B}*"#" {
+ if (yyextra->insidePHP)
+ REJECT;
+ //addToBody(yytext);
+ BEGIN( SkipCurlyCpp );
+ }
+<SkipCurly,SkipC11Inits,SkipInits,SkipC11Attribute>\n {
lineCount(yyscanner);
- //addToBody(yytext);
- }
-<SkipCurly,SkipCurlyCpp,ReadInitializer>"<<<" {
- if (!yyextra->insidePHP)
- {
- REJECT;
- }
- else
- {
+ //addToBody(yytext);
+ }
+<SkipCurly,SkipCurlyCpp,ReadInitializer,ReadInitializerPtr>"<<<" {
+ if (!yyextra->insidePHP)
+ {
+ REJECT;
+ }
+ else
+ {
yyextra->lastHereDocContext = YY_START;
- BEGIN(HereDoc);
- }
- }
+ BEGIN(HereDoc);
+ }
+ }
<SkipCurly,SkipCurlyCpp>{B}*{RAWBEGIN} {
QCString raw=QCString(yytext).stripWhiteSpace();
yyextra->delimiter = raw.data()+2;
@@ -5062,191 +5099,191 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
}
<SkipCurly,SkipCurlyCpp>[^\n#"'@\\/{}<]+ {
lineCount(yyscanner); // for yyextra->column updates
- //addToBody(yytext);
- }
-<SkipCurlyCpp>\n {
- //addToBody(yytext);
+ //addToBody(yytext);
+ }
+<SkipCurlyCpp>\n {
+ //addToBody(yytext);
lineCount(yyscanner);
- yyextra->lastCurlyContext = FindMembers;
- BEGIN( SkipCurly );
- }
-<SkipCurlyCpp>\\[\r]*"\n"[\r]* {
- //addToBody(yytext);
+ yyextra->lastCurlyContext = FindMembers;
+ BEGIN( SkipCurly );
+ }
+<SkipCurlyCpp>\\[\r]*"\n"[\r]* {
+ //addToBody(yytext);
lineCount(yyscanner);
- }
-<SkipInits,SkipC11Inits,SkipCurly,SkipCurlyCpp,SkipC11Attribute>"/*" {
- //addToBody(yytext);
- yyextra->lastCContext = YY_START;
- BEGIN(SkipComment);
- }
+ }
+<SkipInits,SkipC11Inits,SkipCurly,SkipCurlyCpp,SkipC11Attribute>"/*" {
+ //addToBody(yytext);
+ yyextra->lastCContext = YY_START;
+ BEGIN(SkipComment);
+ }
<SkipInits,SkipC11Inits,SkipCurly,SkipCurlyCpp,SkipC11Attribute>"//" {
- //addToBody(yytext);
- yyextra->lastCContext = YY_START;
- BEGIN(SkipCxxComment);
- }
+ //addToBody(yytext);
+ yyextra->lastCContext = YY_START;
+ BEGIN(SkipCxxComment);
+ }
<SkipInits,SkipC11Inits,SkipC11Attribute>"(" {
yyextra->roundCount=0;
yyextra->lastSkipRoundContext=YY_START;
BEGIN(SkipRound);
}
-<SkipInits,SkipC11Inits,SkipC11Attribute>\" {
- yyextra->lastStringContext=YY_START;
- BEGIN( SkipString );
- }
-<SkipInits>; {
- warn(yyextra->yyFileName,yyextra->yyLineNr,
- "Found ';' while parsing initializer list! "
- "(doxygen could be confused by a macro call without semicolon)"
- );
- BEGIN( FindMembers );
- }
+<SkipInits,SkipC11Inits,SkipC11Attribute>\" {
+ yyextra->lastStringContext=YY_START;
+ BEGIN( SkipString );
+ }
+<SkipInits>; {
+ warn(yyextra->yyFileName,yyextra->yyLineNr,
+ "Found ';' while parsing initializer list! "
+ "(doxygen could be confused by a macro call without semicolon)"
+ );
+ BEGIN( FindMembers );
+ }
<SkipInits,SkipCurly,SkipCurlyCpp>"#" {
- if (!yyextra->insidePHP)
- REJECT;
- //addToBody(yytext);
- yyextra->lastCContext = YY_START;
- BEGIN(SkipCxxComment);
- }
+ if (!yyextra->insidePHP)
+ REJECT;
+ //addToBody(yytext);
+ yyextra->lastCContext = YY_START;
+ BEGIN(SkipCxxComment);
+ }
<SkipInits,SkipCurly,SkipCurlyCpp>@\" {
- if (!yyextra->insideCS) REJECT;
- // C# verbatim string
- yyextra->lastSkipVerbStringContext=YY_START;
- yyextra->pSkipVerbString=&yyextra->current->initializer;
- BEGIN(SkipVerbString);
- }
-<SkipInits,SkipCurly,SkipCurlyCpp>{CHARLIT} {
+ if (!yyextra->insideCS) REJECT;
+ // C# verbatim string
+ yyextra->lastSkipVerbStringContext=YY_START;
+ yyextra->pSkipVerbString=&yyextra->current->initializer;
+ BEGIN(SkipVerbString);
+ }
+<SkipInits,SkipCurly,SkipCurlyCpp>{CHARLIT} {
if (yyextra->insidePHP) REJECT;
}
-<SkipInits,SkipCurly,SkipCurlyCpp>\' {
- if (yyextra->insidePHP)
- {
- yyextra->lastStringContext=YY_START;
- BEGIN(SkipPHPString);
- }
- }
-<SkipInits,SkipC11Inits,SkipCurly,SkipCurlyCpp,SkipC11Attribute>. { }
-<SkipString,SkipPHPString>\\. { }
-<SkipString>\" {
- BEGIN( yyextra->lastStringContext );
- }
-<SkipPHPString>\' {
- BEGIN( yyextra->lastStringContext );
- }
+<SkipInits,SkipCurly,SkipCurlyCpp>\' {
+ if (yyextra->insidePHP)
+ {
+ yyextra->lastStringContext=YY_START;
+ BEGIN(SkipPHPString);
+ }
+ }
+<SkipInits,SkipC11Inits,SkipCurly,SkipCurlyCpp,SkipC11Attribute>. { }
+<SkipString,SkipPHPString>\\. { }
+<SkipString>\" {
+ BEGIN( yyextra->lastStringContext );
+ }
+<SkipPHPString>\' {
+ BEGIN( yyextra->lastStringContext );
+ }
<SkipString,SkipPHPString>"/*"|"*/"|"//" { }
-<SkipString,SkipPHPString>\n {
+<SkipString,SkipPHPString>\n {
lineCount(yyscanner);
- }
-<SkipString,SkipPHPString>. { }
-<CompoundName>":" { // for "class : public base {} var;" construct, see bug 608359
- unput(':');
- BEGIN(ClassVar);
- }
-<CompoundName>";" {
- yyextra->current->section = Entry::EMPTY_SEC ;
- yyextra->current->type.resize(0) ;
- yyextra->current->name.resize(0) ;
- yyextra->current->args.resize(0) ;
- yyextra->current->argList.clear();
- BEGIN( FindMembers ) ;
- }
-<Bases>";" {
- if (yyextra->insideIDL && (yyextra->current->spec & (Entry::Singleton |
- Entry::Service)))
- {
- // in UNO IDL a service or singleton may be defined
- // completely like this: "service Foo : XFoo;"
- if (!yyextra->current->name.isEmpty() && !yyextra->current_root->name.isEmpty())
- {
- prependScope(yyscanner);
- }
- yyextra->current->name = yyextra->current->name.stripWhiteSpace();
- // there can be only one base class here
- if (!yyextra->baseName.isEmpty())
- {
- yyextra->current->extends.push_back(
- BaseInfo(yyextra->baseName,Public,Normal));
- yyextra->baseName.resize(0);
- }
- yyextra->current_root->moveToSubEntryAndRefresh( yyextra->current ) ;
+ }
+<SkipString,SkipPHPString>. { }
+<CompoundName>":" { // for "class : public base {} var;" construct, see bug 608359
+ unput(':');
+ BEGIN(ClassVar);
+ }
+<CompoundName>";" {
+ yyextra->current->section = Entry::EMPTY_SEC ;
+ yyextra->current->type.resize(0) ;
+ yyextra->current->name.resize(0) ;
+ yyextra->current->args.resize(0) ;
+ yyextra->current->argList.clear();
+ BEGIN( FindMembers ) ;
+ }
+<Bases>";" {
+ if (yyextra->insideIDL && (yyextra->current->spec & (Entry::Singleton |
+ Entry::Service)))
+ {
+ // in UNO IDL a service or singleton may be defined
+ // completely like this: "service Foo : XFoo;"
+ if (!yyextra->current->name.isEmpty() && !yyextra->current_root->name.isEmpty())
+ {
+ prependScope(yyscanner);
+ }
+ yyextra->current->name = yyextra->current->name.stripWhiteSpace();
+ // there can be only one base class here
+ if (!yyextra->baseName.isEmpty())
+ {
+ yyextra->current->extends.push_back(
+ BaseInfo(yyextra->baseName,Public,Normal));
+ yyextra->baseName.resize(0);
+ }
+ yyextra->current_root->moveToSubEntryAndRefresh( yyextra->current ) ;
initEntry(yyscanner);
- }
- else
- {
- yyextra->current->section = Entry::EMPTY_SEC ;
- yyextra->current->type.resize(0) ;
- yyextra->current->name.resize(0) ;
- yyextra->current->args.resize(0) ;
- yyextra->current->argList.clear();
- }
- BEGIN( FindMembers ) ;
- }
-<CompoundName>{SCOPENAME}/{BN}*"<" {
- yyextra->sharpCount = 0;
- yyextra->current->name = yytext ;
- if (yyextra->current->spec & Entry::Protocol)
- {
- yyextra->current->name+="-p";
- }
- lineCount(yyscanner);
- yyextra->lastClassTemplSpecContext = ClassVar;
- if (yyextra->insideObjC) // protocol list
- {
- BEGIN( ObjCProtocolList );
- }
- else if (yyextra->insideCS) // C# generic class
- {
+ }
+ else
+ {
+ yyextra->current->section = Entry::EMPTY_SEC ;
+ yyextra->current->type.resize(0) ;
+ yyextra->current->name.resize(0) ;
+ yyextra->current->args.resize(0) ;
+ yyextra->current->argList.clear();
+ }
+ BEGIN( FindMembers ) ;
+ }
+<CompoundName>{SCOPENAME}/{BN}*"<" {
+ yyextra->sharpCount = 0;
+ yyextra->current->name = yytext ;
+ if (yyextra->current->spec & Entry::Protocol)
+ {
+ yyextra->current->name+="-p";
+ }
+ lineCount(yyscanner);
+ yyextra->lastClassTemplSpecContext = ClassVar;
+ if (yyextra->insideObjC) // protocol list
+ {
+ BEGIN( ObjCProtocolList );
+ }
+ else if (yyextra->insideCS) // C# generic class
+ {
//yyextra->current->name+="-g";
- BEGIN( CSGeneric );
- }
- else // C++ template specialization
- {
- yyextra->roundCount=0;
- BEGIN( ClassTemplSpec );
- }
- }
-<CSGeneric>"<" {
- ArgumentList al;
- // check bug 612858 before enabling the next line
- //yyextra->current->spec |= Entry::Template;
- yyextra->current->tArgLists.push_back(al);
- yyextra->currentArgumentList = &yyextra->current->tArgLists.back();
- yyextra->templateStr="<";
- yyextra->current->name += "<";
- yyextra->fullArgString = yyextra->templateStr;
- yyextra->copyArgString = &yyextra->current->name;
- //yyextra->copyArgString = &yyextra->templateStr;
- yyextra->currentArgumentContext = ClassVar;
- BEGIN( ReadTempArgs );
- }
-<ObjCProtocolList>"<" {
- yyextra->insideProtocolList=TRUE;
- BEGIN( Bases );
- }
-<ClassTemplSpec>">"({BN}*"::"{BN}*{SCOPENAME})? {
- yyextra->current->name += yytext;
- lineCount(yyscanner);
- if (yyextra->roundCount==0 && --yyextra->sharpCount<=0)
- {
- yyextra->current->name = removeRedundantWhiteSpace(yyextra->current->name);
- if (yyextra->current->spec & Entry::Protocol)
- { // Objective-C protocol
- unput('{'); // fake start of body
- BEGIN( ClassVar );
- }
- else
- {
- BEGIN( yyextra->lastClassTemplSpecContext );
- }
- }
- }
-<ClassTemplSpec>"<" {
- yyextra->current->name += yytext;
- if (yyextra->roundCount==0) yyextra->sharpCount++;
- }
-<ClassTemplSpec>. {
- yyextra->current->name += yytext;
- }
-<CompoundName>{SCOPENAME}{BN}*";" { // forward declaration
+ BEGIN( CSGeneric );
+ }
+ else // C++ template specialization
+ {
+ yyextra->roundCount=0;
+ BEGIN( ClassTemplSpec );
+ }
+ }
+<CSGeneric>"<" {
+ ArgumentList al;
+ // check bug 612858 before enabling the next line
+ //yyextra->current->spec |= Entry::Template;
+ yyextra->current->tArgLists.push_back(al);
+ yyextra->currentArgumentList = &yyextra->current->tArgLists.back();
+ yyextra->templateStr="<";
+ yyextra->current->name += "<";
+ yyextra->fullArgString = yyextra->templateStr;
+ yyextra->copyArgString = &yyextra->current->name;
+ //yyextra->copyArgString = &yyextra->templateStr;
+ yyextra->currentArgumentContext = ClassVar;
+ BEGIN( ReadTempArgs );
+ }
+<ObjCProtocolList>"<" {
+ yyextra->insideProtocolList=TRUE;
+ BEGIN( Bases );
+ }
+<ClassTemplSpec>">"({BN}*"::"{BN}*{SCOPENAME})? {
+ yyextra->current->name += yytext;
+ lineCount(yyscanner);
+ if (yyextra->roundCount==0 && --yyextra->sharpCount<=0)
+ {
+ yyextra->current->name = removeRedundantWhiteSpace(yyextra->current->name);
+ if (yyextra->current->spec & Entry::Protocol)
+ { // Objective-C protocol
+ unput('{'); // fake start of body
+ BEGIN( ClassVar );
+ }
+ else
+ {
+ BEGIN( yyextra->lastClassTemplSpecContext );
+ }
+ }
+ }
+<ClassTemplSpec>"<" {
+ yyextra->current->name += yytext;
+ if (yyextra->roundCount==0) yyextra->sharpCount++;
+ }
+<ClassTemplSpec>. {
+ yyextra->current->name += yytext;
+ }
+<CompoundName>{SCOPENAME}{BN}*";" { // forward declaration
if (!yyextra->current->tArgLists.empty())
{
// found a forward template declaration, this has
@@ -5254,54 +5291,54 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
yyextra->current->name = yytext;
yyextra->current->name=yyextra->current->name.left(yyextra->current->name.length()-1).stripWhiteSpace();
//printf("template class declaration for %s!\n",yyextra->current->name.data());
- QCString rn = yyextra->current_root->name.copy();
- //printf("cn='%s' rn='%s' yyextra->isTypedef=%d\n",cn.data(),rn.data(),yyextra->isTypedef);
- if (!yyextra->current->name.isEmpty() && !rn.isEmpty())
- {
- prependScope(yyscanner);
- }
+ QCString rn = yyextra->current_root->name.copy();
+ //printf("cn='%s' rn='%s' yyextra->isTypedef=%d\n",cn.data(),rn.data(),yyextra->isTypedef);
+ if (!yyextra->current->name.isEmpty() && !rn.isEmpty())
+ {
+ prependScope(yyscanner);
+ }
yyextra->current->spec|=Entry::ForwardDecl;
yyextra->current_root->moveToSubEntryAndRefresh(yyextra->current);
}
- else if (yyextra->insideIDL &&
- (((yyextra->current_root->spec & (Entry::Interface |
- Entry::Service)) &&
- (yyextra->current->spec & Entry::Interface)) ||
- ((yyextra->current_root->spec & (Entry::Service |
- Entry::Singleton)) &&
- (yyextra->current->spec & Entry::Service))))
- {
- // interface yyextra->inside of UNO IDL service or interface
- // service yyextra->inside of UNO IDL service or singleton
- // there may be documentation on the member,
- // so do not throw it away...
- yyextra->current->name = yytext;
- yyextra->current->name=yyextra->current->name.left(yyextra->current->name.length()-1).stripWhiteSpace();
- yyextra->current->section = (yyextra->current->spec & Entry::Interface)
- ? Entry::EXPORTED_INTERFACE_SEC
- : Entry::INCLUDED_SERVICE_SEC;
-// yyextra->current->section = Entry::MEMBERDOC_SEC;
- yyextra->current->spec &= ~(Entry::Interface|Entry::Service); // FIXME: horrible: Interface == Gettable, so need to clear it - actually we're mixing values from different enums in this case... granted only Optional and Interface are actually valid in this context but urgh...
- yyextra->current_root->moveToSubEntryAndRefresh(yyextra->current);
- }
-
- unput(';');
- yyextra->current->reset();
- initEntry(yyscanner);
+ else if (yyextra->insideIDL &&
+ (((yyextra->current_root->spec & (Entry::Interface |
+ Entry::Service)) &&
+ (yyextra->current->spec & Entry::Interface)) ||
+ ((yyextra->current_root->spec & (Entry::Service |
+ Entry::Singleton)) &&
+ (yyextra->current->spec & Entry::Service))))
+ {
+ // interface yyextra->inside of UNO IDL service or interface
+ // service yyextra->inside of UNO IDL service or singleton
+ // there may be documentation on the member,
+ // so do not throw it away...
+ yyextra->current->name = yytext;
+ yyextra->current->name=yyextra->current->name.left(yyextra->current->name.length()-1).stripWhiteSpace();
+ yyextra->current->section = (yyextra->current->spec & Entry::Interface)
+ ? Entry::EXPORTED_INTERFACE_SEC
+ : Entry::INCLUDED_SERVICE_SEC;
+// yyextra->current->section = Entry::MEMBERDOC_SEC;
+ yyextra->current->spec &= ~(Entry::Interface|Entry::Service); // FIXME: horrible: Interface == Gettable, so need to clear it - actually we're mixing values from different enums in this case... granted only Optional and Interface are actually valid in this context but urgh...
+ yyextra->current_root->moveToSubEntryAndRefresh(yyextra->current);
+ }
+
+ unput(';');
+ yyextra->current->reset();
+ initEntry(yyscanner);
if (yyextra->insideObjC) // see bug746361
{
- yyextra->language = yyextra->current->lang = SrcLangExt_Cpp;
+ yyextra->language = yyextra->current->lang = SrcLangExt_Cpp;
yyextra->insideObjC = FALSE;
}
- if (yyextra->isTypedef) // typedef of a class, put typedef keyword back
- {
- yyextra->current->type.prepend("typedef");
- }
- BEGIN( FindMembers );
- }
-<CompoundName>{SCOPENAME}/{BN}*"(" {
- yyextra->current->name = yytext ;
- lineCount(yyscanner);
+ if (yyextra->isTypedef) // typedef of a class, put typedef keyword back
+ {
+ yyextra->current->type.prepend("typedef");
+ }
+ BEGIN( FindMembers );
+ }
+<CompoundName>{SCOPENAME}/{BN}*"(" {
+ yyextra->current->name = yytext ;
+ lineCount(yyscanner);
if (yyextra->insideCpp && yyextra->current->name=="alignas") // C++11
{
yyextra->lastAlignAsContext = YY_START;
@@ -5315,186 +5352,186 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
}
BEGIN( ClassVar );
}
- }
-<AlignAs>"(" { yyextra->roundCount=0;
- BEGIN( AlignAsEnd );
+ }
+<AlignAs>"(" { yyextra->roundCount=0;
+ BEGIN( AlignAsEnd );
}
<AlignAs>\n { lineCount(yyscanner); }
<AlignAs>.
<AlignAsEnd>"(" { yyextra->roundCount++; }
-<AlignAsEnd>")" { if (--yyextra->roundCount<0)
+<AlignAsEnd>")" { if (--yyextra->roundCount<0)
{
- BEGIN( yyextra->lastAlignAsContext );
+ BEGIN( yyextra->lastAlignAsContext );
}
}
<AlignAsEnd>\n { lineCount(yyscanner); }
<AlignAsEnd>.
-<CompoundName>{SCOPENAME}/{BN}*"," { // multiple forward declarations on one line
+<CompoundName>{SCOPENAME}/{BN}*"," { // multiple forward declarations on one line
// e.g. @protocol A,B;
- yyextra->current->reset();
- initEntry(yyscanner);
- }
-<CompoundName>{SCOPENAME} {
- yyextra->current->name = yytext ;
+ yyextra->current->reset();
+ initEntry(yyscanner);
+ }
+<CompoundName>{SCOPENAME} {
+ yyextra->current->name = yytext ;
if (yyextra->clangParser && (yyextra->insideCpp || yyextra->insideObjC))
{
yyextra->current->id = yyextra->clangParser->lookup(yyextra->yyLineNr,yytext);
}
- lineCount(yyscanner);
- if (yyextra->current->spec & Entry::Protocol)
- {
- yyextra->current->name += "-p";
- }
- if ((yyextra->current->spec & Entry::Protocol) ||
- yyextra->current->section == Entry::OBJCIMPL_SEC)
- {
- unput('{'); // fake start of body
- }
- BEGIN( ClassVar );
- }
-<CompoundName>{CSSCOPENAME} { // C# style scope
- yyextra->current->name = substitute(yytext,".","::");
- lineCount(yyscanner);
- BEGIN( ClassVar );
- }
-<ClassVar>{SCOPENAME}{BN}*/"(" {
- if (yyextra->insideIDL && qstrncmp(yytext,"switch",6)==0 && !isId(yytext[6]))
- {
- // Corba IDL style union
- yyextra->roundCount=0;
- BEGIN(SkipUnionSwitch);
- }
- else
- {
- addType(yyscanner);
- yyextra->current->name = yytext;
- yyextra->current->name = yyextra->current->name.stripWhiteSpace();
- lineCount(yyscanner);
- BEGIN( FindMembers );
- }
- }
-<ClassVar>"," {
- if (yyextra->isTypedef)
- {
- // multiple types in one typedef
- unput(',');
- yyextra->current->type.prepend("typedef ");
- BEGIN(FindMembers);
- }
- else
- {
- // Multiple class forward declaration
- }
- }
+ lineCount(yyscanner);
+ if (yyextra->current->spec & Entry::Protocol)
+ {
+ yyextra->current->name += "-p";
+ }
+ if ((yyextra->current->spec & Entry::Protocol) ||
+ yyextra->current->section == Entry::OBJCIMPL_SEC)
+ {
+ unput('{'); // fake start of body
+ }
+ BEGIN( ClassVar );
+ }
+<CompoundName>{CSSCOPENAME} { // C# style scope
+ yyextra->current->name = substitute(yytext,".","::");
+ lineCount(yyscanner);
+ BEGIN( ClassVar );
+ }
+<ClassVar>{SCOPENAME}{BN}*/"(" {
+ if (yyextra->insideIDL && qstrncmp(yytext,"switch",6)==0 && !isId(yytext[6]))
+ {
+ // Corba IDL style union
+ yyextra->roundCount=0;
+ BEGIN(SkipUnionSwitch);
+ }
+ else
+ {
+ addType(yyscanner);
+ yyextra->current->name = yytext;
+ yyextra->current->name = yyextra->current->name.stripWhiteSpace();
+ lineCount(yyscanner);
+ BEGIN( FindMembers );
+ }
+ }
+<ClassVar>"," {
+ if (yyextra->isTypedef)
+ {
+ // multiple types in one typedef
+ unput(',');
+ yyextra->current->type.prepend("typedef ");
+ BEGIN(FindMembers);
+ }
+ else
+ {
+ // Multiple class forward declaration
+ }
+ }
<ClassVar>("sealed"|"abstract")/{BN}*(":"|"{") {
- if (yyextra->insideCli)
- {
- if (yytext[0]=='s') // sealed
- yyextra->current->spec |= Entry::SealedClass;
- else // abstract
- yyextra->current->spec |= Entry::AbstractClass;
- BEGIN( ClassVar );
- }
- else
- {
- REJECT;
- }
- }
-<ClassVar>{ID} {
+ if (yyextra->insideCli)
+ {
+ if (yytext[0]=='s') // sealed
+ yyextra->current->spec |= Entry::SealedClass;
+ else // abstract
+ yyextra->current->spec |= Entry::AbstractClass;
+ BEGIN( ClassVar );
+ }
+ else
+ {
+ REJECT;
+ }
+ }
+<ClassVar>{ID} {
if (yyextra->clangParser && (yyextra->insideCpp || yyextra->insideObjC))
{
yyextra->current->id = yyextra->clangParser->lookup(yyextra->yyLineNr,yytext);
}
- if (yyextra->insideIDL && qstrcmp(yytext,"switch")==0)
- {
- // Corba IDL style union
- yyextra->roundCount=0;
- BEGIN(SkipUnionSwitch);
- }
- else if ((yyextra->insideJava || yyextra->insidePHP || yyextra->insideJS || yyextra->insideSlice) && (qstrcmp(yytext,"implements")==0 || qstrcmp(yytext,"extends")==0))
- {
- yyextra->current->type.resize(0);
- yyextra->baseProt=Public;
+ if (yyextra->insideIDL && qstrcmp(yytext,"switch")==0)
+ {
+ // Corba IDL style union
+ yyextra->roundCount=0;
+ BEGIN(SkipUnionSwitch);
+ }
+ else if ((yyextra->insideJava || yyextra->insidePHP || yyextra->insideJS || yyextra->insideSlice) && (qstrcmp(yytext,"implements")==0 || qstrcmp(yytext,"extends")==0))
+ {
+ yyextra->current->type.resize(0);
+ yyextra->baseProt=Public;
yyextra->baseVirt=Normal;
- yyextra->baseName.resize(0);
- BEGIN( BasesProt ) ;
- }
- else if (yyextra->insideCS && qstrcmp(yytext,"where")==0) // C# type constraint
- {
+ yyextra->baseName.resize(0);
+ BEGIN( BasesProt ) ;
+ }
+ else if (yyextra->insideCS && qstrcmp(yytext,"where")==0) // C# type constraint
+ {
yyextra->current->typeConstr.clear();
- yyextra->current->typeConstr.push_back(Argument());
- yyextra->lastCSConstraint = YY_START;
- BEGIN( CSConstraintName );
- }
- else if (yyextra->insideCli && qstrcmp(yytext,"abstract")==0)
- {
- yyextra->current->spec|=Entry::Abstract;
- }
- else if (yyextra->insideCli && qstrcmp(yytext,"sealed")==0)
- {
- yyextra->current->spec|=Entry::Sealed;
- }
+ yyextra->current->typeConstr.push_back(Argument());
+ yyextra->lastCSConstraint = YY_START;
+ BEGIN( CSConstraintName );
+ }
+ else if (yyextra->insideCli && qstrcmp(yytext,"abstract")==0)
+ {
+ yyextra->current->spec|=Entry::Abstract;
+ }
+ else if (yyextra->insideCli && qstrcmp(yytext,"sealed")==0)
+ {
+ yyextra->current->spec|=Entry::Sealed;
+ }
else if (qstrcmp(yytext,"final")==0)
{
yyextra->current->spec|=Entry::Final;
}
- else
- {
- if (yyextra->current->section == Entry::ENUM_SEC)
- { // found "enum a b" -> variable
- yyextra->current->section = Entry::VARIABLE_SEC ;
- }
- yyextra->current->type += ' ' ;
- yyextra->current->type += yyextra->current->name ;
- yyextra->current->name = yytext ;
-
- if (nameIsOperator(yyextra->current->name))
- {
- BEGIN( Operator );
- }
- }
- }
-<ClassVar>[(\[] {
- if (yyextra->insideObjC && *yytext=='(') // class category
- {
- yyextra->current->name+='(';
+ else
+ {
+ if (yyextra->current->section == Entry::ENUM_SEC)
+ { // found "enum a b" -> variable
+ yyextra->current->section = Entry::VARIABLE_SEC ;
+ }
+ yyextra->current->type += ' ' ;
+ yyextra->current->type += yyextra->current->name ;
+ yyextra->current->name = yytext ;
+
+ if (nameIsOperator(yyextra->current->name))
+ {
+ BEGIN( Operator );
+ }
+ }
+ }
+<ClassVar>[(\[] {
+ if (yyextra->insideObjC && *yytext=='(') // class category
+ {
+ yyextra->current->name+='(';
//if (yyextra->current->section!=Entry::OBJCIMPL_SEC)
//{
- yyextra->current->spec|=Entry::Category;
+ yyextra->current->spec|=Entry::Category;
//}
- BEGIN( ClassCategory );
- }
- else
- {
+ BEGIN( ClassCategory );
+ }
+ else
+ {
// probably a function anyway
unput(*yytext);
- BEGIN( FindMembers );
- }
- }
+ BEGIN( FindMembers );
+ }
+ }
<CSConstraintType,CSConstraintName>"/**/" { /* empty comment */ }
-<CSConstraintType,CSConstraintName>("/*"[*!]|"//"[/!])("<"?) { // special comment
+<CSConstraintType,CSConstraintName>("/*"[*!]|"//"[/!])("<"?) { // special comment
yyextra->fullArgString.resize(0);
- yyextra->lastCopyArgChar='#'; // end marker
- yyextra->lastCommentInArgContext=YY_START;
- if (yytext[1]=='/')
- BEGIN( CopyArgCommentLine );
- else
- BEGIN( CopyArgComment );
- }
-<CSConstraintType,CSConstraintName>"#" { // artificially inserted token to signal end of comment block
+ yyextra->lastCopyArgChar='#'; // end marker
+ yyextra->lastCommentInArgContext=YY_START;
+ if (yytext[1]=='/')
+ BEGIN( CopyArgCommentLine );
+ else
+ BEGIN( CopyArgComment );
+ }
+<CSConstraintType,CSConstraintName>"#" { // artificially inserted token to signal end of comment block
yyextra->current->typeConstr.back().docs = yyextra->fullArgString;
- }
-<CSConstraintType>"{" { // end of type constraint reached
+ }
+<CSConstraintType>"{" { // end of type constraint reached
// parse documentation of the constraints
handleParametersCommentBlocks(yyscanner,yyextra->current->typeConstr);
- unput('{');
- BEGIN( yyextra->lastCSConstraint );
- }
+ unput('{');
+ BEGIN( yyextra->lastCSConstraint );
+ }
<CSConstraintType,CSConstraintName>";" {
handleParametersCommentBlocks(yyscanner,yyextra->current->typeConstr);
- unput(';');
- BEGIN( yyextra->lastCSConstraint );
- }
+ unput(';');
+ BEGIN( yyextra->lastCSConstraint );
+ }
<CSConstraintName>":" {
BEGIN( CSConstraintType );
}
@@ -5502,10 +5539,10 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
// parameter name
yyextra->current->typeConstr.back().name=yytext;
}
-<CSConstraintType>"where" { // another constraint for a different param
- yyextra->current->typeConstr.push_back(Argument());
+<CSConstraintType>"where" { // another constraint for a different param
+ yyextra->current->typeConstr.push_back(Argument());
BEGIN( CSConstraintName );
- }
+ }
<CSConstraintType>({ID}".")*{ID}("<"{ID}">")?("()")? {
if (yyextra->current->typeConstr.back().type.isEmpty())
// first type constraint for this parameter
@@ -5520,300 +5557,300 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
yyextra->current->typeConstr.back().type=yytext;
}
}
-<CSConstraintName,CSConstraintType>\n {
+<CSConstraintName,CSConstraintType>\n {
lineCount(yyscanner);
- }
-<CSConstraintName,CSConstraintType>. {
- }
-<ClassCategory>{ID} {
- yyextra->current->name+=yytext;
- }
-<ClassCategory>")"/{BN}*"{" {
- yyextra->current->name+=')';
- BEGIN( ClassVar );
- }
-<ClassCategory>")"/{BN}*"<" {
- yyextra->current->name+=')';
- BEGIN( ObjCProtocolList );
- }
-<ClassCategory>")" {
- yyextra->current->name+=')';
- if ((yyextra->current->section & Entry::Protocol) ||
- yyextra->current->section == Entry::OBJCIMPL_SEC)
- {
- unput('{'); // fake start of body
- }
- else // category has no variables so push back an empty body
- {
- unput('}');
- unput('{');
- }
- BEGIN( ClassVar );
- }
-<ClassVar>":" {
+ }
+<CSConstraintName,CSConstraintType>. {
+ }
+<ClassCategory>{ID} {
+ yyextra->current->name+=yytext;
+ }
+<ClassCategory>")"/{BN}*"{" {
+ yyextra->current->name+=')';
+ BEGIN( ClassVar );
+ }
+<ClassCategory>")"/{BN}*"<" {
+ yyextra->current->name+=')';
+ BEGIN( ObjCProtocolList );
+ }
+<ClassCategory>")" {
+ yyextra->current->name+=')';
+ if ((yyextra->current->section & Entry::Protocol) ||
+ yyextra->current->section == Entry::OBJCIMPL_SEC)
+ {
+ unput('{'); // fake start of body
+ }
+ else // category has no variables so push back an empty body
+ {
+ unput('}');
+ unput('{');
+ }
+ BEGIN( ClassVar );
+ }
+<ClassVar>":" {
if (yyextra->current->section==Entry::VARIABLE_SEC) // enum A B:2, see bug 748208
{
yyextra->current->bitfields+=":";
yyextra->current->args.resize(0);
BEGIN(BitFields);
}
- else if (yyextra->current->section==Entry::ENUM_SEC) // enum E:2, see bug 313527,
+ else if (yyextra->current->section==Entry::ENUM_SEC) // enum E:2, see bug 313527,
// or C++11 style enum: 'E : unsigned int {...}'
- {
- yyextra->current->args.resize(0);
- BEGIN(EnumBaseType);
- }
- else
- {
- yyextra->current->type.resize(0);
- if ((yyextra->current->spec & Entry::Interface) ||
- (yyextra->current->spec & Entry::Struct) ||
- (yyextra->current->spec & Entry::Ref) ||
- (yyextra->current->spec & Entry::Value) ||
- yyextra->insidePHP || yyextra->insideCS || yyextra->insideD || yyextra->insideObjC || yyextra->insideIDL
- )
- yyextra->baseProt=Public;
- else
- yyextra->baseProt=Private;
- yyextra->baseVirt=Normal;
- yyextra->baseName.resize(0);
- BEGIN( BasesProt ) ;
- }
- }
-<ClassVar>[;=*&] {
- unput(*yytext);
- if (yyextra->isTypedef) // typedef of a class, put typedef keyword back
- {
- yyextra->current->type.prepend("typedef");
- }
- if ((yytext[0]=='*' || yytext[0]=='&') &&
- yyextra->current->section == Entry::ENUM_SEC)
- { // found "enum a *b" -> variable
- yyextra->current->section = Entry::VARIABLE_SEC ;
- }
- BEGIN( FindMembers );
- }
+ {
+ yyextra->current->args.resize(0);
+ BEGIN(EnumBaseType);
+ }
+ else
+ {
+ yyextra->current->type.resize(0);
+ if ((yyextra->current->spec & Entry::Interface) ||
+ (yyextra->current->spec & Entry::Struct) ||
+ (yyextra->current->spec & Entry::Ref) ||
+ (yyextra->current->spec & Entry::Value) ||
+ yyextra->insidePHP || yyextra->insideCS || yyextra->insideD || yyextra->insideObjC || yyextra->insideIDL
+ )
+ yyextra->baseProt=Public;
+ else
+ yyextra->baseProt=Private;
+ yyextra->baseVirt=Normal;
+ yyextra->baseName.resize(0);
+ BEGIN( BasesProt ) ;
+ }
+ }
+<ClassVar>[;=*&] {
+ unput(*yytext);
+ if (yyextra->isTypedef) // typedef of a class, put typedef keyword back
+ {
+ yyextra->current->type.prepend("typedef");
+ }
+ if ((yytext[0]=='*' || yytext[0]=='&') &&
+ yyextra->current->section == Entry::ENUM_SEC)
+ { // found "enum a *b" -> variable
+ yyextra->current->section = Entry::VARIABLE_SEC ;
+ }
+ BEGIN( FindMembers );
+ }
<Bases,ClassVar>"///"/[^/] {
- if (!yyextra->insideObjC)
- {
- REJECT;
- }
- else
- {
- lineCount(yyscanner);
- yyextra->current->program+=yytext;
+ if (!yyextra->insideObjC)
+ {
+ REJECT;
+ }
+ else
+ {
+ lineCount(yyscanner);
+ yyextra->current->program+=yytext;
yyextra->current->fileName = yyextra->yyFileName ;
- yyextra->current->startLine = yyextra->yyLineNr ;
- yyextra->current->startColumn = yyextra->yyColNr;
- yyextra->curlyCount=0;
- BEGIN( ReadBodyIntf );
- }
- }
+ yyextra->current->startLine = yyextra->yyLineNr ;
+ yyextra->current->startColumn = yyextra->yyColNr;
+ yyextra->curlyCount=0;
+ BEGIN( ReadBodyIntf );
+ }
+ }
<Bases,ClassVar>("//"{B}*)?"/**"/[^/*] |
<Bases,ClassVar>("//"{B}*)?"/*!" |
<Bases,ClassVar>"//!" |
-<Bases,ClassVar>[\-+]{BN}* {
- if (!yyextra->insideObjC)
- {
- REJECT;
- }
- else
- {
- lineCount(yyscanner);
- yyextra->current->program+=yytext;
+<Bases,ClassVar>[\-+]{BN}* {
+ if (!yyextra->insideObjC)
+ {
+ REJECT;
+ }
+ else
+ {
+ lineCount(yyscanner);
+ yyextra->current->program+=yytext;
yyextra->current->fileName = yyextra->yyFileName ;
- yyextra->current->startLine = yyextra->yyLineNr ;
- yyextra->current->startColumn = yyextra->yyColNr;
- yyextra->curlyCount=0;
- BEGIN( ReadBodyIntf );
- }
- }
-<CompoundName,ClassVar>{B}*"{"{B}* {
+ yyextra->current->startLine = yyextra->yyLineNr ;
+ yyextra->current->startColumn = yyextra->yyColNr;
+ yyextra->curlyCount=0;
+ BEGIN( ReadBodyIntf );
+ }
+ }
+<CompoundName,ClassVar>{B}*"{"{B}* {
yyextra->current->program.resize(0);
yyextra->current->fileName = yyextra->yyFileName ;
- yyextra->current->bodyLine = yyextra->yyLineNr;
- yyextra->current->bodyColumn = yyextra->yyColNr;
- yyextra->current->name = removeRedundantWhiteSpace(yyextra->current->name);
- if (yyextra->current->name.isEmpty() && !yyextra->isTypedef) // anonymous compound
- {
- if (yyextra->current->section==Entry::NAMESPACE_SEC) // allow reopening of anonymous namespaces
- {
- if (Config_getBool(EXTRACT_ANON_NSPACES)) // use visible name
- {
- yyextra->current->name="anonymous_namespace{"+stripPath(yyextra->current->fileName)+"}";
- }
- else // use invisible name
- {
- yyextra->current->name.sprintf("@%d",yyextra->anonNSCount);
- }
- }
- else
- {
- yyextra->current->name.sprintf("@%d",yyextra->anonCount++);
- }
- }
- yyextra->curlyCount=0;
- if (yyextra->current_root && // not a nested struct yyextra->inside an @interface section
- !(yyextra->current_root->spec & Entry::Interface) &&
- ((yyextra->current->spec & (Entry::Interface | Entry::Protocol | Entry::Category) ||
- yyextra->current->section==Entry::OBJCIMPL_SEC)
- ) &&
- yyextra->insideObjC
- )
- { // ObjC body that ends with @end
- BEGIN( ReadBodyIntf );
- }
- else if (yyextra->current->section==Entry::NAMESPACE_SEC)
- { // namespace body
- BEGIN( ReadNSBody );
- }
- else
- { // class body
- BEGIN( ReadBody ) ;
- }
- }
+ yyextra->current->bodyLine = yyextra->yyLineNr;
+ yyextra->current->bodyColumn = yyextra->yyColNr;
+ yyextra->current->name = removeRedundantWhiteSpace(yyextra->current->name);
+ if (yyextra->current->name.isEmpty() && !yyextra->isTypedef) // anonymous compound
+ {
+ if (yyextra->current->section==Entry::NAMESPACE_SEC) // allow reopening of anonymous namespaces
+ {
+ if (Config_getBool(EXTRACT_ANON_NSPACES)) // use visible name
+ {
+ yyextra->current->name="anonymous_namespace{"+stripPath(yyextra->current->fileName)+"}";
+ }
+ else // use invisible name
+ {
+ yyextra->current->name.sprintf("@%d",anonNSCount.load());
+ }
+ }
+ else
+ {
+ yyextra->current->name.sprintf("@%d",anonCount++);
+ }
+ }
+ yyextra->curlyCount=0;
+ if (yyextra->current_root && // not a nested struct yyextra->inside an @interface section
+ !(yyextra->current_root->spec & Entry::Interface) &&
+ ((yyextra->current->spec & (Entry::Interface | Entry::Protocol | Entry::Category) ||
+ yyextra->current->section==Entry::OBJCIMPL_SEC)
+ ) &&
+ yyextra->insideObjC
+ )
+ { // ObjC body that ends with @end
+ BEGIN( ReadBodyIntf );
+ }
+ else if (yyextra->current->section==Entry::NAMESPACE_SEC)
+ { // namespace body
+ BEGIN( ReadNSBody );
+ }
+ else
+ { // class body
+ BEGIN( ReadBody ) ;
+ }
+ }
<BasesProt>"virtual"{BN}+ { lineCount(yyscanner); yyextra->baseVirt = Virtual; }
<BasesProt>"public"{BN}+ { lineCount(yyscanner); yyextra->baseProt = Public; }
<BasesProt>"protected"{BN}+ { lineCount(yyscanner); yyextra->baseProt = Protected; }
<BasesProt>"internal"{BN}+ { if (!yyextra->insideCli) REJECT ; lineCount(yyscanner); yyextra->baseProt = Package; }
<BasesProt>"private"{BN}+ { lineCount(yyscanner); yyextra->baseProt = Private; }
-<BasesProt>{BN} { lineCount(yyscanner); }
-<BasesProt>. { unput(*yytext); BEGIN(Bases); }
-<Bases>("\\")?({ID}"\\")*{ID} { // PHP namespace token, not sure if interspacing is allowed but it gives problems (see bug 640847)
+<BasesProt>{BN} { lineCount(yyscanner); }
+<BasesProt>. { unput(*yytext); BEGIN(Bases); }
+<Bases>("\\")?({ID}"\\")*{ID} { // PHP namespace token, not sure if interspacing is allowed but it gives problems (see bug 640847)
if (!yyextra->insidePHP)
- {
- REJECT;
- }
- else // PHP base class of the form \Ns\Cl or Ns\Cl
- {
- lineCount(yyscanner);
- QCString bn=yytext;
- bn = substitute(bn,"\\","::");
- yyextra->baseName += bn;
- yyextra->current->args += ' ';
- yyextra->current->args += yytext;
- }
- }
-<Bases>("::")?{BN}*({ID}{BN}*"::"{BN}*)*{ID} {
- lineCount(yyscanner);
+ {
+ REJECT;
+ }
+ else // PHP base class of the form \Ns\Cl or Ns\Cl
+ {
+ lineCount(yyscanner);
+ QCString bn=yytext;
+ bn = substitute(bn,"\\","::");
+ yyextra->baseName += bn;
+ yyextra->current->args += ' ';
+ yyextra->current->args += yytext;
+ }
+ }
+<Bases>("::")?{BN}*({ID}{BN}*"::"{BN}*)*{ID} {
+ lineCount(yyscanner);
QCString baseScope = yytext;
if (yyextra->insideCS && baseScope.stripWhiteSpace()=="where")
- {
- // type constraint for a class
+ {
+ // type constraint for a class
yyextra->current->typeConstr.clear();
- yyextra->current->typeConstr.push_back(Argument());
- yyextra->lastCSConstraint = YY_START;
- BEGIN( CSConstraintName );
- }
- else
- {
- yyextra->baseName+=yytext;
- yyextra->current->args += ' ';
- yyextra->current->args += yytext;
- }
- }
-<Bases>{BN}*{ID}("."{ID})* { // Java style class
- QCString name = substitute(yytext,".","::");
- yyextra->baseName += name;
- yyextra->current->args += ' ';
- yyextra->current->args += name;
- }
-<ClassVar,Bases>\n/{BN}*[^{, \t\n] {
- if (!yyextra->insideObjC)
- {
- REJECT;
- }
- else
- {
+ yyextra->current->typeConstr.push_back(Argument());
+ yyextra->lastCSConstraint = YY_START;
+ BEGIN( CSConstraintName );
+ }
+ else
+ {
+ yyextra->baseName+=yytext;
+ yyextra->current->args += ' ';
+ yyextra->current->args += yytext;
+ }
+ }
+<Bases>{BN}*{ID}("."{ID})* { // Java style class
+ QCString name = substitute(yytext,".","::");
+ yyextra->baseName += name;
+ yyextra->current->args += ' ';
+ yyextra->current->args += name;
+ }
+<ClassVar,Bases>\n/{BN}*[^{, \t\n] {
+ if (!yyextra->insideObjC)
+ {
+ REJECT;
+ }
+ else
+ {
lineCount(yyscanner);
- unput('{');
- }
- }
-<ClassVar,Bases>"@end" { // empty ObjC interface
- unput('d'); // insert fake body: {}@end
- unput('n');
- unput('e');
- unput('@');
- unput('}');
- unput('{');
- }
-<ClassVar>"<" { yyextra->current->name += *yytext;
- yyextra->sharpCount=1;
- yyextra->roundCount=0;
- yyextra->lastSkipSharpContext = YY_START;
- yyextra->specName = &yyextra->current->name;
- BEGIN ( Specialization );
- }
+ unput('{');
+ }
+ }
+<ClassVar,Bases>"@end" { // empty ObjC interface
+ unput('d'); // insert fake body: {}@end
+ unput('n');
+ unput('e');
+ unput('@');
+ unput('}');
+ unput('{');
+ }
+<ClassVar>"<" { yyextra->current->name += *yytext;
+ yyextra->sharpCount=1;
+ yyextra->roundCount=0;
+ yyextra->lastSkipSharpContext = YY_START;
+ yyextra->specName = &yyextra->current->name;
+ BEGIN ( Specialization );
+ }
<Bases>{BN}*"<" {
lineCount(yyscanner);
- yyextra->sharpCount=1;
- yyextra->roundCount=0;
- yyextra->lastSkipSharpContext = YY_START;
- if (yyextra->insideObjC) // start of protocol list
- {
- unput(',');
- }
- else // template specialization
- {
- //if (yyextra->insideCS) // generic
- //{
- // yyextra->baseName+="-g";
- //}
+ yyextra->sharpCount=1;
+ yyextra->roundCount=0;
+ yyextra->lastSkipSharpContext = YY_START;
+ if (yyextra->insideObjC) // start of protocol list
+ {
+ unput(',');
+ }
+ else // template specialization
+ {
+ //if (yyextra->insideCS) // generic
+ //{
+ // yyextra->baseName+="-g";
+ //}
yyextra->templateStr = yytext;
- yyextra->specName = &yyextra->templateStr;
- BEGIN ( Specialization );
- }
- }
-<Specialization>"<" { *yyextra->specName += *yytext;
- if (yyextra->roundCount==0) yyextra->sharpCount++;
- }
-<Specialization>">" {
- *yyextra->specName += *yytext;
- if (yyextra->roundCount==0 && --yyextra->sharpCount<=0)
- {
- yyextra->baseName+=removeRedundantWhiteSpace(*yyextra->specName);
- BEGIN(yyextra->lastSkipSharpContext);
- }
- }
-<Specialization>{BN}+ { lineCount(yyscanner); *yyextra->specName +=' '; }
-<Specialization>"<<" { *yyextra->specName += yytext; }
-<Specialization>">>"/{B}*"::" { // M$ C++ extension to allow >> to close a template...
- unput('>');
- unput(' ');
- unput('>');
- }
-<Specialization>">>" {
+ yyextra->specName = &yyextra->templateStr;
+ BEGIN ( Specialization );
+ }
+ }
+<Specialization>"<" { *yyextra->specName += *yytext;
+ if (yyextra->roundCount==0) yyextra->sharpCount++;
+ }
+<Specialization>">" {
+ *yyextra->specName += *yytext;
+ if (yyextra->roundCount==0 && --yyextra->sharpCount<=0)
+ {
+ yyextra->baseName+=removeRedundantWhiteSpace(*yyextra->specName);
+ BEGIN(yyextra->lastSkipSharpContext);
+ }
+ }
+<Specialization>{BN}+ { lineCount(yyscanner); *yyextra->specName +=' '; }
+<Specialization>"<<" { *yyextra->specName += yytext; }
+<Specialization>">>"/{B}*"::" { // M$ C++ extension to allow >> to close a template...
+ unput('>');
+ unput(' ');
+ unput('>');
+ }
+<Specialization>">>" {
if (yyextra->insideCS) // for C# >> ends a nested template
- {
- REJECT;
- }
- else // for C++ >> is a bitshift
- // operator and > > would end
- // a nested template.
- // We require the bitshift to be enclosed in braces.
- // See http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2005/n1757.html
- {
- if (yyextra->roundCount>0)
- {
- *yyextra->specName += yytext;
- }
- else
- {
- unput('>');
- unput(' ');
- unput('>');
- }
- }
- }
-<Specialization>"typename"{BN}+ { lineCount(yyscanner); }
-<Specialization>"(" { *yyextra->specName += *yytext; yyextra->roundCount++; }
-<Specialization>")" { *yyextra->specName += *yytext; yyextra->roundCount--; }
-
-<Specialization>"\\\\" { *yyextra->specName += *yytext;}
-<Specialization>"\\'" { *yyextra->specName += *yytext;}
-<Specialization>"\\\"" { *yyextra->specName += *yytext;}
-<Specialization>"'" { *yyextra->specName += *yytext;BEGIN(SpecializationSingleQuote);}
-<Specialization>"\"" { *yyextra->specName += *yytext;BEGIN(SpecializationDoubleQuote);}
+ {
+ REJECT;
+ }
+ else // for C++ >> is a bitshift
+ // operator and > > would end
+ // a nested template.
+ // We require the bitshift to be enclosed in braces.
+ // See http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2005/n1757.html
+ {
+ if (yyextra->roundCount>0)
+ {
+ *yyextra->specName += yytext;
+ }
+ else
+ {
+ unput('>');
+ unput(' ');
+ unput('>');
+ }
+ }
+ }
+<Specialization>"typename"{BN}+ { lineCount(yyscanner); }
+<Specialization>"(" { *yyextra->specName += *yytext; yyextra->roundCount++; }
+<Specialization>")" { *yyextra->specName += *yytext; yyextra->roundCount--; }
+
+<Specialization>"\\\\" { *yyextra->specName += *yytext;}
+<Specialization>"\\'" { *yyextra->specName += *yytext;}
+<Specialization>"\\\"" { *yyextra->specName += *yytext;}
+<Specialization>"'" { *yyextra->specName += *yytext;BEGIN(SpecializationSingleQuote);}
+<Specialization>"\"" { *yyextra->specName += *yytext;BEGIN(SpecializationDoubleQuote);}
<SpecializationSingleQuote,SpecializationDoubleQuote>"\\\\" { *yyextra->specName += *yytext;}
<SpecializationSingleQuote>"\\'" { *yyextra->specName += *yytext;}
<SpecializationSingleQuote>"'" { *yyextra->specName += *yytext; BEGIN(Specialization);}
@@ -5821,154 +5858,154 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
<SpecializationDoubleQuote>"\"" { *yyextra->specName += *yytext; BEGIN(Specialization);}
<SpecializationSingleQuote,SpecializationDoubleQuote>. { *yyextra->specName += *yytext;}
-<Specialization>. {
- *yyextra->specName += *yytext;
- }
-<SkipRound>"(" { ++yyextra->roundCount; }
-<SkipRound>")" { if (--yyextra->roundCount<0)
- BEGIN ( yyextra->lastSkipRoundContext );
- }
-<SkipRound>\" {
- yyextra->lastStringContext=SkipRound;
- BEGIN(SkipString);
- }
-<Bases>","|(">"({BN}*"{")?)|({BN}+"implements"{BN}*) { lineCount(yyscanner);
+<Specialization>. {
+ *yyextra->specName += *yytext;
+ }
+<SkipRound>"(" { ++yyextra->roundCount; }
+<SkipRound>")" { if (--yyextra->roundCount<0)
+ BEGIN ( yyextra->lastSkipRoundContext );
+ }
+<SkipRound>\" {
+ yyextra->lastStringContext=SkipRound;
+ BEGIN(SkipString);
+ }
+<Bases>","|(">"({BN}*"{")?)|({BN}+"implements"{BN}*) { lineCount(yyscanner);
if (yyextra->insideProtocolList)
- {
- yyextra->baseName+="-p";
- }
- else
- {
- yyextra->current->args += ',' ;
- }
- yyextra->current->name = removeRedundantWhiteSpace(yyextra->current->name);
- if (!yyextra->baseName.isEmpty())
- {
- yyextra->current->extends.push_back(
- BaseInfo(yyextra->baseName,yyextra->baseProt,yyextra->baseVirt)
- );
- }
- if ((yyextra->current->spec & (Entry::Interface|Entry::Struct)) ||
- yyextra->insideJava || yyextra->insidePHP || yyextra->insideCS ||
- yyextra->insideD || yyextra->insideObjC || yyextra->insideIDL || yyextra->insideSlice)
- {
- yyextra->baseProt=Public;
- }
- else
- {
- yyextra->baseProt=Private;
- }
- yyextra->baseVirt=Normal;
- yyextra->baseName.resize(0);
+ {
+ yyextra->baseName+="-p";
+ }
+ else
+ {
+ yyextra->current->args += ',' ;
+ }
+ yyextra->current->name = removeRedundantWhiteSpace(yyextra->current->name);
+ if (!yyextra->baseName.isEmpty())
+ {
+ yyextra->current->extends.push_back(
+ BaseInfo(yyextra->baseName,yyextra->baseProt,yyextra->baseVirt)
+ );
+ }
+ if ((yyextra->current->spec & (Entry::Interface|Entry::Struct)) ||
+ yyextra->insideJava || yyextra->insidePHP || yyextra->insideCS ||
+ yyextra->insideD || yyextra->insideObjC || yyextra->insideIDL || yyextra->insideSlice)
+ {
+ yyextra->baseProt=Public;
+ }
+ else
+ {
+ yyextra->baseProt=Private;
+ }
+ yyextra->baseVirt=Normal;
+ yyextra->baseName.resize(0);
if (*yytext=='>')
- { // end of a ObjC protocol list
- yyextra->insideProtocolList=FALSE;
- if (yyleng==1)
- {
- unput('{'); // dummy start body
- }
- else
- {
- yyless(1);
- }
- }
- else
- {
- if (*yytext==',' && yyextra->insideObjC) // Begin of protocol list
- {
- yyextra->insideProtocolList=TRUE;
- }
- BEGIN(BasesProt);
- }
- }
-<Bases>{B}*"{"{B}* {
+ { // end of a ObjC protocol list
+ yyextra->insideProtocolList=FALSE;
+ if (yyleng==1)
+ {
+ unput('{'); // dummy start body
+ }
+ else
+ {
+ yyless(1);
+ }
+ }
+ else
+ {
+ if (*yytext==',' && yyextra->insideObjC) // Begin of protocol list
+ {
+ yyextra->insideProtocolList=TRUE;
+ }
+ BEGIN(BasesProt);
+ }
+ }
+<Bases>{B}*"{"{B}* {
yyextra->current->program.resize(0);
yyextra->current->fileName = yyextra->yyFileName ;
- yyextra->current->bodyLine = yyextra->yyLineNr;
- yyextra->current->bodyColumn = yyextra->yyColNr;
- yyextra->current->name = removeRedundantWhiteSpace(yyextra->current->name);
- if (!yyextra->baseName.isEmpty())
- yyextra->current->extends.push_back(
- BaseInfo(yyextra->baseName,yyextra->baseProt,yyextra->baseVirt)
- );
- yyextra->curlyCount=0;
- if (yyextra->insideObjC)
- {
- BEGIN( ReadBodyIntf );
- }
- else
- {
- BEGIN( ReadBody ) ;
- }
- }
-<SkipUnionSwitch>{B}*"(" {
- yyextra->roundCount++;
- }
-<SkipUnionSwitch>")" {
- if (--yyextra->roundCount==0)
- {
- BEGIN(ClassVar);
- }
- }
-<SkipUnionSwitch>\n { lineCount(yyscanner); }
-<SkipUnionSwitch>.
-<Comment>{BN}+ { yyextra->current->program += yytext ;
- lineCount(yyscanner) ;
- }
-<Comment>"/*" { yyextra->current->program += yytext ; }
-<Comment>"//" { yyextra->current->program += yytext ; }
-<Comment>{CMD}("code"|"verbatim") {
+ yyextra->current->bodyLine = yyextra->yyLineNr;
+ yyextra->current->bodyColumn = yyextra->yyColNr;
+ yyextra->current->name = removeRedundantWhiteSpace(yyextra->current->name);
+ if (!yyextra->baseName.isEmpty())
+ yyextra->current->extends.push_back(
+ BaseInfo(yyextra->baseName,yyextra->baseProt,yyextra->baseVirt)
+ );
+ yyextra->curlyCount=0;
+ if (yyextra->insideObjC)
+ {
+ BEGIN( ReadBodyIntf );
+ }
+ else
+ {
+ BEGIN( ReadBody ) ;
+ }
+ }
+<SkipUnionSwitch>{B}*"(" {
+ yyextra->roundCount++;
+ }
+<SkipUnionSwitch>")" {
+ if (--yyextra->roundCount==0)
+ {
+ BEGIN(ClassVar);
+ }
+ }
+<SkipUnionSwitch>\n { lineCount(yyscanner); }
+<SkipUnionSwitch>.
+<Comment>{BN}+ { yyextra->current->program += yytext ;
+ lineCount(yyscanner) ;
+ }
+<Comment>"/*" { yyextra->current->program += yytext ; }
+<Comment>"//" { yyextra->current->program += yytext ; }
+<Comment>{CMD}("code"|"verbatim") {
yyextra->insideCode=TRUE;
- yyextra->current->program += yytext ;
- }
-<Comment>{CMD}("endcode"|"endverbatim") {
+ yyextra->current->program += yytext ;
+ }
+<Comment>{CMD}("endcode"|"endverbatim") {
yyextra->insideCode=FALSE;
- yyextra->current->program += yytext ;
- }
-<Comment>[^ \.\t\r\n\/\*]+ { yyextra->current->program += yytext ; }
-<Comment>"*/" { yyextra->current->program += yytext ;
- if (!yyextra->insideCode) BEGIN( yyextra->lastContext ) ;
- }
-<Comment>. { yyextra->current->program += *yytext ; }
-
-<FindMembers,FindFields,MemberSpec,FuncQual,SkipCurly,Operator,ClassVar,SkipInits,SkipC11Inits,SkipC11Attribute,Bases,OldStyleArgs>("//"{B}*)?"/*!" {
- //printf("Start doc block at %d\n",yyextra->yyLineNr);
- if (!yyextra->current->doc.isEmpty())
- {
- yyextra->current->doc+="\n\n";
- }
- else
- {
- yyextra->current->docLine = yyextra->yyLineNr;
- yyextra->current->docFile = yyextra->yyFileName;
- }
-
- yyextra->lastDocContext = YY_START;
- if (yyextra->current_root->section & Entry::SCOPE_MASK)
- {
- yyextra->current->inside = yyextra->current_root->name+"::";
- }
- yyextra->docBlockContext = YY_START;
- yyextra->docBlockInBody = YY_START==SkipCurly;
- yyextra->docBlockAutoBrief = Config_getBool(QT_AUTOBRIEF);
+ yyextra->current->program += yytext ;
+ }
+<Comment>[^ \.\t\r\n\/\*]+ { yyextra->current->program += yytext ; }
+<Comment>"*/" { yyextra->current->program += yytext ;
+ if (!yyextra->insideCode) BEGIN( yyextra->lastContext ) ;
+ }
+<Comment>. { yyextra->current->program += *yytext ; }
+
+<FindMembers,FindFields,MemberSpec,FuncQual,SkipCurly,Operator,ClassVar,SkipInits,SkipC11Inits,SkipC11Attribute,Bases,OldStyleArgs>("//"{B}*)?"/*!" {
+ //printf("Start doc block at %d\n",yyextra->yyLineNr);
+ if (!yyextra->current->doc.isEmpty())
+ {
+ yyextra->current->doc+="\n\n";
+ }
+ else
+ {
+ yyextra->current->docLine = yyextra->yyLineNr;
+ yyextra->current->docFile = yyextra->yyFileName;
+ }
+
+ yyextra->lastDocContext = YY_START;
+ if (yyextra->current_root->section & Entry::SCOPE_MASK)
+ {
+ yyextra->current->inside = yyextra->current_root->name+"::";
+ }
+ yyextra->docBlockContext = YY_START;
+ yyextra->docBlockInBody = YY_START==SkipCurly;
+ yyextra->docBlockAutoBrief = Config_getBool(QT_AUTOBRIEF);
QCString indent;
indent.fill(' ',computeIndent(yytext,yyextra->column));
yyextra->docBlock=indent;
- if (yyextra->docBlockAutoBrief)
- {
- yyextra->current->briefLine = yyextra->yyLineNr;
- yyextra->current->briefFile = yyextra->yyFileName;
- }
- startCommentBlock(yyscanner,FALSE);
- BEGIN( DocBlock );
- }
+ if (yyextra->docBlockAutoBrief)
+ {
+ yyextra->current->briefLine = yyextra->yyLineNr;
+ yyextra->current->briefFile = yyextra->yyFileName;
+ }
+ startCommentBlock(yyscanner,FALSE);
+ BEGIN( DocBlock );
+ }
<FindMembers,FindFields,MemberSpec,FuncQual,SkipCurly,Operator,ClassVar,SkipInits,Bases,OldStyleArgs>"/**"[*]+{BL} {
- bool javadocBanner = Config_getBool(JAVADOC_BANNER);
+ bool javadocBanner = Config_getBool(JAVADOC_BANNER);
lineCount(yyscanner);
- if( javadocBanner )
+ if( javadocBanner )
{
yyextra->lastDocContext = YY_START;
@@ -5998,185 +6035,185 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
}
else
{
- yyextra->current->program += yytext ;
- yyextra->lastContext = YY_START ;
- BEGIN( Comment ) ;
- }
- }
+ yyextra->current->program += yytext ;
+ yyextra->lastContext = YY_START ;
+ BEGIN( Comment ) ;
+ }
+ }
<FindMembers,FindFields,MemberSpec,FuncQual,SkipCurly,Operator,ClassVar,SkipInits,Bases,OldStyleArgs>("//"{B}*)?"/**"/[^/*] {
- yyextra->lastDocContext = YY_START;
+ yyextra->lastDocContext = YY_START;
- //printf("Found comment block at %s:%d\n",yyextra->yyFileName,yyextra->yyLineNr);
- if (yyextra->current_root->section & Entry::SCOPE_MASK)
+ //printf("Found comment block at %s:%d\n",yyextra->yyFileName,yyextra->yyLineNr);
+ if (yyextra->current_root->section & Entry::SCOPE_MASK)
{
- yyextra->current->inside = yyextra->current_root->name+"::";
+ yyextra->current->inside = yyextra->current_root->name+"::";
}
- yyextra->current->docLine = yyextra->yyLineNr;
- yyextra->current->docFile = yyextra->yyFileName;
- yyextra->docBlockContext = YY_START;
- yyextra->docBlockInBody = YY_START==SkipCurly;
+ yyextra->current->docLine = yyextra->yyLineNr;
+ yyextra->current->docFile = yyextra->yyFileName;
+ yyextra->docBlockContext = YY_START;
+ yyextra->docBlockInBody = YY_START==SkipCurly;
bool javadocAutoBrief = Config_getBool(JAVADOC_AUTOBRIEF);
- yyextra->docBlockAutoBrief = javadocAutoBrief;
+ yyextra->docBlockAutoBrief = javadocAutoBrief;
QCString indent;
indent.fill(' ',computeIndent(yytext,yyextra->column));
yyextra->docBlock=indent;
- if (yyextra->docBlockAutoBrief)
- {
- yyextra->current->briefLine = yyextra->yyLineNr;
- yyextra->current->briefFile = yyextra->yyFileName;
- }
- startCommentBlock(yyscanner,FALSE);
- BEGIN( DocBlock );
- }
-<FindMembers,FindFields,MemberSpec,SkipCurly,FuncQual,Operator,ClassVar,Bases,OldStyleArgs>"//!" {
- yyextra->lastDocContext = YY_START;
- if (yyextra->current_root->section & Entry::SCOPE_MASK)
+ if (yyextra->docBlockAutoBrief)
{
- yyextra->current->inside = yyextra->current_root->name+"::";
+ yyextra->current->briefLine = yyextra->yyLineNr;
+ yyextra->current->briefFile = yyextra->yyFileName;
}
- yyextra->docBlockContext = YY_START;
- yyextra->docBlockInBody = YY_START==SkipCurly;
- yyextra->docBlockAutoBrief = FALSE;
+ startCommentBlock(yyscanner,FALSE);
+ BEGIN( DocBlock );
+ }
+<FindMembers,FindFields,MemberSpec,SkipCurly,FuncQual,Operator,ClassVar,Bases,OldStyleArgs>"//!" {
+ yyextra->lastDocContext = YY_START;
+ if (yyextra->current_root->section & Entry::SCOPE_MASK)
+ {
+ yyextra->current->inside = yyextra->current_root->name+"::";
+ }
+ yyextra->docBlockContext = YY_START;
+ yyextra->docBlockInBody = YY_START==SkipCurly;
+ yyextra->docBlockAutoBrief = FALSE;
QCString indent;
indent.fill(' ',computeIndent(yytext,yyextra->column));
yyextra->docBlock=indent;
- startCommentBlock(yyscanner,yyextra->current->brief.isEmpty());
- BEGIN( DocLine );
- }
-<FindMembers,FindFields,MemberSpec,SkipCurly,FuncQual,Operator,ClassVar,Bases,OldStyleArgs>"///"/[^/] {
- yyextra->lastDocContext = YY_START;
- if (yyextra->current_root->section & Entry::SCOPE_MASK)
+ startCommentBlock(yyscanner,yyextra->current->brief.isEmpty());
+ BEGIN( DocLine );
+ }
+<FindMembers,FindFields,MemberSpec,SkipCurly,FuncQual,Operator,ClassVar,Bases,OldStyleArgs>"///"/[^/] {
+ yyextra->lastDocContext = YY_START;
+ if (yyextra->current_root->section & Entry::SCOPE_MASK)
{
- yyextra->current->inside = yyextra->current_root->name+"::";
+ yyextra->current->inside = yyextra->current_root->name+"::";
}
- yyextra->docBlockContext = YY_START;
- yyextra->docBlockInBody = YY_START==SkipCurly;
- yyextra->docBlockAutoBrief = FALSE;
+ yyextra->docBlockContext = YY_START;
+ yyextra->docBlockInBody = YY_START==SkipCurly;
+ yyextra->docBlockAutoBrief = FALSE;
QCString indent;
indent.fill(' ',computeIndent(yytext,yyextra->column));
yyextra->docBlock=indent;
- startCommentBlock(yyscanner,yyextra->current->brief.isEmpty());
- BEGIN( DocLine );
- }
+ startCommentBlock(yyscanner,yyextra->current->brief.isEmpty());
+ BEGIN( DocLine );
+ }
<FindMembers>"extern"{BN}*"\"C"("++")?"\""{BN}*("{")? {
- lineCount(yyscanner);
- yyextra->externC=TRUE;
- }
-<FindMembers>"{" {
- if (yyextra->externC)
- {
- yyextra->externC=FALSE;
- }
- else if (yyextra->insideCS &&
- !yyextra->current->name.isEmpty() &&
- !yyextra->current->type.isEmpty())
- {
- if (containsWord(yyextra->current->type,"event")) // event
- {
- yyextra->current->mtype = yyextra->mtype = Event;
- }
- else // property
- {
- yyextra->current->mtype = yyextra->mtype = Property;
- }
- yyextra->current->bodyLine = yyextra->yyLineNr;
- yyextra->current->bodyColumn = yyextra->yyColNr;
- yyextra->curlyCount=0;
- BEGIN( CSAccessorDecl );
- }
- else if (yyextra->insideIDL && (yyextra->current->spec & Entry::Attribute))
- {
- // UNO IDL: attributes may have setter and getter
- // exception specifications
- yyextra->current->exception = " {";
- BEGIN(UNOIDLAttributeBlock);
- }
- else
- {
- if ((yyextra->insideJava || yyextra->insideCS || yyextra->insideD) &&
- yyextra->current->name.isEmpty()
- )
- {
- // static Java initializer
- yyextra->needsSemi = FALSE;
- if (yyextra->current->stat)
- {
- yyextra->current->name="[static initializer]";
- yyextra->current->type.resize(0);
- }
- else
- {
- yyextra->current->name="[instance initializer]";
- }
- unput(*yytext);
- BEGIN( Function );
- }
- else
- {
- // pre C++11 code -> ignore the initializer
+ lineCount(yyscanner);
+ yyextra->externC=TRUE;
+ }
+<FindMembers>"{" {
+ if (yyextra->externC)
+ {
+ yyextra->externC=FALSE;
+ }
+ else if (yyextra->insideCS &&
+ !yyextra->current->name.isEmpty() &&
+ !yyextra->current->type.isEmpty())
+ {
+ if (containsWord(yyextra->current->type,"event")) // event
+ {
+ yyextra->current->mtype = yyextra->mtype = Event;
+ }
+ else // property
+ {
+ yyextra->current->mtype = yyextra->mtype = Property;
+ }
+ yyextra->current->bodyLine = yyextra->yyLineNr;
+ yyextra->current->bodyColumn = yyextra->yyColNr;
+ yyextra->curlyCount=0;
+ BEGIN( CSAccessorDecl );
+ }
+ else if (yyextra->insideIDL && (yyextra->current->spec & Entry::Attribute))
+ {
+ // UNO IDL: attributes may have setter and getter
+ // exception specifications
+ yyextra->current->exception = " {";
+ BEGIN(UNOIDLAttributeBlock);
+ }
+ else
+ {
+ if ((yyextra->insideJava || yyextra->insideCS || yyextra->insideD) &&
+ yyextra->current->name.isEmpty()
+ )
+ {
+ // static Java initializer
+ yyextra->needsSemi = FALSE;
+ if (yyextra->current->stat)
+ {
+ yyextra->current->name="[static initializer]";
+ yyextra->current->type.resize(0);
+ }
+ else
+ {
+ yyextra->current->name="[instance initializer]";
+ }
+ unput(*yytext);
+ BEGIN( Function );
+ }
+ else
+ {
+ // pre C++11 code -> ignore the initializer
//yyextra->needsSemi = TRUE;
- //yyextra->current->type.resize(0);
- //yyextra->current->name.resize(0);
- //yyextra->current->args.resize(0);
- //yyextra->current->argList.clear();
- //yyextra->curlyCount=0;
- //BEGIN( SkipCurlyBlock );
+ //yyextra->current->type.resize(0);
+ //yyextra->current->name.resize(0);
+ //yyextra->current->args.resize(0);
+ //yyextra->current->argList.clear();
+ //yyextra->curlyCount=0;
+ //BEGIN( SkipCurlyBlock );
// C++11 style initializer list
- yyextra->current->bodyLine = yyextra->yyLineNr;
- yyextra->current->bodyColumn = yyextra->yyColNr;
+ yyextra->current->bodyLine = yyextra->yyLineNr;
+ yyextra->current->bodyColumn = yyextra->yyColNr;
yyextra->current->initializer = yytext;
- yyextra->lastInitializerContext = YY_START;
- yyextra->initBracketCount=1;
- BEGIN(ReadInitializer);
- }
- }
- }
-<CSAccessorDecl>"{" { yyextra->curlyCount++; }
-<CSAccessorDecl>"}"{B}*"=" {
- // fall back to next rule if it's not the right bracket
- if (yyextra->curlyCount != 0) REJECT;
- yyextra->current->initializer = "=";
- yyextra->current->endBodyLine=yyextra->yyLineNr;
- yyextra->lastInitializerContext = FindMembers;
- BEGIN(ReadInitializer);
- }
-<CSAccessorDecl>"}" {
- if (yyextra->curlyCount)
- {
- yyextra->curlyCount--;
- }
- else
- {
- yyextra->mtype = Method;
+ yyextra->lastInitializerContext = YY_START;
+ yyextra->initBracketCount=1;
+ BEGIN(ReadInitializer);
+ }
+ }
+ }
+<CSAccessorDecl>"{" { yyextra->curlyCount++; }
+<CSAccessorDecl>"}"{B}*"=" {
+ // fall back to next rule if it's not the right bracket
+ if (yyextra->curlyCount != 0) REJECT;
+ yyextra->current->initializer = "=";
+ yyextra->current->endBodyLine=yyextra->yyLineNr;
+ yyextra->lastInitializerContext = FindMembers;
+ BEGIN(ReadInitializer);
+ }
+<CSAccessorDecl>"}" {
+ if (yyextra->curlyCount)
+ {
+ yyextra->curlyCount--;
+ }
+ else
+ {
+ yyextra->mtype = Method;
yyextra->virt = Normal;
- // not really important, but while we are at it
- yyextra->current->endBodyLine=yyextra->yyLineNr;
+ // not really important, but while we are at it
+ yyextra->current->endBodyLine=yyextra->yyLineNr;
unput(';');
- BEGIN(FindMembers);
- }
- }
-<CSAccessorDecl>"private "{BN}*"set" { if (yyextra->curlyCount==0) yyextra->current->spec |= Entry::PrivateSettable; }
-<CSAccessorDecl>"protected "{BN}*"set" { if (yyextra->curlyCount==0) yyextra->current->spec |= Entry::ProtectedSettable; }
-<CSAccessorDecl>"private "{BN}*"get" { if (yyextra->curlyCount==0) yyextra->current->spec |= Entry::PrivateGettable; }
-<CSAccessorDecl>"protected "{BN}*"get" { if (yyextra->curlyCount==0) yyextra->current->spec |= Entry::ProtectedGettable; }
-<CSAccessorDecl>"set" { if (yyextra->curlyCount==0) yyextra->current->spec |= Entry::Settable; }
-<CSAccessorDecl>"get" { if (yyextra->curlyCount==0) yyextra->current->spec |= Entry::Gettable; }
-<CSAccessorDecl>"add" { if (yyextra->curlyCount==0) yyextra->current->spec |= Entry::Addable; }
-<CSAccessorDecl>"remove" { if (yyextra->curlyCount==0) yyextra->current->spec |= Entry::Removable; }
-<CSAccessorDecl>"raise" { if (yyextra->curlyCount==0) yyextra->current->spec |= Entry::Raisable; }
-<CSAccessorDecl>"\"" { BEGIN(CSString);}
-<CSAccessorDecl>"." {}
-<CSAccessorDecl>\n { lineCount(yyscanner); }
-<CSString>"\"" { BEGIN(CSAccessorDecl);}
-<CSString>"//" {} // Otherwise the rule <*>"//" will kick in
-<CSString>"/*" {} // Otherwise the rule <*>"/*" will kick in
-<CSString>\n { lineCount(yyscanner); }
-<CSString>"." {}
+ BEGIN(FindMembers);
+ }
+ }
+<CSAccessorDecl>"private "{BN}*"set" { if (yyextra->curlyCount==0) yyextra->current->spec |= Entry::PrivateSettable; }
+<CSAccessorDecl>"protected "{BN}*"set" { if (yyextra->curlyCount==0) yyextra->current->spec |= Entry::ProtectedSettable; }
+<CSAccessorDecl>"private "{BN}*"get" { if (yyextra->curlyCount==0) yyextra->current->spec |= Entry::PrivateGettable; }
+<CSAccessorDecl>"protected "{BN}*"get" { if (yyextra->curlyCount==0) yyextra->current->spec |= Entry::ProtectedGettable; }
+<CSAccessorDecl>"set" { if (yyextra->curlyCount==0) yyextra->current->spec |= Entry::Settable; }
+<CSAccessorDecl>"get" { if (yyextra->curlyCount==0) yyextra->current->spec |= Entry::Gettable; }
+<CSAccessorDecl>"add" { if (yyextra->curlyCount==0) yyextra->current->spec |= Entry::Addable; }
+<CSAccessorDecl>"remove" { if (yyextra->curlyCount==0) yyextra->current->spec |= Entry::Removable; }
+<CSAccessorDecl>"raise" { if (yyextra->curlyCount==0) yyextra->current->spec |= Entry::Raisable; }
+<CSAccessorDecl>"\"" { BEGIN(CSString);}
+<CSAccessorDecl>"." {}
+<CSAccessorDecl>\n { lineCount(yyscanner); }
+<CSString>"\"" { BEGIN(CSAccessorDecl);}
+<CSString>"//" {} // Otherwise the rule <*>"//" will kick in
+<CSString>"/*" {} // Otherwise the rule <*>"/*" will kick in
+<CSString>\n { lineCount(yyscanner); }
+<CSString>"." {}
/* ---- Slice-specific rules ------ */
@@ -6244,80 +6281,80 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
/* ---- Single line comments ------ */
<DocLine>[^\n]*"\n"[ \t]*"//"[/!][<]? { // continuation of multiline C++-style comment
- yyextra->docBlock+=yytext;
+ yyextra->docBlock+=yytext;
int markerLen = yytext[yyleng-1]=='<' ? 4 : 3;
- yyextra->docBlock.resize(yyextra->docBlock.length() - markerLen);
+ yyextra->docBlock.resize(yyextra->docBlock.length() - markerLen);
lineCount(yyscanner);
}
-<DocLine>{B}*"///"[/]+{B}*/"\n" { // ignore marker line (see bug700345)
- handleCommentBlock(yyscanner,yyextra->docBlock.data(),yyextra->current->brief.isEmpty());
- BEGIN( yyextra->docBlockContext );
- }
-<DocLine>[^\n]*/"\n"{B}*"//"[!/]{B}*{CMD}"}" { // next line is an end group marker, see bug 752712
- yyextra->docBlock+=yytext;
- handleCommentBlock(yyscanner,yyextra->docBlock.data(),yyextra->current->brief.isEmpty());
- BEGIN( yyextra->docBlockContext );
- }
-<DocLine>[^\n]*/"\n" { // whole line
- yyextra->docBlock+=yytext;
- handleCommentBlock(yyscanner,yyextra->docBlock.data(),yyextra->current->brief.isEmpty());
- BEGIN( yyextra->docBlockContext );
- }
+<DocLine>{B}*"///"[/]+{B}*/"\n" { // ignore marker line (see bug700345)
+ handleCommentBlock(yyscanner,yyextra->docBlock.data(),yyextra->current->brief.isEmpty());
+ BEGIN( yyextra->docBlockContext );
+ }
+<DocLine>[^\n]*/"\n"{B}*"//"[!/]{B}*{CMD}"}" { // next line is an end group marker, see bug 752712
+ yyextra->docBlock+=yytext;
+ handleCommentBlock(yyscanner,yyextra->docBlock.data(),yyextra->current->brief.isEmpty());
+ BEGIN( yyextra->docBlockContext );
+ }
+<DocLine>[^\n]*/"\n" { // whole line
+ yyextra->docBlock+=yytext;
+ handleCommentBlock(yyscanner,yyextra->docBlock.data(),yyextra->current->brief.isEmpty());
+ BEGIN( yyextra->docBlockContext );
+ }
/* ---- Comments blocks ------ */
-<DocBlock>"*"*"*/" { // end of comment block
- handleCommentBlock(yyscanner,yyextra->docBlock.data(),FALSE);
- BEGIN(yyextra->docBlockContext);
- }
-<DocBlock>^{B}*"*"+/[^/] {
+<DocBlock>"*"*"*/" { // end of comment block
+ handleCommentBlock(yyscanner,yyextra->docBlock.data(),FALSE);
+ BEGIN(yyextra->docBlockContext);
+ }
+<DocBlock>^{B}*"*"+/[^/] {
QCString indent;
indent.fill(' ',computeIndent(yytext,yyextra->column));
yyextra->docBlock+=indent;
- }
-<DocBlock>^{B}*("//")?{B}*"*"+/[^//a-z_A-Z0-9*] { // start of a comment line
+ }
+<DocBlock>^{B}*("//")?{B}*"*"+/[^//a-z_A-Z0-9*] { // start of a comment line
QCString indent;
indent.fill(' ',computeIndent(yytext,yyextra->column));
yyextra->docBlock+=indent;
- }
-<DocBlock>^{B}*("//"){B}* { // strip embedded C++ comments if at the start of a line
- }
-<DocBlock>"//" { // slashes in the middle of a comment block
- yyextra->docBlock+=yytext;
- }
-<DocBlock>"/*" { // start of a new comment in the
+ }
+<DocBlock>^{B}*("//"){B}* { // strip embedded C++ comments if at the start of a line
+ }
+<DocBlock>"//" { // slashes in the middle of a comment block
+ yyextra->docBlock+=yytext;
+ }
+<DocBlock>"/*" { // start of a new comment in the
// middle of a comment block
- yyextra->docBlock+=yytext;
- }
+ yyextra->docBlock+=yytext;
+ }
<DocBlock>({CMD}{CMD}){ID}/[^a-z_A-Z0-9] { // escaped command
- yyextra->docBlock+=yytext;
- }
-<DocBlock>{CMD}("f$"|"f["|"f{") {
yyextra->docBlock+=yytext;
- yyextra->docBlockName=&yytext[1];
- if (yyextra->docBlockName.at(1)=='{')
- {
- yyextra->docBlockName.at(1)='}';
- }
+ }
+<DocBlock>{CMD}("f$"|"f["|"f{") {
+ yyextra->docBlock+=yytext;
+ yyextra->docBlockName=&yytext[1];
+ if (yyextra->docBlockName.at(1)=='{')
+ {
+ yyextra->docBlockName.at(1)='}';
+ }
yyextra->fencedSize=0;
yyextra->nestedComment=FALSE;
- BEGIN(DocCopyBlock);
+ BEGIN(DocCopyBlock);
}
-<DocBlock>{B}*"<"{PRE}">" {
+<DocBlock>{B}*"<"{PRE}">" {
yyextra->docBlock+=yytext;
- yyextra->docBlockName="<pre>";
+ yyextra->docBlockName="<pre>";
yyextra->fencedSize=0;
yyextra->nestedComment=FALSE;
- BEGIN(DocCopyBlock);
- }
-<DocBlock>{CMD}("verbatim"|"latexonly"|"htmlonly"|"xmlonly"|"manonly"|"rtfonly"|"docbookonly"|"dot"|"code")/[^a-z_A-Z0-9\-] { // verbatim command (which could contain nested comments!)
+ BEGIN(DocCopyBlock);
+ }
+<DocBlock>{CMD}("verbatim"|"latexonly"|"htmlonly"|"xmlonly"|"manonly"|"rtfonly"|"docbookonly"|"dot"|"code")/[^a-z_A-Z0-9\-] { // verbatim command (which could contain nested comments!)
yyextra->docBlock+=yytext;
- yyextra->docBlockName=&yytext[1];
+ yyextra->docBlockName=&yytext[1];
yyextra->fencedSize=0;
yyextra->nestedComment=FALSE;
- BEGIN(DocCopyBlock);
- }
+ BEGIN(DocCopyBlock);
+ }
<DocBlock>^({B}*"*"+)?{B}{0,3}"~~~"[~]* {
QCString pat = substitute(yytext,"*"," ");
@@ -6336,86 +6373,86 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
BEGIN(DocCopyBlock);
}
<DocBlock>{B}*"<code>" {
- if (yyextra->insideCS)
- {
- yyextra->docBlock+=yytext;
- yyextra->docBlockName="<code>";
+ if (yyextra->insideCS)
+ {
+ yyextra->docBlock+=yytext;
+ yyextra->docBlockName="<code>";
yyextra->nestedComment=FALSE;
- BEGIN(DocCopyBlock);
- }
- else
- {
- REJECT;
- }
- }
-<DocBlock>[^@*~\/\\\n]+ { // any character that isn't special
- yyextra->docBlock+=yytext;
- }
-<DocBlock>\n { // newline
+ BEGIN(DocCopyBlock);
+ }
+ else
+ {
+ REJECT;
+ }
+ }
+<DocBlock>[^@*~\/\\\n]+ { // any character that isn't special
+ yyextra->docBlock+=yytext;
+ }
+<DocBlock>\n { // newline
lineCount(yyscanner);
- yyextra->docBlock+=*yytext;
- }
-<DocBlock>. { // command block
- yyextra->docBlock+=*yytext;
- }
+ yyextra->docBlock+=*yytext;
+ }
+<DocBlock>. { // command block
+ yyextra->docBlock+=*yytext;
+ }
/* ---- Copy verbatim sections ------ */
-<DocCopyBlock>"</"{PRE}">" { // end of a <pre> block
- yyextra->docBlock+=yytext;
- if (yyextra->docBlockName=="<pre>")
- {
- BEGIN(DocBlock);
- }
- }
-<DocCopyBlock>"</"{CODE}">" { // end of a <code> block
- yyextra->docBlock+=yytext;
- if (yyextra->docBlockName=="<code>")
- {
- BEGIN(DocBlock);
- }
- }
+<DocCopyBlock>"</"{PRE}">" { // end of a <pre> block
+ yyextra->docBlock+=yytext;
+ if (yyextra->docBlockName=="<pre>")
+ {
+ BEGIN(DocBlock);
+ }
+ }
+<DocCopyBlock>"</"{CODE}">" { // end of a <code> block
+ yyextra->docBlock+=yytext;
+ if (yyextra->docBlockName=="<code>")
+ {
+ BEGIN(DocBlock);
+ }
+ }
<DocCopyBlock>[\\@]("f$"|"f]"|"f}") {
- yyextra->docBlock+=yytext;
- BEGIN(DocBlock);
- }
+ yyextra->docBlock+=yytext;
+ BEGIN(DocBlock);
+ }
<DocCopyBlock>[\\@]("endverbatim"|"endlatexonly"|"endhtmlonly"|"endxmlonly"|"enddocbookonly"|"endmanonly"|"endrtfonly"|"enddot"|"endcode")/[^a-z_A-Z0-9] { // end of verbatim block
- yyextra->docBlock+=yytext;
- if (&yytext[4]==yyextra->docBlockName)
- {
- BEGIN(DocBlock);
- }
- }
-<DocCopyBlock>^{B}*"*"+/{BN}+ { // start of a comment line
- if (yyextra->docBlockName=="verbatim")
- {
- REJECT;
- }
- else if (yyextra->docBlockName=="code")
- {
- REJECT;
- }
+ yyextra->docBlock+=yytext;
+ if (&yytext[4]==yyextra->docBlockName)
+ {
+ BEGIN(DocBlock);
+ }
+ }
+<DocCopyBlock>^{B}*"*"+/{BN}+ { // start of a comment line
+ if (yyextra->docBlockName=="verbatim")
+ {
+ REJECT;
+ }
+ else if (yyextra->docBlockName=="code")
+ {
+ REJECT;
+ }
else
{
QCString indent;
indent.fill(' ',computeIndent(yytext,0));
yyextra->docBlock+=indent;
}
- }
-<DocCopyBlock>^{B}*"*"+/{B}+"*"{BN}* { // start of a comment line with two *'s
- if (yyextra->docBlockName=="code")
+ }
+<DocCopyBlock>^{B}*"*"+/{B}+"*"{BN}* { // start of a comment line with two *'s
+ if (yyextra->docBlockName=="code")
{
QCString indent;
indent.fill(' ',computeIndent(yytext,0));
yyextra->docBlock+=indent;
}
else
- {
- REJECT;
- }
- }
-<DocCopyBlock>^{B}*"*"+/({ID}|"(") { // Assume *var or *(... is part of source code (see bug723516)
- if (yyextra->docBlockName=="code")
+ {
+ REJECT;
+ }
+ }
+<DocCopyBlock>^{B}*"*"+/({ID}|"(") { // Assume *var or *(... is part of source code (see bug723516)
+ if (yyextra->docBlockName=="code")
{
QCString indent;
indent.fill(' ',computeIndent(yytext,-1));
@@ -6426,8 +6463,8 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
REJECT;
}
}
-<DocCopyBlock>^{B}*"*"+/{BN}* { // start of a comment line with one *
- if (yyextra->docBlockName=="code")
+<DocCopyBlock>^{B}*"*"+/{BN}* { // start of a comment line with one *
+ if (yyextra->docBlockName=="code")
{
QCString indent;
if (yyextra->nestedComment) // keep * it is part of the code
@@ -6442,10 +6479,10 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
}
}
else
- {
- REJECT;
- }
- }
+ {
+ REJECT;
+ }
+ }
<DocCopyBlock>^({B}*"*"+)?{B}{0,3}"~~~"[~]* {
QCString pat = substitute(yytext,"*"," ");
yyextra->docBlock+=pat;
@@ -6462,10 +6499,10 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
BEGIN(DocBlock);
}
}
-<DocCopyBlock>[^\<@/*\]~\$\\\n]+ { // any character that is not special
- yyextra->docBlock+=yytext;
- }
-<DocCopyBlock>"/*"|"*/"|"//" {
+<DocCopyBlock>[^\<@/*\]~\$\\\n]+ { // any character that is not special
+ yyextra->docBlock+=yytext;
+ }
+<DocCopyBlock>"/*"|"*/"|"//" {
if (yytext[1]=='*')
{
yyextra->nestedComment=TRUE;
@@ -6474,110 +6511,117 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
{
yyextra->nestedComment=FALSE;
}
- yyextra->docBlock+=yytext;
- }
-<DocCopyBlock>\n { // newline
- yyextra->docBlock+=*yytext;
+ yyextra->docBlock+=yytext;
+ }
+<DocCopyBlock>\n { // newline
+ yyextra->docBlock+=*yytext;
lineCount(yyscanner);
- }
-<DocCopyBlock>. { // any other character
- yyextra->docBlock+=*yytext;
- }
-<DocCopyBlock><<EOF>> {
- warn(yyextra->yyFileName,yyextra->yyLineNr,
- "reached end of file while inside a '%s' block!\n"
- "The command that should end the block seems to be missing!\n",
- yyextra->docBlockName.data());
- yyterminate();
- }
+ }
+<DocCopyBlock>. { // any other character
+ yyextra->docBlock+=*yytext;
+ }
+<DocCopyBlock><<EOF>> {
+ warn(yyextra->yyFileName,yyextra->yyLineNr,
+ "reached end of file while inside a '%s' block!\n"
+ "The command that should end the block seems to be missing!\n",
+ yyextra->docBlockName.data());
+ yyterminate();
+ }
/* ------------- Prototype parser -------------- */
-<Prototype>"operator"{B}*"("{B}*")" {
- yyextra->current->name+=yytext;
- }
-<Prototype>"(" {
- yyextra->current->args+=*yytext;
- yyextra->currentArgumentContext = PrototypeQual;
- yyextra->fullArgString = yyextra->current->args.copy();
- yyextra->copyArgString = &yyextra->current->args;
- BEGIN( ReadFuncArgType ) ;
- }
-<Prototype>"("({ID}"::")*({B}*[&*])+ {
- yyextra->current->type+=yyextra->current->name+yytext;
- yyextra->current->name.resize(0);
- BEGIN( PrototypePtr );
- }
-<PrototypePtr>{SCOPENAME} {
- yyextra->current->name+=yytext;
- }
-<PrototypePtr>"(" {
- yyextra->current->args+=*yytext;
- yyextra->currentArgumentContext = PrototypeQual;
- yyextra->fullArgString = yyextra->current->args.copy();
- yyextra->copyArgString = &yyextra->current->args;
- BEGIN( ReadFuncArgType ) ;
- }
-<PrototypePtr>")" {
- yyextra->current->type+=')';
- BEGIN( Prototype );
- }
-<PrototypePtr>. {
- yyextra->current->name+=yytext;
- }
-<PrototypeQual>"{" {
- BEGIN( PrototypeSkipLine);
- }
-<PrototypeQual>{B}*"const"{B}* {
- yyextra->current->args += " const ";
- yyextra->current->argList.setConstSpecifier(TRUE);
- }
-<PrototypeQual>{B}*"volatile"{B}* {
- yyextra->current->args += " volatile ";
- yyextra->current->argList.setVolatileSpecifier(TRUE);
- }
-<PrototypeQual>{B}*"="{B}*"0"{B}* {
- yyextra->current->args += " = 0";
- yyextra->current->virt = Pure;
- yyextra->current->argList.setPureSpecifier(TRUE);
- }
-<PrototypeQual>"throw"{B}*"(" {
- yyextra->current->exception = "throw(";
- BEGIN(PrototypeExc);
- }
-<PrototypeExc>")" {
- yyextra->current->exception += ')';
- BEGIN(PrototypeQual);
- }
-<PrototypeExc>. {
- yyextra->current->exception += *yytext;
- }
-<PrototypeQual>. {
- yyextra->current->args += *yytext;
- }
-<Prototype>. {
- yyextra->current->name += *yytext;
- }
-<PrototypeSkipLine>. {
- }
-
-
-
-
-<SkipCxxComment>.*"\\\n" { // line continuation
- if (yyextra->insideCS)
- {
- REJECT;
- }
- else
- {
+<Prototype>"operator"{B}*"("{B}*")" {
+ yyextra->current->name+=yytext;
+ }
+<Prototype>"(" {
+ yyextra->current->args+=*yytext;
+ yyextra->currentArgumentContext = PrototypeQual;
+ yyextra->fullArgString = yyextra->current->args.copy();
+ yyextra->copyArgString = &yyextra->current->args;
+ BEGIN( ReadFuncArgType ) ;
+ }
+<Prototype>"("({ID}"::")*({B}*[&*])+ {
+ if (yyextra->insidePHP) // reference parameter
+ {
+ REJECT;
+ }
+ else
+ {
+ yyextra->current->type+=yyextra->current->name+yytext;
+ yyextra->current->name.resize(0);
+ BEGIN( PrototypePtr );
+ }
+ }
+<PrototypePtr>{SCOPENAME} {
+ yyextra->current->name+=yytext;
+ }
+<PrototypePtr>"(" {
+ yyextra->current->args+=*yytext;
+ yyextra->currentArgumentContext = PrototypeQual;
+ yyextra->fullArgString = yyextra->current->args.copy();
+ yyextra->copyArgString = &yyextra->current->args;
+ BEGIN( ReadFuncArgType ) ;
+ }
+<PrototypePtr>")" {
+ yyextra->current->type+=')';
+ BEGIN( Prototype );
+ }
+<PrototypePtr>. {
+ yyextra->current->name+=yytext;
+ }
+<PrototypeQual>"{" {
+ BEGIN( PrototypeSkipLine);
+ }
+<PrototypeQual>{B}*"const"{B}* {
+ yyextra->current->args += " const ";
+ yyextra->current->argList.setConstSpecifier(TRUE);
+ }
+<PrototypeQual>{B}*"volatile"{B}* {
+ yyextra->current->args += " volatile ";
+ yyextra->current->argList.setVolatileSpecifier(TRUE);
+ }
+<PrototypeQual>{B}*"="{B}*"0"{B}* {
+ yyextra->current->args += " = 0";
+ yyextra->current->virt = Pure;
+ yyextra->current->argList.setPureSpecifier(TRUE);
+ }
+<PrototypeQual>"throw"{B}*"(" {
+ yyextra->current->exception = "throw(";
+ BEGIN(PrototypeExc);
+ }
+<PrototypeExc>")" {
+ yyextra->current->exception += ')';
+ BEGIN(PrototypeQual);
+ }
+<PrototypeExc>. {
+ yyextra->current->exception += *yytext;
+ }
+<PrototypeQual>. {
+ yyextra->current->args += *yytext;
+ }
+<Prototype>. {
+ yyextra->current->name += *yytext;
+ }
+<PrototypeSkipLine>. {
+ }
+
+
+
+
+<SkipCxxComment>.*"\\\n" { // line continuation
+ if (yyextra->insideCS)
+ {
+ REJECT;
+ }
+ else
+ {
lineCount(yyscanner);
- }
- }
-<SkipCxxComment>.*/\n {
- BEGIN( yyextra->lastCContext ) ;
- }
+ }
+ }
+<SkipCxxComment>.*/\n {
+ BEGIN( yyextra->lastCContext ) ;
+ }
<SkipComment>[^\*\n]+
/* ------------ Generic rules -------------- */
@@ -6589,59 +6633,59 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
BEGIN( SkipC11Attribute );
}
-<*>\n { lineCount(yyscanner); }
-<*>\" {
- if (yyextra->insideIDL && yyextra->insideCppQuote)
- {
- BEGIN(EndCppQuote);
- }
- }
-<*>"#" {
- if (!yyextra->insidePHP)
- REJECT;
- yyextra->lastCContext = YY_START ;
- BEGIN( SkipCxxComment ) ;
- }
-<*>\' {
- if (yyextra->insidePHP)
- {
- yyextra->lastStringContext=YY_START;
- BEGIN(SkipPHPString);
- }
- }
-<*>\" {
- if (yyextra->insidePHP)
- {
- yyextra->lastStringContext=YY_START;
- BEGIN(SkipString);
- }
- }
+<*>\n { lineCount(yyscanner); }
+<*>\" {
+ if (yyextra->insideIDL && yyextra->insideCppQuote)
+ {
+ BEGIN(EndCppQuote);
+ }
+ }
+<*>"#" {
+ if (!yyextra->insidePHP)
+ REJECT;
+ yyextra->lastCContext = YY_START ;
+ BEGIN( SkipCxxComment ) ;
+ }
+<*>\' {
+ if (yyextra->insidePHP)
+ {
+ yyextra->lastStringContext=YY_START;
+ BEGIN(SkipPHPString);
+ }
+ }
+<*>\" {
+ if (yyextra->insidePHP)
+ {
+ yyextra->lastStringContext=YY_START;
+ BEGIN(SkipString);
+ }
+ }
<*>\? {
- if (yyextra->insideCS && (YY_START != SkipRound))
- {
- if (yyextra->current->type.isEmpty())
- {
- if (yyextra->current->name.isEmpty())
- yyextra->current->name="?";
- else
- yyextra->current->name+="?";
- }
- else
- {
- yyextra->current->type+="?";
- }
- }
- }
+ if (yyextra->insideCS && (YY_START != SkipRound))
+ {
+ if (yyextra->current->type.isEmpty())
+ {
+ if (yyextra->current->name.isEmpty())
+ yyextra->current->name="?";
+ else
+ yyextra->current->name+="?";
+ }
+ else
+ {
+ yyextra->current->type+="?";
+ }
+ }
+ }
<*>.
<SkipComment>"//"|"/*"
-<*>"/*" { yyextra->lastCContext = YY_START ;
- BEGIN( SkipComment ) ;
- }
-<SkipComment>{B}*"*/" { BEGIN( yyextra->lastCContext ) ; }
-<*>"//" {
- yyextra->lastCContext = YY_START ;
- BEGIN( SkipCxxComment ) ;
- }
+<*>"/*" { yyextra->lastCContext = YY_START ;
+ BEGIN( SkipComment ) ;
+ }
+<SkipComment>{B}*"*/" { BEGIN( yyextra->lastCContext ) ; }
+<*>"//" {
+ yyextra->lastCContext = YY_START ;
+ BEGIN( SkipCxxComment ) ;
+ }
%%
//----------------------------------------------------------------------------
@@ -6686,7 +6730,7 @@ static void initParser(yyscan_t yyscanner)
static void initEntry(yyscan_t yyscanner)
{
struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
- if (yyextra->insideJava)
+ if (yyextra->insideJava)
{
yyextra->protection = (yyextra->current_root->spec & (Entry::Interface|Entry::Enum)) ? Public : Package;
}
@@ -6710,15 +6754,15 @@ static void lineCount(yyscan_t yyscanner)
const char *p;
for (p = yytext ; *p ; ++p )
{
- if (*p=='\n')
+ if (*p=='\n')
{
yyextra->yyLineNr++,yyextra->column=0,yyextra->yyColNr=1;
}
- else if (*p=='\t')
+ else if (*p=='\t')
{
yyextra->column+=tabSize - (yyextra->column%tabSize);
}
- else
+ else
{
yyextra->column++,yyextra->yyColNr++;
}
@@ -6745,14 +6789,14 @@ static void addType(yyscan_t yyscanner)
{
struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
uint tl=yyextra->current->type.length();
- if( tl>0 && !yyextra->current->name.isEmpty() && yyextra->current->type.at(tl-1)!='.')
+ if( tl>0 && !yyextra->current->name.isEmpty() && yyextra->current->type.at(tl-1)!='.')
{
yyextra->current->type += ' ' ;
}
yyextra->current->type += yyextra->current->name ;
yyextra->current->name.resize(0) ;
tl=yyextra->current->type.length();
- if( tl>0 && !yyextra->current->args.isEmpty() && yyextra->current->type.at(tl-1)!='.')
+ if( tl>0 && !yyextra->current->args.isEmpty() && yyextra->current->type.at(tl-1)!='.')
{
yyextra->current->type += ' ' ;
}
@@ -6793,7 +6837,7 @@ static void setContext(yyscan_t yyscanner)
yyextra->language = getLanguageFromFileName(yyextra->yyFileName);
yyextra->insideIDL = yyextra->language==SrcLangExt_IDL;
yyextra->insideJava = yyextra->language==SrcLangExt_Java;
- yyextra->insideCS = yyextra->language==SrcLangExt_CSharp;
+ yyextra->insideCS = yyextra->language==SrcLangExt_CSharp;
yyextra->insideD = yyextra->language==SrcLangExt_D;
yyextra->insidePHP = yyextra->language==SrcLangExt_PHP;
yyextra->insideObjC = yyextra->language==SrcLangExt_ObjC;
@@ -6803,7 +6847,7 @@ static void setContext(yyscan_t yyscanner)
//printf("setContext(%s) yyextra->insideIDL=%d yyextra->insideJava=%d yyextra->insideCS=%d "
// "yyextra->insideD=%d yyextra->insidePHP=%d yyextra->insideObjC=%d\n",
// yyextra->yyFileName.data(),yyextra->insideIDL,yyextra->insideJava,yyextra->insideCS,yyextra->insideD,yyextra->insidePHP,yyextra->insideObjC
- // );
+ // );
}
//-----------------------------------------------------------------------------
@@ -6850,7 +6894,7 @@ static void splitKnRArg(yyscan_t yyscanner,QCString &oldStyleArgPtr,QCString &ol
{
static QRegExp re("([^)]*)");
int bi1 = yyextra->current->args.findRev(re);
- int bi2 = bi1!=-1 ? yyextra->current->args.findRev(re,bi1-1) : -1;
+ int bi2 = bi1!=-1 ? yyextra->current->args.findRev(re,bi1-1) : -1;
char c;
if (bi1!=-1 && bi2!=-1) // found something like "int (*func)(int arg)"
{
@@ -6887,13 +6931,13 @@ static void splitKnRArg(yyscan_t yyscanner,QCString &oldStyleArgPtr,QCString &ol
i++;
if (i!=l)
{
- yyextra->oldStyleArgType=yyextra->current->args.left(i);
- oldStyleArgPtr=yyextra->current->args.mid(i,j-i);
- oldStyleArgName=yyextra->current->args.mid(j).stripWhiteSpace();
+ yyextra->oldStyleArgType=yyextra->current->args.left(i);
+ oldStyleArgPtr=yyextra->current->args.mid(i,j-i);
+ oldStyleArgName=yyextra->current->args.mid(j).stripWhiteSpace();
}
else
{
- oldStyleArgName=yyextra->current->args.copy().stripWhiteSpace();
+ oldStyleArgName=yyextra->current->args.copy().stripWhiteSpace();
}
}
}
@@ -6931,7 +6975,7 @@ static void addKnRArgInfo(yyscan_t yyscanner,const QCString &type,const QCString
a.type=type.stripWhiteSpace();
if (a.type.left(9)=="register ") // strip keyword
{
- a.type=a.type.mid(9);
+ a.type=a.type.mid(9);
}
a.name=name.stripWhiteSpace();
if (!brief.isEmpty() && !docs.isEmpty())
@@ -6944,7 +6988,7 @@ static void addKnRArgInfo(yyscan_t yyscanner,const QCString &type,const QCString
}
else
{
- a.docs=docs;
+ a.docs=docs;
}
}
}
@@ -6980,15 +7024,15 @@ static void startCommentBlock(yyscan_t yyscanner,bool brief)
yyextra->current->docLine = yyextra->yyLineNr;
}
}
-
+
//----------------------------------------------------------------------------
static void newEntry(yyscan_t yyscanner)
{
struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
- if (yyextra->tempEntry==0) // if temp entry is not 0, it holds yyextra->current,
- // and yyextra->current is actually replaced by yyextra->previous which was
- // already added to yyextra->current_root, so we should not add it again
+ if (yyextra->tempEntry==0) // if temp entry is not 0, it holds yyextra->current,
+ // and yyextra->current is actually replaced by yyextra->previous which was
+ // already added to yyextra->current_root, so we should not add it again
// (see bug723314)
{
yyextra->previous = yyextra->current;
@@ -7025,15 +7069,15 @@ static void handleCommentBlock(yyscan_t yyscanner,const QCString &doc,bool brief
QCString strippedDoc = stripIndentation(doc);
QCString processedDoc = Config_getBool(MARKDOWN_SUPPORT) ? markdown.process(strippedDoc,lineNr) : strippedDoc;
while (yyextra->commentScanner.parseCommentBlock(
- yyextra->thisParser,
- yyextra->docBlockInBody && yyextra->previous ? yyextra->previous.get() : yyextra->current.get(),
- processedDoc, // text
- yyextra->yyFileName, // file
- lineNr, // line of block start
- yyextra->docBlockInBody ? FALSE : brief, // isBrief
- yyextra->docBlockInBody ? FALSE : yyextra->docBlockAutoBrief, // isJavaDocStyle
- yyextra->docBlockInBody, // isInBody
- yyextra->protection,
+ yyextra->thisParser,
+ yyextra->docBlockInBody && yyextra->previous ? yyextra->previous.get() : yyextra->current.get(),
+ processedDoc, // text
+ yyextra->yyFileName, // file
+ lineNr, // line of block start
+ yyextra->docBlockInBody ? FALSE : brief, // isBrief
+ yyextra->docBlockInBody ? FALSE : yyextra->docBlockAutoBrief, // isJavaDocStyle
+ yyextra->docBlockInBody, // isInBody
+ yyextra->protection,
position,
needsEntry,
Config_getBool(MARKDOWN_SUPPORT)
@@ -7041,7 +7085,7 @@ static void handleCommentBlock(yyscan_t yyscanner,const QCString &doc,bool brief
)
{
//printf("parseCommentBlock position=%d [%s]\n",position,doc.data()+position);
- if (needsEntry)
+ if (needsEntry)
{
QCString docFile = yyextra->current->docFile;
newEntry(yyscanner);
@@ -7085,27 +7129,27 @@ static void handleParametersCommentBlocks(yyscan_t yyscanner,ArgumentList &al)
//printf("handleParametersCommentBlock [%s]\n",doc.data());
while (yyextra->commentScanner.parseCommentBlock(
- yyextra->thisParser,
- yyextra->current.get(),
- a.docs, // text
- yyextra->yyFileName, // file
- yyextra->current->docLine, // line of block start
- FALSE,
- FALSE,
- FALSE,
- yyextra->protection,
- position,
- needsEntry,
+ yyextra->thisParser,
+ yyextra->current.get(),
+ a.docs, // text
+ yyextra->yyFileName, // file
+ yyextra->current->docLine, // line of block start
+ FALSE,
+ FALSE,
+ FALSE,
+ yyextra->protection,
+ position,
+ needsEntry,
Config_getBool(MARKDOWN_SUPPORT)
- )
- )
+ )
+ )
{
- //printf("handleParametersCommentBlock position=%d [%s]\n",position,doc.data()+position);
- if (needsEntry) newEntry(yyscanner);
+ //printf("handleParametersCommentBlock position=%d [%s]\n",position,doc.data()+position);
+ if (needsEntry) newEntry(yyscanner);
}
if (needsEntry)
{
- newEntry(yyscanner);
+ newEntry(yyscanner);
}
a.docs = yyextra->current->doc;
@@ -7138,9 +7182,9 @@ static void parseCompounds(yyscan_t yyscanner,const std::shared_ptr<Entry> &rt)
yyextra->inputString = ce->program;
yyextra->inputPosition = 0;
if (ce->section==Entry::ENUM_SEC || (ce->spec&Entry::Enum))
- BEGIN( FindFields ) ;
+ BEGIN( FindFields ) ;
else
- BEGIN( FindMembers ) ;
+ BEGIN( FindMembers ) ;
yyextra->current_root = ce;
yyextra->yyFileName = ce->fileName;
//setContext();
@@ -7164,44 +7208,44 @@ static void parseCompounds(yyscan_t yyscanner,const std::shared_ptr<Entry> &rt)
if( ce->section==Entry::CLASS_SEC ) // class
{
if (yyextra->insidePHP || yyextra->insideD || yyextra->insideJS || yyextra->insideIDL || yyextra->insideSlice)
- {
- yyextra->current->protection = yyextra->protection = Public ;
- }
- else if (yyextra->insideJava)
- {
+ {
+ yyextra->current->protection = yyextra->protection = Public ;
+ }
+ else if (yyextra->insideJava)
+ {
yyextra->current->protection = yyextra->protection = (ce->spec & (Entry::Interface|Entry::Enum)) ? Public : Package;
- }
- else if (ce->spec&(Entry::Interface | Entry::Ref | Entry::Value | Entry::Struct | Entry::Union))
- {
- if (ce->lang==SrcLangExt_ObjC)
- {
- yyextra->current->protection = yyextra->protection = Protected ;
- }
- else
- {
- yyextra->current->protection = yyextra->protection = Public ;
- }
- }
- else
- {
+ }
+ else if (ce->spec&(Entry::Interface | Entry::Ref | Entry::Value | Entry::Struct | Entry::Union))
+ {
+ if (ce->lang==SrcLangExt_ObjC)
+ {
+ yyextra->current->protection = yyextra->protection = Protected ;
+ }
+ else
+ {
+ yyextra->current->protection = yyextra->protection = Public ;
+ }
+ }
+ else
+ {
yyextra->current->protection = yyextra->protection = Private ;
- }
+ }
}
else if (ce->section == Entry::ENUM_SEC ) // enum
{
- yyextra->current->protection = yyextra->protection = ce->protection;
+ yyextra->current->protection = yyextra->protection = ce->protection;
}
else if (!ce->name.isEmpty() && ce->name.at(ni)=='@') // unnamed union or namespace
{
- if (ce->section == Entry::NAMESPACE_SEC ) // unnamed namespace
- {
+ if (ce->section == Entry::NAMESPACE_SEC ) // unnamed namespace
+ {
yyextra->current->stat = yyextra->stat = TRUE;
- }
- yyextra->current->protection = yyextra->protection = ce->protection;
+ }
+ yyextra->current->protection = yyextra->protection = ce->protection;
}
else // named struct, union, protocol, category
{
- yyextra->current->protection = yyextra->protection = Public ;
+ yyextra->current->protection = yyextra->protection = Public ;
}
yyextra->mtype = Method;
yyextra->virt = Normal;
@@ -7212,19 +7256,19 @@ static void parseCompounds(yyscan_t yyscanner,const std::shared_ptr<Entry> &rt)
//memberGroupInside.resize(0);
QCString name = ce->name;
yyextra->commentScanner.enterCompound(yyextra->yyFileName,yyextra->yyLineNr,name);
-
+
scannerYYlex(yyscanner);
yyextra->lexInit=TRUE;
//forceEndGroup();
yyextra->commentScanner.leaveCompound(yyextra->yyFileName,yyextra->yyLineNr,name);
-
+
ce->program.resize(0);
//if (depthIf>0)
//{
- // warn(yyextra->yyFileName,yyextra->yyLineNr,"Documentation block ended in the middle of a conditional section!");
+ // warn(yyextra->yyFileName,yyextra->yyLineNr,"Documentation block ended in the middle of a conditional section!");
//}
}
parseCompounds(yyscanner,ce);
@@ -7247,7 +7291,6 @@ static void parseMain(yyscan_t yyscanner,
yyextra->column = 0;
scannerYYrestart(0,yyscanner);
- //yyextra->anonCount = 0; // don't reset per file
//depthIf = 0;
yyextra->protection = Public;
yyextra->mtype = Method;
@@ -7301,7 +7344,7 @@ static void parseMain(yyscan_t yyscanner,
parseCompounds(yyscanner,rt);
- yyextra->anonNSCount++;
+ anonNSCount++;
// add additional entries that were created during processing
for (auto &kv: yyextra->outerScopeEntries)
@@ -7319,7 +7362,7 @@ static void parsePrototype(yyscan_t yyscanner,const QCString &text)
{
struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
//printf("**** parsePrototype(%s) begin\n",text.data());
- if (text.isEmpty())
+ if (text.isEmpty())
{
warn(yyextra->yyFileName,yyextra->yyLineNr,"Empty prototype found!");
return;
@@ -7332,11 +7375,11 @@ static void parsePrototype(yyscan_t yyscanner,const QCString &text)
const char *orgInputString;
int orgInputPosition;
YY_BUFFER_STATE orgState;
-
+
// save scanner state
orgState = YY_CURRENT_BUFFER;
yy_switch_to_buffer(yy_create_buffer(0, YY_BUF_SIZE, yyscanner), yyscanner);
- orgInputString = yyextra->inputString;
+ orgInputString = yyextra->inputString;
orgInputPosition = yyextra->inputPosition;
// set new string
@@ -7356,7 +7399,7 @@ static void parsePrototype(yyscan_t yyscanner,const QCString &text)
YY_BUFFER_STATE tmpState = YY_CURRENT_BUFFER;
yy_switch_to_buffer(orgState, yyscanner);
yy_delete_buffer(tmpState, yyscanner);
- yyextra->inputString = orgInputString;
+ yyextra->inputString = orgInputString;
yyextra->inputPosition = orgInputPosition;
@@ -7417,7 +7460,7 @@ bool COutlineParser::needsPreprocessing(const QCString &extension) const
QCString fe=extension.lower();
SrcLangExt lang = getLanguageFromFileName(extension);
return (SrcLangExt_Cpp == lang) ||
- !( fe==".java" || fe==".as" || fe==".d" || fe==".php" ||
+ !( fe==".java" || fe==".as" || fe==".d" || fe==".php" ||
fe==".php4" || fe==".inc" || fe==".phtml"|| fe==".php5"
);
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 22:09:10 +0000