mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-09 18:56:02 +02:00
Code Issues Wiki Activity

Follow-up fix for 177457

Browse source
This commit is contained in:
Anton Leherbauer 2007-03-23 10:32:24 +00:00
parent b0e07eb056
commit a392abe467
1 changed files with 35 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SemanticHighlightingReconciler.java
View file

@ -33,6 +33,7 @@ import org.eclipse.cdt.core.IPositionConverter;
import org.eclipse.cdt.core.dom.ast.ASTVisitor; import org.eclipse.cdt.core.dom.ast.ASTVisitor;
import org.eclipse.cdt.core.dom.ast.IASTDeclSpecifier; import org.eclipse.cdt.core.dom.ast.IASTDeclSpecifier;
import org.eclipse.cdt.core.dom.ast.IASTDeclaration; import org.eclipse.cdt.core.dom.ast.IASTDeclaration;
import org.eclipse.cdt.core.dom.ast.IASTDeclarator;
import org.eclipse.cdt.core.dom.ast.IASTExpression; import org.eclipse.cdt.core.dom.ast.IASTExpression;
import org.eclipse.cdt.core.dom.ast.IASTFileLocation; import org.eclipse.cdt.core.dom.ast.IASTFileLocation;
import org.eclipse.cdt.core.dom.ast.IASTMacroExpansion; import org.eclipse.cdt.core.dom.ast.IASTMacroExpansion;
@ -71,12 +72,14 @@ public class SemanticHighlightingReconciler implements ICReconcilingListener {
shouldVisitExpressions= true; shouldVisitExpressions= true;
shouldVisitStatements= true; shouldVisitStatements= true;
shouldVisitDeclSpecifiers= true; shouldVisitDeclSpecifiers= true;
shouldVisitDeclarators= true;
} }
/** The semantic token */ /** The semantic token */
private SemanticToken fToken= new SemanticToken(); private SemanticToken fToken= new SemanticToken();
private String fFilePath; private String fFilePath;
private IPositionConverter fPositionTracker; private IPositionConverter fPositionTracker;
private int fMinLocation;
/** /**
* @param filePath * @param filePath
@ -85,6 +88,7 @@ public class SemanticHighlightingReconciler implements ICReconcilingListener {
public PositionCollector(String filePath, IPositionConverter positionTracker) { public PositionCollector(String filePath, IPositionConverter positionTracker) {
fFilePath= filePath; fFilePath= filePath;
fPositionTracker= positionTracker; fPositionTracker= positionTracker;
fMinLocation= -1;
} }
/* /*
@ -99,6 +103,14 @@ public class SemanticHighlightingReconciler implements ICReconcilingListener {
visit(macroDef.getName()); visit(macroDef.getName());
} }
} }
// TODO visit macro expansions
// IASTName[] macroExps= tu.getMacroExpansions();
// for (int i= 0; i < macroExps.length; i++) {
// IASTName macroExp= macroExps[i];
// if (fFilePath.equals(macroExp.getContainingFilename())) {
// visitMacroExpansion(macroExp);
// }
// }
return super.visit(tu); return super.visit(tu);
} }
@ -125,6 +137,16 @@ public class SemanticHighlightingReconciler implements ICReconcilingListener {
return PROCESS_CONTINUE; return PROCESS_CONTINUE;
} }
/*
* @see org.eclipse.cdt.core.dom.ast.ASTVisitor#visit(org.eclipse.cdt.core.dom.ast.IASTDeclarator)
*/
public int visit(IASTDeclarator declarator) {
if (checkForMacro(declarator)) {
return PROCESS_SKIP;
}
return PROCESS_CONTINUE;
}
/* /*
* @see org.eclipse.cdt.core.dom.ast.ASTVisitor#visit(org.eclipse.cdt.core.dom.ast.IASTExpression) * @see org.eclipse.cdt.core.dom.ast.ASTVisitor#visit(org.eclipse.cdt.core.dom.ast.IASTExpression)
*/ */
@ -148,8 +170,11 @@ public class SemanticHighlightingReconciler implements ICReconcilingListener {
/* /*
* @see org.eclipse.cdt.core.dom.ast.ASTVisitor#visit(org.eclipse.cdt.core.dom.ast.IASTName) * @see org.eclipse.cdt.core.dom.ast.ASTVisitor#visit(org.eclipse.cdt.core.dom.ast.IASTName)
*/ */
public int visit(IASTName node) { public int visit(IASTName name) {
if (visitNode(node)) { if (checkForMacro(name)) {
return PROCESS_SKIP;
}
if (visitNode(name)) {
return PROCESS_SKIP; return PROCESS_SKIP;
} }
return PROCESS_CONTINUE; return PROCESS_CONTINUE;
@ -160,10 +185,17 @@ public class SemanticHighlightingReconciler implements ICReconcilingListener {
if (nodeLocations.length == 1 && nodeLocations[0] instanceof IASTMacroExpansion) { if (nodeLocations.length == 1 && nodeLocations[0] instanceof IASTMacroExpansion) {
IASTNodeLocation useLocation= getMinFileLocation(nodeLocations); IASTNodeLocation useLocation= getMinFileLocation(nodeLocations);
if (useLocation != null) { if (useLocation != null) {
final int useOffset = useLocation.getNodeOffset();
if (useOffset <= fMinLocation) {
// performance: we had that macro expansion already
return true;
}
fMinLocation= useOffset;
// TLETODO This does not work correctly for nested macro substitutions
IASTPreprocessorMacroDefinition macroDef= ((IASTMacroExpansion)nodeLocations[0]).getMacroDefinition(); IASTPreprocessorMacroDefinition macroDef= ((IASTMacroExpansion)nodeLocations[0]).getMacroDefinition();
IASTNodeLocation defLocation= macroDef.getName().getFileLocation(); IASTNodeLocation defLocation= macroDef.getName().getFileLocation();
if (defLocation != null) { if (defLocation != null) {
IASTNode macroNode= node.getTranslationUnit().selectNodeForLocation(fFilePath, useLocation.getNodeOffset(), defLocation.getNodeLength()); IASTNode macroNode= node.getTranslationUnit().selectNodeForLocation(fFilePath, useOffset, defLocation.getNodeLength());
if (macroNode != null && visitMacro(macroNode, defLocation.getNodeLength())) { if (macroNode != null && visitMacro(macroNode, defLocation.getNodeLength())) {
return true; return true;
} }