summaryrefslogtreecommitdiffstats
path: root/src/scanner.l
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2010-05-07 19:37:33 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2010-05-07 19:37:33 (GMT)
commita3b06c4fd310fdeda48a4730139cee09b5302072 (patch)
tree58636054e8f52c5851109b908053cc4da26b060a /src/scanner.l
parent368c93a05bf38e440dba3f033f6e2e1cbeb2f379 (diff)
downloadDoxygen-a3b06c4fd310fdeda48a4730139cee09b5302072.zip
Doxygen-a3b06c4fd310fdeda48a4730139cee09b5302072.tar.gz
Doxygen-a3b06c4fd310fdeda48a4730139cee09b5302072.tar.bz2
Release-1.6.3-20100507
Diffstat (limited to 'src/scanner.l')
-rw-r--r--src/scanner.l16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/scanner.l b/src/scanner.l
index 7501855..0eecb14 100644
--- a/src/scanner.l
+++ b/src/scanner.l
@@ -160,7 +160,7 @@ static QCString briefBackup;
static bool g_inputFromFile;
static int docBlockContext;
-static QCString docBlock;
+static QGString docBlock;
static QCString docBlockName;
static bool docBlockInBody;
static bool docBlockAutoBrief;
@@ -3172,8 +3172,8 @@ TYPEDEFPREFIX (("typedef"{BN}+)?)((("volatile"|"const"){BN}+)?)
if (msName.isEmpty() && !current->name.isEmpty())
{
// see if the compound does not have a name or is inside another
- // annonymous compound. If so we insert a
- // special `annonymous' variable.
+ // anonymous compound. If so we insert a
+ // special `anonymous' variable.
//Entry *p=current_root;
Entry *p=current;
while (p)
@@ -3186,8 +3186,8 @@ TYPEDEFPREFIX (("typedef"{BN}+)?)((("volatile"|"const"){BN}+)?)
int pi = (i==-1) ? 0 : i+2;
if (p->name.at(pi)=='@')
{
- // annonymous compound inside -> insert dummy variable name
- //printf("Adding annonymous variable for scope %s\n",p->name.data());
+ // anonymous compound inside -> insert dummy variable name
+ //printf("Adding anonymous variable for scope %s\n",p->name.data());
msName.sprintf("@%d",anonCount++);
break;
}
@@ -4569,7 +4569,7 @@ TYPEDEFPREFIX (("typedef"{BN}+)?)((("volatile"|"const"){BN}+)?)
else
BEGIN( CopyArgComment );
}
-<CSConstraintType,CSConstraintName>"#" { // artifically inserted token to signal end of comment block
+<CSConstraintType,CSConstraintName>"#" { // artificially inserted token to signal end of comment block
current->typeConstr->last()->docs = fullArgString;
}
<CSConstraintType>"{" { // end of type constraint reached
@@ -5126,14 +5126,14 @@ TYPEDEFPREFIX (("typedef"{BN}+)?)((("volatile"|"const"){BN}+)?)
}
<DocLine>[^\n]*/"\n" { // whole line
docBlock+=yytext;
- handleCommentBlock(docBlock,current->brief.isEmpty());
+ handleCommentBlock(docBlock.data(),current->brief.isEmpty());
BEGIN( docBlockContext );
}
/* ---- Comments blocks ------ */
<DocBlock>"*"*"*/" { // end of comment block
- handleCommentBlock(docBlock,FALSE);
+ handleCommentBlock(docBlock.data(),FALSE);
BEGIN(docBlockContext);
}
<DocBlock>^{B}*("//")?{B}*"*"+/[^//] { // start of a comment line