mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-31 21:05:37 +02:00
Code Issues Wiki Activity

Fix for 198259 by Emanuel Graf, wrong order of accept- and leave calls.

Browse source
This commit is contained in:
Markus Schorn 2007-07-31 07:37:46 +00:00
parent a780b749bb
commit 1561bd668d
1 changed files with 26 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTConversionName.java
View file

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2005 IBM Corporation and others. * Copyright (c) 2005, 2007 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -7,6 +7,7 @@
* *
* Contributors: * Contributors:
* IBM - Initial API and implementation * IBM - Initial API and implementation
* Emanuel Graf IFS - Bugfix for #198259
*******************************************************************************/ *******************************************************************************/
package org.eclipse.cdt.internal.core.dom.parser.cpp; package org.eclipse.cdt.internal.core.dom.parser.cpp;
@ -39,9 +40,29 @@ public class CPPASTConversionName extends CPPASTName implements ICPPASTConversio
} }
public boolean accept(ASTVisitor action) { public boolean accept(ASTVisitor action) {
boolean why = super.accept(action); if (action.shouldVisitNames) {
if( why && typeId != null ) switch (action.visit(this)) {
return typeId.accept( action ); case ASTVisitor.PROCESS_ABORT:
return why; return false;
case ASTVisitor.PROCESS_SKIP:
return true;
default:
break;
}
}
if(typeId != null )if(! typeId.accept( action )) return false;
if (action.shouldVisitNames) {
switch (action.leave(this)) {
case ASTVisitor.PROCESS_ABORT:
return false;
case ASTVisitor.PROCESS_SKIP:
return true;
default:
break;
}
}
return true;
} }
} }