diff options
author | sprigogin | 2012-05-20 03:54:12 +0000 |
---|---|---|
committer | sprigogin | 2012-05-20 03:54:12 +0000 |
commit | 6bf3a228587a33c49291ffcaf8612a6a5e305c0b (patch) | |
tree | 3c27d94213301f53e0690083e44748813df87f46 /core/org.eclipse.cdt.core/parser/org/eclipse | |
parent | e5141ca6360b8d3421eb9f0b5f17259ab8fbe753 (diff) | |
download | org.eclipse.cdt-6bf3a228587a33c49291ffcaf8612a6a5e305c0b.tar.gz org.eclipse.cdt-6bf3a228587a33c49291ffcaf8612a6a5e305c0b.tar.xz org.eclipse.cdt-6bf3a228587a33c49291ffcaf8612a6a5e305c0b.zip |
Cosmetics
Diffstat (limited to 'core/org.eclipse.cdt.core/parser/org/eclipse')
3 files changed, 9 insertions, 9 deletions
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/index/IIndex.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/index/IIndex.java index 173f410687b..bb4c413ac5c 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/index/IIndex.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/index/IIndex.java @@ -419,7 +419,7 @@ public interface IIndex { * Returns an IIndexBinding for this IIndex that is equivalent to the specified binding, * or null if such a binding does not exist in this index. This is useful for adapting * bindings obtained from IIndex objects that might have been created for a different scope - * or for IBinding objects obtained direct from the AST. + * or for IBinding objects obtained directly from the AST. * @param binding * @return an IIndexBinding for this IIndex that is equivalent to the specified binding */ diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/util/CharArrayObjectMap.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/util/CharArrayObjectMap.java index 625cbfbe92e..e7545e07c72 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/util/CharArrayObjectMap.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/util/CharArrayObjectMap.java @@ -162,5 +162,4 @@ public class CharArrayObjectMap <T> extends CharTable { System.arraycopy(valueTable, 0, values, 0, values.length); return values; } - } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/ScannerContext.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/ScannerContext.java index d509ba7d373..5014289a94d 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/ScannerContext.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/ScannerContext.java @@ -24,8 +24,8 @@ import org.eclipse.cdt.core.parser.util.CharArraySet; * @since 5.0 */ final class ScannerContext { - enum BranchKind {eIf, eElif, eElse, eEnd} - enum CodeState {eActive, eParseInactive, eSkipInactive} + enum BranchKind { eIf, eElif, eElse, eEnd } + enum CodeState { eActive, eParseInactive, eSkipInactive } final static class Conditional { private final CodeState fInitialState; @@ -52,7 +52,7 @@ final class ScannerContext { private final ScannerContext fParent; private final Lexer fLexer; private Token fTokens; - private ArrayList<Conditional> fConditionals= null; + private ArrayList<Conditional> fConditionals; private CodeState fCurrentState= CodeState.eActive; private IncludeSearchPathElement fFoundOnPath; private String fFoundViaDirective; @@ -60,7 +60,6 @@ final class ScannerContext { private CharArrayObjectMap<char[]> fSignificantMacros; private boolean fPragmaOnce; private int fLoadedVersionCount; - /** * @param ctx @@ -70,7 +69,7 @@ final class ScannerContext { fLocationCtx= ctx; fParent= parent; fLexer= lexer; - fDepth = parent == null ? 0 : parent.fDepth+1; + fDepth = parent == null ? 0 : parent.fDepth + 1; } public ScannerContext(ILocationCtx ctx, ScannerContext parent, TokenList tokens) { @@ -131,7 +130,7 @@ final class ScannerContext { } // if we are not inside of an conditional there shouldn't be an #else, #elsif or #end - final int pos= fConditionals.size()-1; + final int pos= fConditionals.size() - 1; if (pos < 0) { return null; } @@ -393,7 +392,7 @@ final class ScannerContext { // Propagate significant macros to direct parent, if it is interested. if (collector == fParent.fInternalModifications) { final CharArrayObjectMap<char[]> significant = fParent.fSignificantMacros; - for (int i=0; i<fSignificantMacros.size(); i++) { + for (int i= 0; i < fSignificantMacros.size(); i++) { final char[] name = fSignificantMacros.keyAt(i); if (!collector.containsKey(name)) { final char[] value= fSignificantMacros.getAt(i); @@ -425,6 +424,7 @@ final class ScannerContext { } return true; } + @Override public boolean visitUndefined(char[] macro) { if (!fInternalModifications.containsKey(macro)) { @@ -432,6 +432,7 @@ final class ScannerContext { } return true; } + @Override public boolean visitDefined(char[] macro) { if (!fInternalModifications.containsKey(macro)) { |