Deprecation of IASTArraySubscriptExpression.getSubscriptExpression().

5 files changed, 7 insertions, 4 deletions

diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/ASTSignatureUtil.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/ASTSignatureUtil.java
index 84b14a1867f..0ef2ccfccfd 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/ASTSignatureUtil.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/ASTSignatureUtil.java
@@ -851,7 +851,7 @@ public class ASTSignatureUtil {
 		StringBuffer result = new StringBuffer();
 		result.append(getExpressionString(expression.getArrayExpression()));
 		result.append(Keywords.cpLBRACKET);
-		result.append(getExpressionString(expression.getSubscriptExpression()));
+		result.append(getInitializerClauseString(expression.getArgument()));
 		result.append(Keywords.cpRBRACKET);
 		return result.toString();
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTArraySubscriptExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTArraySubscriptExpression.java
index 3e9580a921e..a5fe17ff3f2 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTArraySubscriptExpression.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTArraySubscriptExpression.java
@@ -58,11 +58,15 @@ public interface IASTArraySubscriptExpression extends IASTExpression {
 
 	/**
 	 * Returns the subscript expression, or <code>null</code>. Consider using {@link #getArgument()}.
+	 * @deprecated Replaced by {@link #getArgument()}
 	 */
+	@Deprecated
 	public IASTExpression getSubscriptExpression();
 
 	/**
 	 * Not allowed on frozen ast.
+	 * @deprecated Replaced by {@link #setArgument(IASTInitializerClause)}
 	 */
+	@Deprecated
 	public void setSubscriptExpression(IASTExpression expression);
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTArraySubscriptExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTArraySubscriptExpression.java
index 65090f6183d..d9a66aaa98a 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTArraySubscriptExpression.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTArraySubscriptExpression.java
@@ -74,7 +74,6 @@ public class CASTArraySubscriptExpression extends ASTNode implements
         }
     }
 
-    
     public IASTInitializerClause getArgument() {
 		return getSubscriptExpression();
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPSemantics.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPSemantics.java
index af4c6884675..d8f29a3f47d 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPSemantics.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPSemantics.java
@@ -2702,7 +2702,7 @@ public class CPPSemantics {
 
     public static ICPPFunction findOverloadedOperator(IASTArraySubscriptExpression exp) {
     	char[] name = OverloadableOperator.BRACKET.toCharArray();
-    	IASTExpression[] args = {exp.getArrayExpression(), exp.getSubscriptExpression()};
+    	IASTInitializerClause[] args = {exp.getArrayExpression(), exp.getArgument()};
     	IType type = exp.getArrayExpression().getExpressionType();
     	type = SemanticUtil.getUltimateTypeUptoPointers(type);
     	return findOverloadedOperator(exp, args, type, name, NonMemberMode.none);
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/rewrite/astwriter/ExpressionWriter.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/rewrite/astwriter/ExpressionWriter.java
index a04d3310ade..3c9cce0eb1f 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/rewrite/astwriter/ExpressionWriter.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/rewrite/astwriter/ExpressionWriter.java
@@ -408,7 +408,7 @@ public class ExpressionWriter extends NodeWriter{
 	private void writeArraySubscriptExpression(IASTArraySubscriptExpression arrSubExp) {
 		arrSubExp.getArrayExpression().accept(visitor);
 		scribe.print('[');
-		arrSubExp.getSubscriptExpression().accept(visitor);
+		arrSubExp.getArgument().accept(visitor);
 		scribe.print(']');
 		
 	}