summaryrefslogtreecommitdiffstats
path: root/src/code.l
diff options
context:
space:
mode:
authordimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7>2003-06-07 11:47:47 (GMT)
committerdimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7>2003-06-07 11:47:47 (GMT)
commit0aa47e2a30513b04d1041d528f468d3434a81558 (patch)
treef17d17b67fdefdfdf992328f3f51dd90812c156e /src/code.l
parent35c2baedaa68519999af733a87d8e6ff9a89358c (diff)
downloadDoxygen-0aa47e2a30513b04d1041d528f468d3434a81558.zip
Doxygen-0aa47e2a30513b04d1041d528f468d3434a81558.tar.gz
Doxygen-0aa47e2a30513b04d1041d528f468d3434a81558.tar.bz2
Release-1.3.1-20030607
Diffstat (limited to 'src/code.l')
-rw-r--r--src/code.l18
1 files changed, 11 insertions, 7 deletions
diff --git a/src/code.l b/src/code.l
index e303139..09fe71b 100644
--- a/src/code.l
+++ b/src/code.l
@@ -1224,8 +1224,6 @@ TYPEKW ("bool"|"char"|"double"|"float"|"int"|"long"|"short"|"signed"|"unsigned"
g_scopeStack.push(SCOPEBLOCK);
pushScope(g_curClassName);
//printf("***** g_curClassName=%s\n",g_curClassName.data());
- //CodeClassDef *cd=new CodeClassDef(g_ccd);
- //g_codeClassDict.insert(cd->name,cd);
if (getResolvedClass(g_currentDefinition,g_curClassName)==0)
{
g_curClassDef=new ClassDef("<code>",1,
@@ -1611,9 +1609,6 @@ TYPEKW ("bool"|"char"|"double"|"float"|"int"|"long"|"short"|"signed"|"unsigned"
BEGIN( SkipInits );
}
}
- /*
-<MemberCall2,FuncCall>")"({BN}"const"|"volatile")*{BN}*"{" {
- */
<CallEnd>({BN}"const"|"volatile")*{BN}*"{" {
if (g_insideBody)
{
@@ -1622,10 +1617,19 @@ TYPEKW ("bool"|"char"|"double"|"float"|"int"|"long"|"short"|"signed"|"unsigned"
g_theVarContext.addVariable(g_parmType,g_parmName);
g_theCallContext.popScope();
g_parmType.resize(0);g_parmName.resize(0);
- if (g_name.find("::")!=-1)
+ int index = g_name.findRev("::");
+ if (index!=-1)
{
+ ClassDef *cd=getResolvedClass(Doxygen::globalScope,g_name.left(index));
+ if (cd)
+ {
+ setClassScope(cd->name());
+ }
+ else
+ {
+ setClassScope(g_realScope);
+ }
g_scopeStack.push(SCOPEBLOCK);
- setClassScope(g_realScope);
}
else
{