MCL/sftools/depl/doctools: comparison Orb/Doxygen/src/scanner.l

equal deleted inserted replaced

-:d8fccb2cd802
+:468f4c8d3d5b
 /*****************************************************************************
 *
 *
 *
-* Copyright (C) 1997-2008 by Dimitri van Heesch.
+* Copyright (C) 1997-2010 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
 * for any purpose. It is provided "as is" without express or implied warranty.
 static bool             insideFormula;
 static bool  	        insideTryBlock=FALSE;
 static bool             insideCode;
 static bool             needsSemi;
-static int              depthIf;
+//static int              depthIf;
 static int  	        initBracketCount;
 static QCString         memberGroupRelates;
 static QCString         memberGroupInside;
 static QCString         xrefItemKey;
 static QCString         xrefItemTitle;
 FILE      ({FILESCHAR}*{FILEECHAR}+("."{FILESCHAR}*{FILEECHAR}+)*)|("\""[^\n\"]+"\"")
 ID        "$"?[a-z_A-Z\x80-\xFF][a-z_A-Z0-9\x80-\xFF]*
 SCOPEID   {ID}({ID}*{BN}*"::"{BN}*)*({ID}?)
 SCOPENAME "$"?(({ID}?{BN}*"::"{BN}*)*)(((~|!){BN}*)?{ID})
 TSCOPE    {ID}("<"[a-z_A-Z0-9 \t\*\&,]*">")?
-FTSCOPE   {ID}("<"[a-z_A-Z0-9\*\&,]*">")?
 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_;]
 					  {
 					    current->tArgLists = new QList<ArgumentList>;
 					    current->tArgLists->setAutoDelete(TRUE);
 					  }
 					  ArgumentList *al = new ArgumentList;
-					  current->spec |= (yytext[0]=='g') ? Entry::Generic : Entry::Template;
+					  //current->spec |= (yytext[0]=='g') ? Entry::Generic : Entry::Template;
 					  current->tArgLists->append(al);
 					  currentArgumentList = al;
 					  templateStr="<";
 					  fullArgString = templateStr;
 					  copyArgString = &templateStr;
 				          current->type+=yytext;
 					}
 <QtPropType>{B}+			{
 				          current->type+=yytext;
 					}
-<QtPropType>({FTSCOPE}"::")*{FTSCOPE}	{
+<QtPropType>({TSCOPE}"::")*{TSCOPE}	{
 					  current->type+=yytext;
 BEGIN(QtPropName);
 					}
 <QtPropName>{ID}			{
 					  current->name=yytext;
 					  curlyCount=0;
 					  lastCurlyContext = TryFunctionBlockEnd ;
 					  BEGIN( SkipCurly );
 					}
 <TryFunctionBlock>.
-<TryFunctionBlockEnd>"catch"		{ BEGIN(TryFunctionBlock); }
+<TryFunctionBlockEnd>{BN}*"catch"	{ lineCount(); BEGIN(TryFunctionBlock); // {BN}* added to fix bug 611193
-<TryFunctionBlockEnd>\n			{ unput(*yytext); // added to fix bug id 601138
+					}
+<TryFunctionBlockEnd>\n			{ unput(*yytext); // rule added to fix bug id 601138
 					  BEGIN( FindMembers );
 					}
 <TryFunctionBlockEnd>.			{ unput(*yytext);
 					  BEGIN( FindMembers );
 					}
 					    BEGIN(EndCppQuote);
 					  }
 					  else
 					  {
 lastStringContext=YY_START;
-					    current->initializer+=*yytext;
+					    current->initializer=yytext;
 					    pCopyQuotedGString=&current->initializer;
 					    BEGIN(CopyGString);
 					  }
 					}
 <ReadInitializer>"->"			{
 					}
 <BitFields>.				{
 					  current->bitfields+=*yytext;
 					}
 <FindMembers>[;,]			{
-					  //printf("scanner.l: <FindMembers>[;,] name=%s, endBodyLine=%d\n", current->name.data(), current->endBodyLine);
 					  QCString oldType = current->type.copy();
 					  if (current->bodyLine==-1)
 					  {
 					    current->bodyLine = yyLineNr;
 					  }
 					    	current->spec = 0;
 					    }
 					    current->section = Entry::VARIABLE_SEC ;
 					    current->fileName = yyFileName;
 					    current->startLine = yyLineNr;
-						//printf("scanner.l: <FindMembers>[;,] file=%s line=%d\n", current->fileName.data(), current->startLine);
 					    current_root->addSubEntry( current ) ;
 					    needNewCurrent=TRUE;
 					  }
 					  if ( *yytext == ',')
 					  {
 					      //p=p->parent;
 					      if (p==current) p=current_root; else p=p->parent();
 					    }
 					  }
 					  //printf("msName=%s current->name=%s\n",msName.data(),current->name.data());
-					  if (!msName.isEmpty() && msName!=current->name) // skip typedef T {} T;
+					  if (!msName.isEmpty()
+					      /*&& msName!=current->name*/) // skip typedef T {} T;, removed due to bug608493
 					  {
 					    static 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 &&
 					  current->type=current->type.simplifyWhiteSpace();
 					  current->args=removeRedundantWhiteSpace(current->args);
 					                // was: current->args.simplifyWhiteSpace();
 					  current->fileName = yyFileName;
 					  current->startLine = yyLineNr;
-					  static QRegExp re("([^)]*\\[*&][^)]*)"); // (...*...)
+					  static QRegExp re("([^)]*[*&][^)]*)"); // (...*...)
 					  if (*yytext!=';' || (current_root->section&Entry::COMPOUND_MASK) )
 					  {
 					    int tempArg=current->name.find('<');
 					    QCString tempName;
 					    if (tempArg==-1) tempName=current->name; else tempName=current->name.left(tempArg);
 					    if (!current->type.isEmpty() &&
 						(current->type.find(re,0)!=-1 || current->type.left(8)=="typedef "))
 					    {
 					      //printf("Scanner.l: found in class variable: `%s' `%s' `%s'\n", current->type.data(),current->name.data(),current->args.data());
+					      if (isTypedef && current->type.left(8)!="typedef ")
+					      {
+						current->type.prepend("typedef ");
+					      }
 					      current->section = Entry::VARIABLE_SEC ;
 					    }
 					    else
 					    {
 					      //printf("Scanner.l: found in class function: `%s' `%s' `%s'\n", current->type.data(),current->name.data(),current->args.data());
 					  {
 					    //printf("Scanner.l: prototype? type=`%s' name=`%s' args=`%s'\n",current->type.data(),current->name.data(),current->args.data());
 					    if (!current->type.isEmpty() &&
 						(current->type.find(re,0)!=-1 || current->type.left(8)=="typedef "))
 					    {
+					      if (isTypedef && current->type.left(8)!="typedef ")
+					      {
+						current->type.prepend("typedef ");
+					      }
 					      //printf("Scanner.l: found function variable!\n");
 					      current->section = Entry::VARIABLE_SEC;
 					    }
 					    else
 					    {
 <SkipString,SkipPHPString>"/*"|"*/"|"//" { }
 <SkipString,SkipPHPString>\n		{
 					  yyLineNr++;
 					}
 <SkipString,SkipPHPString>.		{ }
+<CompoundName>":"			{ // for "class : public base {} var;" construct, see bug 608359
+					  unput(':');
+					  BEGIN(ClassVar);
+					}
 <Bases,CompoundName>";"			{
 					  current->section = Entry::EMPTY_SEC ;
 					  current->type.resize(0) ;
 					  current->name.resize(0) ;
 					  current->args.resize(0) ;
 					  {
 					    current->tArgLists = new QList<ArgumentList>;
 					    current->tArgLists->setAutoDelete(TRUE);
 					  }
 					  ArgumentList *al = new ArgumentList;
-					  current->spec |= Entry::Template;
+					  // check bug 612858 before enabling the next line
+					  //current->spec |= Entry::Template;
 					  current->tArgLists->append(al);
 					  currentArgumentList = al;
 					  templateStr="<";
 					  current->name += "<";
 					  fullArgString = templateStr;
 					}
 <SkipRound>"("				{ ++roundCount; }
 <SkipRound>")"				{ if (--roundCount<=0)
 					    BEGIN ( lastSkipRoundContext );
 					}
+<SkipRound>\"				{
+					  lastStringContext=SkipRound;
+					  BEGIN(SkipString);
+					}
 <Bases>","|(">"({BN}*"{")?)|({BN}+"implements"{BN}*)	{ lineCount();
 if (insideProtocolList)
 					  {
 					    baseName+="-p";
 					  }
 {
 //printf("-- %s ---------\n%s\n---------------\n",
 //  ce->name.data(),ce->program.data());
 // init scanner state
 padCount=0;
-depthIf = 0;
+//depthIf = 0;
 inputString = ce->program;
 inputPosition = 0;
 scanYYrestart( scanYYin ) ;
 if (ce->section==Entry::ENUM_SEC)
 	BEGIN( FindFields ) ;
 delete current; current=0;
 ce->program.resize(0);
-if (depthIf>0)
+//if (depthIf>0)
-{
+//{
-	warn(yyFileName,yyLineNr,"Documentation block ended in the middle of a conditional section!");
+//	warn(yyFileName,yyLineNr,"Documentation block ended in the middle of a conditional section!");
-}
+//}
 }
 parseCompounds(ce);
 }
 }
 inputString = fileBuf;
 inputPosition = 0;
 g_inputFromFile = FALSE;
 //anonCount     = 0;  // don't reset per file
-depthIf       = 0;
+//depthIf       = 0;
 protection    = Public;
 mtype         = Method;
 gstat         = FALSE;
 virt          = Normal;
 current_root  = rt;
 }
 //forceEndGroup();
 groupLeaveFile(yyFileName,yyLineNr);
-if (depthIf>0)
+//if (depthIf>0)
-{
+//{
-warn(yyFileName,yyLineNr,"Documentation block ended in the middle of a conditional section!");
+//  warn(yyFileName,yyLineNr,"Documentation block ended in the middle of a conditional section!");
-}
+//}
 rt->program.resize(0);
 delete current; current=0;
 parseCompounds(rt);
 const char * exampleName,
 FileDef * fileDef,
 int startLine,
 int endLine,
 bool inlineFragment,
-		   MemberDef *memberDef
+		   MemberDef *memberDef,
+		   bool showLineNumbers
 )
 {
 ::parseCCode(codeOutIntf,scopeName,input,isExampleBlock,exampleName,
-fileDef,startLine,endLine,inlineFragment,memberDef);
+fileDef,startLine,endLine,inlineFragment,memberDef,
+	       showLineNumbers);
 }
 bool CLanguageScanner::needsPreprocessing(const QCString &extension)
 {
 QCString fe=extension.lower();

changeset 4	468f4c8d3d5b
parent 3	d8fccb2cd802