From cb47b164a06833194775b8367649552e848b0da9 Mon Sep 17 00:00:00 2001 From: John Camelon Date: Thu, 22 Jul 2004 18:47:50 +0000 Subject: [PATCH] Further improve SelectionSearch w/Scanner2. --- .../cdt/internal/core/parser/DeclarationWrapper.java | 2 +- .../cdt/internal/core/parser/scanner2/Scanner2.java | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/DeclarationWrapper.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/DeclarationWrapper.java index d1fb846c337..d843587b1d1 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/DeclarationWrapper.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/DeclarationWrapper.java @@ -336,7 +336,7 @@ public class DeclarationWrapper implements IDeclaratorOwner private IASTFactory astFactory = null; private int endLine; - private char[] fn; + private final char[] fn; /** * @param requestor */ diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner2/Scanner2.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner2/Scanner2.java index e22b5e2646c..682a68a1b79 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner2/Scanner2.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner2/Scanner2.java @@ -2515,14 +2515,13 @@ public class Scanner2 implements IScanner, IScannerData { } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.parser.IFilenameProvider#getCurrentFilename() - */ - public final char[] getCurrentFilename() { + private final char[] getCurrentFilename() { for( int i = bufferStackPos; i >= 0; --i ) { if( bufferData[i] instanceof InclusionData ) return ((InclusionData)bufferData[i]).reader.filename; + if( bufferData[i] instanceof CodeReader ) + return ((CodeReader)bufferData[i]).filename; } return emptyCharArray;