mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

Cosmetics.

Browse source
This commit is contained in:
Sergey Prigogin 2014-04-16 18:37:45 -07:00
parent e4b3bce29b
commit 48fc8d0809
1 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/LocationMap.java
View file

@ -52,19 +52,19 @@ public class LocationMap implements ILocationResolver {
private String fTranslationUnitPath; private String fTranslationUnitPath;
private IASTTranslationUnit fTranslationUnit; private IASTTranslationUnit fTranslationUnit;
private ArrayList<ASTPreprocessorNode> fDirectives= new ArrayList<ASTPreprocessorNode>(); private ArrayList<ASTPreprocessorNode> fDirectives= new ArrayList<>();
private ArrayList<ASTProblem> fProblems= new ArrayList<ASTProblem>(); private ArrayList<ASTProblem> fProblems= new ArrayList<>();
private ArrayList<ASTComment> fComments= new ArrayList<ASTComment>(); private ArrayList<ASTComment> fComments= new ArrayList<>();
private ArrayList<ASTMacroDefinition> fBuiltinMacros= new ArrayList<ASTMacroDefinition>(); private ArrayList<ASTMacroDefinition> fBuiltinMacros= new ArrayList<>();
private ArrayList<ASTPreprocessorName> fMacroReferences= new ArrayList<ASTPreprocessorName>(); private ArrayList<ASTPreprocessorName> fMacroReferences= new ArrayList<>();
private LocationCtxFile fRootContext; private LocationCtxFile fRootContext;
private LocationCtx fCurrentContext; private LocationCtx fCurrentContext;
private int fLastChildInsertionOffset; private int fLastChildInsertionOffset;
// stuff computed on demand // Stuff computed on demand
private IdentityHashMap<IBinding, IASTPreprocessorMacroDefinition> fMacroDefinitionMap; private IdentityHashMap<IBinding, IASTPreprocessorMacroDefinition> fMacroDefinitionMap;
private List<ISkippedIndexedFilesListener> fSkippedFilesListeners= new ArrayList<ISkippedIndexedFilesListener>(); private List<ISkippedIndexedFilesListener> fSkippedFilesListeners= new ArrayList<>();
public LocationMap(LexerOptions lexOptions) { public LocationMap(LexerOptions lexOptions) {
fLexerOptions= lexOptions; fLexerOptions= lexOptions;
@ -516,7 +516,7 @@ public class LocationMap implements ILocationResolver {
} }
LocationCtxFile ctx= floc.getLocationContext(); LocationCtxFile ctx= floc.getLocationContext();
ArrayList<IASTPreprocessorMacroExpansion> list= new ArrayList<IASTPreprocessorMacroExpansion>(); ArrayList<IASTPreprocessorMacroExpansion> list= new ArrayList<>();
ctx.collectMacroExpansions(floc.getNodeOffset(), floc.getNodeLength(), list); ctx.collectMacroExpansions(floc.getNodeOffset(), floc.getNodeLength(), list);
return list.toArray(new IASTPreprocessorMacroExpansion[list.size()]); return list.toArray(new IASTPreprocessorMacroExpansion[list.size()]);
@ -549,7 +549,7 @@ public class LocationMap implements ILocationResolver {
@Override @Override
public IASTNodeLocation[] getLocations(int sequenceNumber, int length) { public IASTNodeLocation[] getLocations(int sequenceNumber, int length) {
ArrayList<IASTNodeLocation> result= new ArrayList<IASTNodeLocation>(); ArrayList<IASTNodeLocation> result= new ArrayList<>();
fRootContext.collectLocations(sequenceNumber, length, result); fRootContext.collectLocations(sequenceNumber, length, result);
return result.toArray(new IASTNodeLocation[result.size()]); return result.toArray(new IASTNodeLocation[result.size()]);
} }
@ -561,7 +561,7 @@ public class LocationMap implements ILocationResolver {
@Override @Override
public IASTImageLocation getImageLocation(int sequenceNumber, int length) { public IASTImageLocation getImageLocation(int sequenceNumber, int length) {
ArrayList<IASTNodeLocation> result= new ArrayList<IASTNodeLocation>(); ArrayList<IASTNodeLocation> result= new ArrayList<>();
fRootContext.collectLocations(sequenceNumber, length, result); fRootContext.collectLocations(sequenceNumber, length, result);
if (result.size() != 1) { if (result.size() != 1) {
return null; return null;
@ -669,7 +669,7 @@ public class LocationMap implements ILocationResolver {
public int getSequenceNumberForFileOffset(String filePath, int fileOffset) { public int getSequenceNumberForFileOffset(String filePath, int fileOffset) {
LocationCtx ctx= fRootContext; LocationCtx ctx= fRootContext;
if (filePath != null) { if (filePath != null) {
ArrayDeque<LocationCtx> contexts= new ArrayDeque<LocationCtx>(); ArrayDeque<LocationCtx> contexts= new ArrayDeque<>();
while (ctx != null) { while (ctx != null) {
if (ctx instanceof LocationCtxFile) { if (ctx instanceof LocationCtxFile) {
if (filePath.equals(ctx.getFilePath())) { if (filePath.equals(ctx.getFilePath())) {
@ -708,7 +708,7 @@ public class LocationMap implements ILocationResolver {
@Override @Override
public IASTPreprocessorMacroDefinition[] getMacroDefinitions() { public IASTPreprocessorMacroDefinition[] getMacroDefinitions() {
ArrayList<IASTPreprocessorMacroDefinition> result= new ArrayList<IASTPreprocessorMacroDefinition>(); ArrayList<IASTPreprocessorMacroDefinition> result= new ArrayList<>();
for (ASTPreprocessorNode directive : fDirectives) { for (ASTPreprocessorNode directive : fDirectives) {
if (directive instanceof IASTPreprocessorMacroDefinition) { if (directive instanceof IASTPreprocessorMacroDefinition) {
result.add((IASTPreprocessorMacroDefinition) directive); result.add((IASTPreprocessorMacroDefinition) directive);
@ -719,7 +719,7 @@ public class LocationMap implements ILocationResolver {
@Override @Override
public IASTPreprocessorIncludeStatement[] getIncludeDirectives() { public IASTPreprocessorIncludeStatement[] getIncludeDirectives() {
ArrayList<IASTPreprocessorIncludeStatement> result= new ArrayList<IASTPreprocessorIncludeStatement>(); ArrayList<IASTPreprocessorIncludeStatement> result= new ArrayList<>();
for (ASTPreprocessorNode directive : fDirectives) { for (ASTPreprocessorNode directive : fDirectives) {
if (directive instanceof IASTPreprocessorIncludeStatement) { if (directive instanceof IASTPreprocessorIncludeStatement) {
result.add((IASTPreprocessorIncludeStatement) directive); result.add((IASTPreprocessorIncludeStatement) directive);
@ -761,7 +761,7 @@ public class LocationMap implements ILocationResolver {
IASTPreprocessorMacroDefinition getMacroDefinition(IMacroBinding binding) { IASTPreprocessorMacroDefinition getMacroDefinition(IMacroBinding binding) {
if (fMacroDefinitionMap == null) { if (fMacroDefinitionMap == null) {
fMacroDefinitionMap= new IdentityHashMap<IBinding, IASTPreprocessorMacroDefinition>(); fMacroDefinitionMap= new IdentityHashMap<>();
for (int i = 0; i < fBuiltinMacros.size(); i++) { for (int i = 0; i < fBuiltinMacros.size(); i++) {
final IASTPreprocessorMacroDefinition def = fBuiltinMacros.get(i); final IASTPreprocessorMacroDefinition def = fBuiltinMacros.get(i);
final IASTName name = def.getName(); final IASTName name = def.getName();
@ -782,7 +782,7 @@ public class LocationMap implements ILocationResolver {
@Override @Override
public IASTName[] getReferences(IMacroBinding binding) { public IASTName[] getReferences(IMacroBinding binding) {
List<IASTName> result= new ArrayList<IASTName>(); List<IASTName> result= new ArrayList<>();
for (IASTName name : fMacroReferences) { for (IASTName name : fMacroReferences) {
if (name.getBinding() == binding) { if (name.getBinding() == binding) {
result.add(name); result.add(name);
@ -797,7 +797,7 @@ public class LocationMap implements ILocationResolver {
public ASTPreprocessorName[] getNestedMacroReferences(ASTMacroExpansion expansion) { public ASTPreprocessorName[] getNestedMacroReferences(ASTMacroExpansion expansion) {
final IASTName explicitRef= expansion.getMacroReference(); final IASTName explicitRef= expansion.getMacroReference();
List<ASTPreprocessorName> result= new ArrayList<ASTPreprocessorName>(); List<ASTPreprocessorName> result= new ArrayList<>();
for (ASTPreprocessorName name : fMacroReferences) { for (ASTPreprocessorName name : fMacroReferences) {
if (name.getParent() == expansion && name != explicitRef) { if (name.getParent() == expansion && name != explicitRef) {
result.add(name); result.add(name);
@ -849,8 +849,8 @@ public class LocationMap implements ILocationResolver {
((ASTNode) fTranslationUnit).setLength(offset); ((ASTNode) fTranslationUnit).setLength(offset);
if (sigMacros != null) { if (sigMacros != null) {
ISignificantMacros sig = sigMacros.isEmpty() ? ISignificantMacros.NONE ISignificantMacros sig = sigMacros.isEmpty() ?
: new SignificantMacros(sigMacros); ISignificantMacros.NONE : new SignificantMacros(sigMacros);
fTranslationUnit.setSignificantMacros(sig); fTranslationUnit.setSignificantMacros(sig);
} }
} }