[
Date Prev][
Date Next][
Thread Prev][
Thread Next][
Date Index][
Thread Index]
[
List Home]
This patch updates the create methods of the CModelBuilder:
-changes visibility to protected.
-returns the created element.
Thanks,
Hoda
Index: parser/org/eclipse/cdt/internal/core/model/CModelBuilder.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/model/CModelBuilder.java,v
retrieving revision 1.10
diff -u -r1.10 CModelBuilder.java
--- parser/org/eclipse/cdt/internal/core/model/CModelBuilder.java 14 Apr 2003 17:25:33 -0000 1.10
+++ parser/org/eclipse/cdt/internal/core/model/CModelBuilder.java 14 Apr 2003 19:01:22 -0000
@@ -165,7 +165,7 @@
}
- private void createElement(Parent parent, SimpleDeclaration simpleDeclaration, Declarator declarator){
+ protected void createElement(Parent parent, SimpleDeclaration simpleDeclaration, Declarator declarator){
// typedef
if(simpleDeclaration.getDeclSpecifier().isTypedef()){
createTypeDef(parent, declarator, simpleDeclaration);
@@ -187,7 +187,7 @@
}
}
- private void createTemplateElement(Parent parent, TemplateDeclaration templateDeclaration, SimpleDeclaration simpleDeclaration, Declarator declarator){
+ protected void createTemplateElement(Parent parent, TemplateDeclaration templateDeclaration, SimpleDeclaration simpleDeclaration, Declarator declarator){
ParameterDeclarationClause pdc = declarator.getParms();
if (pdc != null){
// template of function or method
@@ -196,7 +196,7 @@
template.setTemplateParameterTypes(parameterTypes);
}
}
- private void createInclusion(Parent parent, Inclusion inclusion){
+ protected Include createInclusion(Parent parent, Inclusion inclusion){
// create element
Include element = new Include((CElement)parent, inclusion.getName());
// add to parent
@@ -204,9 +204,10 @@
// set position
element.setIdPos(inclusion.getNameOffset(), inclusion.getNameLength());
element.setPos(inclusion.getStartingOffset(), inclusion.getTotalLength());
+ return element;
}
- private void createMacro(Parent parent, Macro macro){
+ protected org.eclipse.cdt.internal.core.model.Macro createMacro(Parent parent, Macro macro){
// create element
org.eclipse.cdt.internal.core.model.Macro element = new org.eclipse.cdt.internal.core.model.Macro(parent, macro.getName());
// add to parent
@@ -214,10 +215,10 @@
// set position
element.setIdPos(macro.getNameOffset(), macro.getNameLength());
element.setPos(macro.getStartingOffset(), macro.getTotalLength());
-
+ return element;
}
- private IParent createNamespace(Parent parent, NamespaceDefinition nsDef){
+ protected Namespace createNamespace(Parent parent, NamespaceDefinition nsDef){
// create element
String nsName = (nsDef.getName() == null ) ? "" : nsDef.getName().toString();
Namespace element = new Namespace ((ICElement)parent, nsName );
@@ -232,10 +233,10 @@
element.setPos(nsDef.getStartingOffset(), nsDef.getTotalLength());
element.setTypeName(nsDef.getStartToken().getImage());
- return (IParent)element;
+ return element;
}
- private IParent createEnumeration(Parent parent, EnumerationSpecifier enumSpecifier){
+ protected Enumeration createEnumeration(Parent parent, EnumerationSpecifier enumSpecifier){
// create element
String enumName = (enumSpecifier.getName() == null ) ? "" : enumSpecifier.getName().toString();
Enumeration enum = new Enumeration ((ICElement)parent, enumName );
@@ -246,14 +247,8 @@
while (i.hasNext()){
// create sub element
EnumeratorDefinition enumDef = (EnumeratorDefinition) i.next();
- Enumerator element = new Enumerator (enum, enumDef.getName().toString());
- // add to parent
- enum.addChild(element);
- // set enumerator position
- element.setIdPos(enumDef.getName().getStartOffset(), enumDef.getName().length());
- element.setPos(enumDef.getStartingOffset(), enumDef.getTotalLength());
+ createEnumerator(enum, enumDef);
}
-
// set enumeration position
if(enumSpecifier.getName() != null ){
enum.setIdPos(enumSpecifier.getName().getStartOffset(), enumSpecifier.getName().length());
@@ -263,10 +258,20 @@
enum.setPos(enumSpecifier.getStartingOffset(), enumSpecifier.getTotalLength());
enum.setTypeName(enumSpecifier.getStartToken().getImage());
- return (IParent)enum;
+ return enum;
}
- private IParent createClass(Parent parent, SimpleDeclaration simpleDeclaration, ClassSpecifier classSpecifier, boolean isTemplate){
+ protected Enumerator createEnumerator(Parent enum, EnumeratorDefinition enumDef){
+ Enumerator element = new Enumerator (enum, enumDef.getName().toString());
+ // add to parent
+ enum.addChild(element);
+ // set enumerator position
+ element.setIdPos(enumDef.getName().getStartOffset(), enumDef.getName().length());
+ element.setPos(enumDef.getStartingOffset(), enumDef.getTotalLength());
+ return element;
+ }
+
+ protected Structure createClass(Parent parent, SimpleDeclaration simpleDeclaration, ClassSpecifier classSpecifier, boolean isTemplate){
// create element
String className = (classSpecifier.getName() == null ) ? "" : classSpecifier.getName().toString();
int kind;
@@ -314,7 +319,7 @@
return element;
}
- private void createTypeDef(Parent parent, Declarator declarator, SimpleDeclaration simpleDeclaration){
+ protected TypeDef createTypeDef(Parent parent, Declarator declarator, SimpleDeclaration simpleDeclaration){
// create the element
String declaratorName = declarator.getName().toString();
TypeDef typedef = new TypeDef( parent, declaratorName );
@@ -326,11 +331,11 @@
// set positions
typedef.setIdPos(declarator.getName().getStartOffset(), declarator.getName().length());
- typedef.setPos(simpleDeclaration.getStartingOffset(), simpleDeclaration.getTotalLength());
+ typedef.setPos(simpleDeclaration.getStartingOffset(), simpleDeclaration.getTotalLength());
+ return typedef;
}
- private VariableDeclaration createVariableSpecification(Parent parent, SimpleDeclaration simpleDeclaration, Declarator declarator){
-
+ protected VariableDeclaration createVariableSpecification(Parent parent, SimpleDeclaration simpleDeclaration, Declarator declarator){
String declaratorName = declarator.getName().toString();
DeclSpecifier declSpecifier = simpleDeclaration.getDeclSpecifier();
@@ -368,7 +373,7 @@
return element;
}
- private FunctionDeclaration createFunctionSpecification(Parent parent, SimpleDeclaration simpleDeclaration, Declarator declarator, ParameterDeclarationClause pdc, boolean isTemplate){
+ protected FunctionDeclaration createFunctionSpecification(Parent parent, SimpleDeclaration simpleDeclaration, Declarator declarator, ParameterDeclarationClause pdc, boolean isTemplate){
String declaratorName = declarator.getName().toString();
DeclSpecifier declSpecifier = simpleDeclaration.getDeclSpecifier();
// getParameterTypes
@@ -445,7 +450,7 @@
return element;
}
- private VariableDeclaration createPointerToFunction(Parent parent, SimpleDeclaration simpleDeclaration, Declarator declarator, ParameterDeclarationClause pdc, boolean isTemplate){
+ protected VariableDeclaration createPointerToFunction(Parent parent, SimpleDeclaration simpleDeclaration, Declarator declarator, ParameterDeclarationClause pdc, boolean isTemplate){
String declaratorName = declarator.getDeclarator().getName().toString();
DeclSpecifier declSpecifier = simpleDeclaration.getDeclSpecifier();
// getParameterTypes
@@ -491,6 +496,7 @@
element.setPos(simpleDeclaration.getStartingOffset(), simpleDeclaration.getTotalLength());
return element;
}
+
private String[] getTemplateParameters(ITemplateParameterListOwner templateDeclaration){
// add the parameters
List templateParameters = templateDeclaration.getTemplateParms().getDeclarations();
