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

Cosmetics.

Browse source
This commit is contained in:
Sergey Prigogin 2013-10-02 13:35:53 -07:00
parent 19db352cb9
commit 15b11f611a
1 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CModelBuilder2.java
View file

@ -112,7 +112,7 @@ public class CModelBuilder2 implements IContributedModelBuilder {
* @param monitor the progress monitor * @param monitor the progress monitor
*/ */
public CModelBuilder2(ITranslationUnit tu, Map<ICElement, CElementInfo> newElements, IProgressMonitor monitor) { public CModelBuilder2(ITranslationUnit tu, Map<ICElement, CElementInfo> newElements, IProgressMonitor monitor) {
fTranslationUnit= (TranslationUnit)tu; fTranslationUnit= (TranslationUnit) tu;
fNewElements= newElements; fNewElements= newElements;
fProgressMonitor= monitor; fProgressMonitor= monitor;
} }
@ -368,7 +368,7 @@ public class CModelBuilder2 implements IContributedModelBuilder {
} }
// set the body position // set the body position
if (element instanceof SourceManipulation) { if (element instanceof SourceManipulation) {
setBodyPosition((SourceManipulation)element, templateDeclaration); setBodyPosition((SourceManipulation) element, templateDeclaration);
} }
} else if (declaration instanceof IASTSimpleDeclaration) { } else if (declaration instanceof IASTSimpleDeclaration) {
CElement[] elements= createSimpleDeclarations(parent, (IASTSimpleDeclaration) declaration, true); CElement[] elements= createSimpleDeclarations(parent, (IASTSimpleDeclaration) declaration, true);
@ -399,7 +399,7 @@ public class CModelBuilder2 implements IContributedModelBuilder {
} }
// set the body position // set the body position
if (element instanceof SourceManipulation) { if (element instanceof SourceManipulation) {
setBodyPosition((SourceManipulation)element, templateDeclaration); setBodyPosition((SourceManipulation) element, templateDeclaration);
} }
} }
} else if (declaration instanceof ICPPASTAliasDeclaration) { } else if (declaration instanceof ICPPASTAliasDeclaration) {
@ -449,7 +449,7 @@ public class CModelBuilder2 implements IContributedModelBuilder {
final IASTDeclarator declarator= declarators[i]; final IASTDeclarator declarator= declarators[i];
final CElement element= createSimpleDeclaration(parent, declSpecifier, declarator, isTemplate); final CElement element= createSimpleDeclaration(parent, declSpecifier, declarator, isTemplate);
if (!isTemplate && element instanceof SourceManipulation && declarators.length > 1) { if (!isTemplate && element instanceof SourceManipulation && declarators.length > 1) {
setBodyPosition((SourceManipulation)element, declarator); setBodyPosition((SourceManipulation) element, declarator);
} }
elements[i]= element; elements[i]= element;
} }
@ -462,17 +462,17 @@ public class CModelBuilder2 implements IContributedModelBuilder {
if (declarator != null) { if (declarator != null) {
return createTypedefOrFunctionOrVariable(parent, declSpecifier, declarator, isTemplate); return createTypedefOrFunctionOrVariable(parent, declSpecifier, declarator, isTemplate);
} }
return createCompositeType(parent, (IASTCompositeTypeSpecifier)declSpecifier, isTemplate); return createCompositeType(parent, (IASTCompositeTypeSpecifier) declSpecifier, isTemplate);
} else if (declSpecifier instanceof IASTElaboratedTypeSpecifier) { } else if (declSpecifier instanceof IASTElaboratedTypeSpecifier) {
if (declarator != null) { if (declarator != null) {
return createTypedefOrFunctionOrVariable(parent, declSpecifier, declarator, isTemplate); return createTypedefOrFunctionOrVariable(parent, declSpecifier, declarator, isTemplate);
} }
return createElaboratedTypeDeclaration(parent, (IASTElaboratedTypeSpecifier)declSpecifier, isTemplate); return createElaboratedTypeDeclaration(parent, (IASTElaboratedTypeSpecifier) declSpecifier, isTemplate);
} else if (declSpecifier instanceof IASTEnumerationSpecifier) { } else if (declSpecifier instanceof IASTEnumerationSpecifier) {
if (declarator != null) { if (declarator != null) {
return createTypedefOrFunctionOrVariable(parent, declSpecifier, declarator, isTemplate); return createTypedefOrFunctionOrVariable(parent, declSpecifier, declarator, isTemplate);
} }
return createEnumeration(parent, (IASTEnumerationSpecifier)declSpecifier); return createEnumeration(parent, (IASTEnumerationSpecifier) declSpecifier);
} else if (declSpecifier instanceof IASTNamedTypeSpecifier) { } else if (declSpecifier instanceof IASTNamedTypeSpecifier) {
if (declarator != null) { if (declarator != null) {
return createTypedefOrFunctionOrVariable(parent, declSpecifier, declarator, isTemplate); return createTypedefOrFunctionOrVariable(parent, declSpecifier, declarator, isTemplate);
@ -495,7 +495,7 @@ public class CModelBuilder2 implements IContributedModelBuilder {
} }
IASTDeclarator typeRelevant= ASTQueries.findTypeRelevantDeclarator(declarator); IASTDeclarator typeRelevant= ASTQueries.findTypeRelevantDeclarator(declarator);
if (typeRelevant instanceof IASTFunctionDeclarator) { if (typeRelevant instanceof IASTFunctionDeclarator) {
return createFunctionDeclaration(parent, declSpecifier, (IASTFunctionDeclarator)typeRelevant, isTemplate); return createFunctionDeclaration(parent, declSpecifier, (IASTFunctionDeclarator) typeRelevant, isTemplate);
} }
return createVariable(parent, declSpecifier, declarator, isTemplate); return createVariable(parent, declSpecifier, declarator, isTemplate);
} }
@ -681,7 +681,7 @@ public class CModelBuilder2 implements IContributedModelBuilder {
if (compositeTypeSpecifier instanceof ICPPASTCompositeTypeSpecifier) { if (compositeTypeSpecifier instanceof ICPPASTCompositeTypeSpecifier) {
// store super classes names // store super classes names
final ICPPASTCompositeTypeSpecifier cppCompositeTypeSpecifier= (ICPPASTCompositeTypeSpecifier)compositeTypeSpecifier; final ICPPASTCompositeTypeSpecifier cppCompositeTypeSpecifier= (ICPPASTCompositeTypeSpecifier) compositeTypeSpecifier;
ICPPASTBaseSpecifier[] baseSpecifiers= cppCompositeTypeSpecifier.getBaseSpecifiers(); ICPPASTBaseSpecifier[] baseSpecifiers= cppCompositeTypeSpecifier.getBaseSpecifiers();
for (final ICPPASTBaseSpecifier baseSpecifier : baseSpecifiers) { for (final ICPPASTBaseSpecifier baseSpecifier : baseSpecifiers) {
final IASTName baseName= baseSpecifier.getName(); final IASTName baseName= baseSpecifier.getName();
@ -791,9 +791,9 @@ public class CModelBuilder2 implements IContributedModelBuilder {
// field // field
Field newElement= new Field(parent, variableName); Field newElement= new Field(parent, variableName);
setIndex(newElement); setIndex(newElement);
final FieldInfo fieldInfo= (FieldInfo)getElementInfo(newElement); final FieldInfo fieldInfo= (FieldInfo) getElementInfo(newElement);
if (specifier instanceof ICPPASTDeclSpecifier) { if (specifier instanceof ICPPASTDeclSpecifier) {
final ICPPASTDeclSpecifier cppSpecifier= (ICPPASTDeclSpecifier)specifier; final ICPPASTDeclSpecifier cppSpecifier= (ICPPASTDeclSpecifier) specifier;
fieldInfo.setMutable(cppSpecifier.getStorageClass() == IASTDeclSpecifier.sc_mutable); fieldInfo.setMutable(cppSpecifier.getStorageClass() == IASTDeclSpecifier.sc_mutable);
} }
fieldInfo.setTypeName(ASTStringUtil.getSignatureString(specifier, declarator)); fieldInfo.setTypeName(ASTStringUtil.getSignatureString(specifier, declarator));
@ -866,10 +866,10 @@ public class CModelBuilder2 implements IContributedModelBuilder {
if (declarator instanceof ICPPASTFunctionDeclarator) { if (declarator instanceof ICPPASTFunctionDeclarator) {
final ICPPASTFunctionDeclarator cppFunctionDeclarator= (ICPPASTFunctionDeclarator)declarator; final ICPPASTFunctionDeclarator cppFunctionDeclarator= (ICPPASTFunctionDeclarator) declarator;
final IASTName simpleAstName; final IASTName simpleAstName;
if (name instanceof ICPPASTQualifiedName) { if (name instanceof ICPPASTQualifiedName) {
final ICPPASTQualifiedName quName= (ICPPASTQualifiedName)name; final ICPPASTQualifiedName quName= (ICPPASTQualifiedName) name;
simpleAstName= quName.getLastName(); simpleAstName= quName.getLastName();
} else { } else {
simpleAstName= name; simpleAstName= name;
@ -879,7 +879,7 @@ public class CModelBuilder2 implements IContributedModelBuilder {
boolean isMethod= parent instanceof IStructure; boolean isMethod= parent instanceof IStructure;
if (!isMethod && name instanceof ICPPASTQualifiedName) { if (!isMethod && name instanceof ICPPASTQualifiedName) {
if (isTemplate) { if (isTemplate) {
final ICPPASTNameSpecifier[] segments= ((ICPPASTQualifiedName)name).getAllSegments(); final ICPPASTNameSpecifier[] segments= ((ICPPASTQualifiedName) name).getAllSegments();
for (ICPPASTNameSpecifier segment : segments) { for (ICPPASTNameSpecifier segment : segments) {
if (segment instanceof ICPPASTTemplateId) { if (segment instanceof ICPPASTTemplateId) {
isMethod= true; isMethod= true;
@ -919,13 +919,13 @@ public class CModelBuilder2 implements IContributedModelBuilder {
if (scope != null) { if (scope != null) {
final IBinding binding= simpleAstName.resolveBinding(); final IBinding binding= simpleAstName.resolveBinding();
if (binding instanceof ICPPMethod) { if (binding instanceof ICPPMethod) {
methodBinding= (ICPPMethod)binding; methodBinding= (ICPPMethod) binding;
} }
} }
if (methodBinding != null) { if (methodBinding != null) {
methodInfo.setVirtual(methodBinding.isVirtual()); methodInfo.setVirtual(methodBinding.isVirtual());
methodInfo.setInline(methodBinding.isInline()); methodInfo.setInline(methodBinding.isInline());
methodInfo.setFriend(((ICPPASTDeclSpecifier)declSpecifier).isFriend()); methodInfo.setFriend(((ICPPASTDeclSpecifier) declSpecifier).isFriend());
methodInfo.setVolatile(cppFunctionDeclarator.isVolatile()); methodInfo.setVolatile(cppFunctionDeclarator.isVolatile());
methodInfo.setVisibility(adaptVisibilityConstant(methodBinding.getVisibility())); methodInfo.setVisibility(adaptVisibilityConstant(methodBinding.getVisibility()));
methodInfo.setPureVirtual(false); methodInfo.setPureVirtual(false);
@ -933,7 +933,7 @@ public class CModelBuilder2 implements IContributedModelBuilder {
methodElement.setDestructor(methodBinding.isDestructor()); methodElement.setDestructor(methodBinding.isDestructor());
} else { } else {
if (declSpecifier instanceof ICPPASTDeclSpecifier) { if (declSpecifier instanceof ICPPASTDeclSpecifier) {
final ICPPASTDeclSpecifier cppDeclSpecifier= (ICPPASTDeclSpecifier)declSpecifier; final ICPPASTDeclSpecifier cppDeclSpecifier= (ICPPASTDeclSpecifier) declSpecifier;
methodInfo.setVirtual(cppDeclSpecifier.isVirtual()); methodInfo.setVirtual(cppDeclSpecifier.isVirtual());
methodInfo.setInline(cppDeclSpecifier.isInline()); methodInfo.setInline(cppDeclSpecifier.isInline());
methodInfo.setFriend(cppDeclSpecifier.isFriend()); methodInfo.setFriend(cppDeclSpecifier.isFriend());
@ -947,7 +947,7 @@ public class CModelBuilder2 implements IContributedModelBuilder {
} else if (parent instanceof IStructure) { } else if (parent instanceof IStructure) {
isConstructor= parent.getElementName().equals(simpleName); isConstructor= parent.getElementName().equals(simpleName);
} else if (name instanceof ICPPASTQualifiedName) { } else if (name instanceof ICPPASTQualifiedName) {
final ICPPASTQualifiedName quName= (ICPPASTQualifiedName)name; final ICPPASTQualifiedName quName= (ICPPASTQualifiedName) name;
final ICPPASTNameSpecifier[] qualifier= quName.getQualifier(); final ICPPASTNameSpecifier[] qualifier= quName.getQualifier();
if (qualifier.length == 0) if (qualifier.length == 0)
isConstructor = false; isConstructor = false;
@ -965,7 +965,7 @@ public class CModelBuilder2 implements IContributedModelBuilder {
String functionName= ASTStringUtil.getQualifiedName(name); String functionName= ASTStringUtil.getQualifiedName(name);
// strip namespace qualifier if parent is same namespace // strip namespace qualifier if parent is same namespace
if (name instanceof ICPPASTQualifiedName && parent instanceof INamespace) { if (name instanceof ICPPASTQualifiedName && parent instanceof INamespace) {
final ICPPASTQualifiedName quName= (ICPPASTQualifiedName)name; final ICPPASTQualifiedName quName= (ICPPASTQualifiedName) name;
final ICPPASTNameSpecifier[] qualifier= quName.getQualifier(); final ICPPASTNameSpecifier[] qualifier= quName.getQualifier();
if (qualifier.length >= 1) { if (qualifier.length >= 1) {
ICPPASTNameSpecifier nameSpec = qualifier[qualifier.length - 1]; ICPPASTNameSpecifier nameSpec = qualifier[qualifier.length - 1];
@ -1034,7 +1034,7 @@ public class CModelBuilder2 implements IContributedModelBuilder {
final FunctionInfo info; final FunctionInfo info;
if (declarator instanceof ICPPASTFunctionDeclarator) { if (declarator instanceof ICPPASTFunctionDeclarator) {
final ICPPASTFunctionDeclarator cppFunctionDeclarator= (ICPPASTFunctionDeclarator)declarator; final ICPPASTFunctionDeclarator cppFunctionDeclarator= (ICPPASTFunctionDeclarator) declarator;
if (parent instanceof IStructure) { if (parent instanceof IStructure) {
// method // method
final MethodDeclaration methodElement; final MethodDeclaration methodElement;
@ -1052,7 +1052,7 @@ public class CModelBuilder2 implements IContributedModelBuilder {
final MethodInfo methodInfo= (MethodInfo) getElementInfo(methodElement); final MethodInfo methodInfo= (MethodInfo) getElementInfo(methodElement);
info= methodInfo; info= methodInfo;
if (declSpecifier instanceof ICPPASTDeclSpecifier) { if (declSpecifier instanceof ICPPASTDeclSpecifier) {
final ICPPASTDeclSpecifier cppDeclSpecifier= (ICPPASTDeclSpecifier)declSpecifier; final ICPPASTDeclSpecifier cppDeclSpecifier= (ICPPASTDeclSpecifier) declSpecifier;
methodInfo.setVirtual(cppDeclSpecifier.isVirtual()); methodInfo.setVirtual(cppDeclSpecifier.isVirtual());
methodInfo.setInline(cppDeclSpecifier.isInline()); methodInfo.setInline(cppDeclSpecifier.isInline());
methodInfo.setFriend(cppDeclSpecifier.isFriend()); methodInfo.setFriend(cppDeclSpecifier.isFriend());
@ -1072,7 +1072,7 @@ public class CModelBuilder2 implements IContributedModelBuilder {
element.setReturnType(returnType); element.setReturnType(returnType);
setIndex(element); setIndex(element);
info= (FunctionInfo)getElementInfo(element); info= (FunctionInfo) getElementInfo(element);
info.setConst(cppFunctionDeclarator.isConst()); info.setConst(cppFunctionDeclarator.isConst());
} }
} else if (declarator instanceof IASTStandardFunctionDeclarator) { } else if (declarator instanceof IASTStandardFunctionDeclarator) {
@ -1085,7 +1085,7 @@ public class CModelBuilder2 implements IContributedModelBuilder {
element.setReturnType(returnType); element.setReturnType(returnType);
setIndex(element); setIndex(element);
info= (FunctionInfo)getElementInfo(element); info= (FunctionInfo) getElementInfo(element);
} else { } else {
assert false; assert false;
return null; return null;