From ec4d154f1300d35ad9d0ef522fe35e86760c7801 Mon Sep 17 00:00:00 2001 From: John Camelon Date: Fri, 17 Dec 2004 14:29:28 +0000 Subject: [PATCH] Fixed type-ohs. --- .../cdt/core/dom/ast/c/ICASTDesignatedInitializer.java | 6 +++--- .../core/dom/parser/c/CASTDesignatedInitializer.java | 4 ++-- ...ializerExpresion.java => CASTInitializerExpression.java} | 2 +- .../cdt/internal/core/dom/parser/c/GNUCSourceParser.java | 6 +++--- ...lizerExpresion.java => CPPASTInitializerExpression.java} | 2 +- .../internal/core/dom/parser/cpp/GNUCPPSourceParser.java | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) rename core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/{CASTInitializerExpresion.java => CASTInitializerExpression.java} (94%) rename core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/{CPPASTInitializerExpresion.java => CPPASTInitializerExpression.java} (94%) diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTDesignatedInitializer.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTDesignatedInitializer.java index 2d33d5361d6..e47d9330b18 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTDesignatedInitializer.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTDesignatedInitializer.java @@ -24,7 +24,7 @@ public interface ICASTDesignatedInitializer extends public void addDesignator( ICASTDesignator designator ); public ICASTDesignator [] getDesignators(); - public static final ASTNodeProperty RHS_INITIALIZER = new ASTNodeProperty( "RHS Initializer"); //$NON-NLS-1$ - public IASTInitializer getRHSInitializer(); - public void setRHSInitializer( IASTInitializer rhs ); + public static final ASTNodeProperty OPERAND = new ASTNodeProperty( "RHS Initializer"); //$NON-NLS-1$ + public IASTInitializer getOperandInitializer(); + public void setOperandInitializer( IASTInitializer rhs ); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTDesignatedInitializer.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTDesignatedInitializer.java index 63a35bd445d..0db9f06c410 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTDesignatedInitializer.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTDesignatedInitializer.java @@ -70,14 +70,14 @@ public class CASTDesignatedInitializer extends CASTNode implements /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.c.ICASTDesignatedInitializer#getRHSInitializer() */ - public IASTInitializer getRHSInitializer() { + public IASTInitializer getOperandInitializer() { return rhs; } /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.c.ICASTDesignatedInitializer#setRHSInitializer(org.eclipse.cdt.core.dom.ast.IASTInitializer) */ - public void setRHSInitializer(IASTInitializer rhs) { + public void setOperandInitializer(IASTInitializer rhs) { this.rhs = rhs; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTInitializerExpresion.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTInitializerExpression.java similarity index 94% rename from core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTInitializerExpresion.java rename to core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTInitializerExpression.java index b7daa3f44f9..7ebd179ac4b 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTInitializerExpresion.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTInitializerExpression.java @@ -15,7 +15,7 @@ import org.eclipse.cdt.core.dom.ast.IASTInitializerExpression; /** * @author jcamelon */ -public class CASTInitializerExpresion extends CASTNode implements +public class CASTInitializerExpression extends CASTNode implements IASTInitializerExpression { private IASTExpression expression; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/GNUCSourceParser.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/GNUCSourceParser.java index c1765a74435..1667f55b649 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/GNUCSourceParser.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/GNUCSourceParser.java @@ -178,9 +178,9 @@ public class GNUCSourceParser extends AbstractGNUSourceCodeParser { d.setPropertyInParent( ICASTDesignatedInitializer.DESIGNATOR ); desigInitializer.addDesignator( d ); } - desigInitializer.setRHSInitializer(initializer); + desigInitializer.setOperandInitializer(initializer); initializer.setParent( desigInitializer ); - initializer.setPropertyInParent( ICASTDesignatedInitializer.RHS_INITIALIZER ); + initializer.setPropertyInParent( ICASTDesignatedInitializer.OPERAND ); result.addInitializer( desigInitializer ); desigInitializer.setParent( result ); desigInitializer.setPropertyInParent( IASTInitializerList.NESTED_INITIALIZER ); @@ -244,7 +244,7 @@ public class GNUCSourceParser extends AbstractGNUSourceCodeParser { * @return */ protected IASTInitializerExpression createInitializerExpression() { - return new CASTInitializerExpresion(); + return new CASTInitializerExpression(); } protected List designatorList() throws EndOfFileException, diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTInitializerExpresion.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTInitializerExpression.java similarity index 94% rename from core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTInitializerExpresion.java rename to core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTInitializerExpression.java index c185b4927f7..ce806426891 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTInitializerExpresion.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTInitializerExpression.java @@ -16,7 +16,7 @@ import org.eclipse.cdt.core.dom.ast.IASTInitializerExpression; /** * @author jcamelon */ -public class CPPASTInitializerExpresion extends CPPASTNode implements +public class CPPASTInitializerExpression extends CPPASTNode implements IASTInitializerExpression { private IASTExpression exp; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/GNUCPPSourceParser.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/GNUCPPSourceParser.java index f1628378e26..599c4a80a2a 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/GNUCPPSourceParser.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/GNUCPPSourceParser.java @@ -3336,7 +3336,7 @@ public class GNUCPPSourceParser extends AbstractGNUSourceCodeParser { * @return */ protected IASTInitializerExpression createInitializerExpression() { - return new CPPASTInitializerExpresion(); + return new CPPASTInitializerExpression(); } /**