diff options
| author | Dimitri van Heesch <dimitri@stack.nl> | 2008-04-20 08:30:56 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <dimitri@stack.nl> | 2008-04-20 08:30:56 (GMT) |
| commit | b4f20f70abd663b3d8e5889e1fe582dfe980b7a2 (patch) | |
| tree | 1ef12f6f2f4d51d8e4486b2d467e6f047ef9515a /src/vhdlscanner.l | |
| parent | c6c19d2984bfd7265b6d5f82336c991ec35727da (diff) | |
| download | Doxygen-b4f20f70abd663b3d8e5889e1fe582dfe980b7a2.zip Doxygen-b4f20f70abd663b3d8e5889e1fe582dfe980b7a2.tar.gz Doxygen-b4f20f70abd663b3d8e5889e1fe582dfe980b7a2.tar.bz2 | |
Release-1.5.5-20080420
Diffstat (limited to 'src/vhdlscanner.l')
| -rw-r--r-- | src/vhdlscanner.l | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/src/vhdlscanner.l b/src/vhdlscanner.l index 8fbd21b..784d395 100644 --- a/src/vhdlscanner.l +++ b/src/vhdlscanner.l @@ -83,6 +83,7 @@ static int scantype = 0; static int g_lastCommentContext = 0; static bool docBlockAutoBrief; static char docBlockTerm; +static int iDocLine = -1; //#define YY_A_INTERACTIVE 1 #define YY_NEVER_INTERACTIVE 1 @@ -122,8 +123,7 @@ static void addText (char *word, int llen) { while (llen>0) { - g_buf[iCounter]=*word; - *word++; + g_buf[iCounter]=*word++; iCounter++; llen--; } @@ -384,7 +384,7 @@ static void parseFunctionProto() { current->args+=","; } - Argument *arg=new Argument(); + Argument *arg=new Argument; Argument *hh=(Argument*)ql.at(k); arg->name=hh->name; arg->type=hh->type; @@ -437,6 +437,7 @@ void parserInit() lastEntity=0; bropen=0; openGroups=0; + iDocLine=-1; //isPrevDoc=FALSE; //prevDocEntry.reset(); qrl.clear(); @@ -446,10 +447,9 @@ void parserInit() VhdlDocGen::init(); } - uint SSIZE=inputFile.size()+1024; - if (g_buf==0) - g_buf=(char*)(calloc(SSIZE,sizeof(char))); + if (g_buf==0) free(g_buf); + g_buf=(char*)(calloc(SSIZE,sizeof(char))); if (g_buf==0) { @@ -1367,6 +1367,7 @@ ALLID [^;()\t ] */ <*>{BR}*"--!"[^{}\n][^\n]*\n/{B}*"--!" { // multi line comment + if (iDocLine==-1) iDocLine=yyLineNr; if (YY_START!=Comment) // Start of the comment block { iTextCounter=iCounter; @@ -1379,6 +1380,7 @@ ALLID [^;()\t ] } <Comment>^{B}*"--!"[^\n]* { + if (iDocLine==-1) iDocLine=yyLineNr; addText(vhdlscanYYtext,vhdlscanYYleng); lineCount(); } @@ -1395,6 +1397,7 @@ ALLID [^;()\t ] } <*>^{B}*"--!"[^\n]* { // one line comment + if (iDocLine==-1) iDocLine=yyLineNr; QCString qcs(yytext); int j=qcs.find("--!"); qcs=qcs.right(qcs.length()-3-j); @@ -1451,13 +1454,18 @@ static void handleCommentBlock(const QCString &doc,bool brief) int position=0; bool needsEntry=FALSE; Protection protection=Public; + if (brief) + current->briefLine = iDocLine; + else + current->docLine = iDocLine; + //printf("parseCommentBlock %p [%s]\n",current,doc.data()); while (parseCommentBlock( g_thisParser, current, doc, // text yyFileName, // file - brief ? current->briefLine : current->docLine, // line of block start + iDocLine, // line of block start brief, docBlockAutoBrief, FALSE, @@ -1480,6 +1488,7 @@ static void handleCommentBlock(const QCString &doc,bool brief) unput(docBlockTerm); docBlockTerm=0; } + iDocLine=-1; } #if 0 @@ -1668,6 +1677,7 @@ void VHDLLanguageScanner::parseInput(const char *fileName,const char *fileBuf,En current=0; groupLeaveFile(yyFileName,yyLineNr); + inputFile.close(); //mergeBrief(current_root); //mergeGrouping(current_root,0); |