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

Removed 3 deprecated methods.

Browse source 
Change-Id: I75ea53a574817c0c91161a38d4209c428a55521b
This commit is contained in:
Sergey Prigogin 2016-02-24 17:54:57 -08:00
parent a913d61e4f
commit 5d40605a40
7 changed files with 28 additions and 102 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2Tests.java
View file

@ -1091,7 +1091,7 @@ public class AST2Tests extends AST2TestBase {
IASTFunctionCallExpression fcall = (IASTFunctionCallExpression) expStatement.getExpression();
IASTIdExpression fcall_id = (IASTIdExpression) fcall.getFunctionNameExpression();
IASTName name_fcall = fcall_id.getName();
assertNull(fcall.getParameterExpression());
assertEquals(0, fcall.getArguments().length);
// void f() {}
IASTFunctionDefinition fdef = (IASTFunctionDefinition) tu.getDeclarations()[2];
@ -4955,7 +4955,7 @@ public class AST2Tests extends AST2TestBase {
IASTFunctionDefinition func= (IASTFunctionDefinition) tu.getDeclarations()[0];
IASTFunctionCallExpression fcall= (IASTFunctionCallExpression) ((IASTExpressionStatement)((IASTCompoundStatement) func.getBody()).getStatements()[0]).getExpression();
IASTLiteralExpression lit= (IASTLiteralExpression) fcall.getParameterExpression();
IASTLiteralExpression lit= (IASTLiteralExpression) fcall.getArguments()[0];
assertEquals("\"this is a string\"", lit.toString());
}
@ -5397,8 +5397,11 @@ public class AST2Tests extends AST2TestBase {
IASTFunctionCallExpression f= (IASTFunctionCallExpression) expr;
polishNotation(f.getFunctionNameExpression(), buf);
buf.append(',');
polishNotation(f.getParameterExpression(), buf);
buf.append(",()");
for (IASTInitializerClause arg : f.getArguments()) {
polishNotation((IASTExpression) arg, buf);
buf.append(',');
}
buf.append("()");
} else if (expr instanceof IASTArraySubscriptExpression) {
IASTArraySubscriptExpression f= (IASTArraySubscriptExpression) expr;
polishNotation(f.getArrayExpression(), buf);

15
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTFunctionCallExpression.java
View file

@ -61,19 +61,4 @@ public interface IASTFunctionCallExpression extends IASTExpression {
* @since 5.2
*/
public void setArguments(IASTInitializerClause[] args);
@Deprecated
public static final ASTNodeProperty PARAMETERS = ARGUMENT;
/**
* @deprecated Replaced by {@link #setArguments(IASTInitializerClause[])}.
*/
@Deprecated
public void setParameterExpression(IASTExpression expression);
/**
* @deprecated Replaced by {@link #getArguments()}.
*/
@Deprecated
public IASTExpression getParameterExpression();
}

37
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTFunctionCallExpression.java
View file

@ -14,7 +14,6 @@ package org.eclipse.cdt.internal.core.dom.parser.c;
import org.eclipse.cdt.core.dom.ast.ASTVisitor;
import org.eclipse.cdt.core.dom.ast.IASTExpression;
import org.eclipse.cdt.core.dom.ast.IASTExpressionList;
import org.eclipse.cdt.core.dom.ast.IASTFunctionCallExpression;
import org.eclipse.cdt.core.dom.ast.IASTInitializerClause;
import org.eclipse.cdt.core.dom.ast.IASTNode;
@ -157,40 +156,4 @@ public class CASTFunctionCallExpression extends ASTNode
public final ValueCategory getValueCategory() {
return ValueCategory.PRVALUE;
}
@Override
@Deprecated
public IASTExpression getParameterExpression() {
if (fArguments.length == 0)
return null;
if (fArguments.length == 1) {
IASTInitializerClause arg = fArguments[0];
if (arg instanceof IASTExpression)
return (IASTExpression) arg;
return null;
}
CASTExpressionList result= new CASTExpressionList();
for (IASTInitializerClause arg : fArguments) {
if (arg instanceof IASTExpression) {
result.addExpression(((IASTExpression) arg).copy());
}
}
result.setParent(this);
result.setPropertyInParent(ARGUMENT);
return result;
}
@Override
@Deprecated
public void setParameterExpression(IASTExpression expression) {
assertNotFrozen();
if (expression == null) {
setArguments(null);
} else if (expression instanceof IASTExpressionList) {
setArguments(((IASTExpressionList) expression).getExpressions());
} else {
setArguments(new IASTExpression[] {expression});
}
}
}

8
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CNodeFactory.java
View file

@ -277,7 +277,13 @@ public class CNodeFactory extends NodeFactory implements ICNodeFactory {
@Deprecated
public IASTFunctionCallExpression newFunctionCallExpression(IASTExpression idExpr, IASTExpression argList) {
CASTFunctionCallExpression result = new CASTFunctionCallExpression(idExpr, null);
result.setParameterExpression(argList);
if (argList == null) {
result.setArguments(null);
} else if (argList instanceof IASTExpressionList) {
result.setArguments(((IASTExpressionList) argList).getExpressions());
} else {
result.setArguments(new IASTExpression[] {argList});
}
return result;
}

37
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTFunctionCallExpression.java
View file

@ -32,7 +32,6 @@ import org.eclipse.cdt.core.dom.ast.IASTNode;
import org.eclipse.cdt.core.dom.ast.IBinding;
import org.eclipse.cdt.core.dom.ast.IType;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTExpression;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTExpressionList;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTFunctionCallExpression;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTInitializerClause;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPClassType;
@ -240,42 +239,6 @@ public class CPPASTFunctionCallExpression extends ASTNode
}
}
@Deprecated
@Override
public IASTExpression getParameterExpression() {
if (fArguments.length == 0)
return null;
if (fArguments.length == 1) {
IASTInitializerClause arg = fArguments[0];
if (arg instanceof IASTExpression)
return (IASTExpression) arg;
return null;
}
CPPASTExpressionList result= new CPPASTExpressionList();
for (IASTInitializerClause arg : fArguments) {
if (arg instanceof IASTExpression) {
result.addExpression(((IASTExpression) arg).copy());
}
}
result.setParent(this);
result.setPropertyInParent(ARGUMENT);
return result;
}
@Deprecated
@Override
public void setParameterExpression(IASTExpression expression) {
assertNotFrozen();
if (expression == null) {
setArguments(null);
} else if (expression instanceof ICPPASTExpressionList) {
setArguments(((ICPPASTExpressionList) expression).getExpressions());
} else {
setArguments(new IASTExpression[] {expression});
}
}
@Override
public ICPPFunction getOverload() {
ICPPEvaluation eval = getEvaluation();

8
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPNodeFactory.java
View file

@ -450,7 +450,13 @@ public class CPPNodeFactory extends NodeFactory implements ICPPNodeFactory {
@Deprecated
public ICPPASTFunctionCallExpression newFunctionCallExpression(IASTExpression idExpr, IASTExpression argList) {
CPPASTFunctionCallExpression result = new CPPASTFunctionCallExpression(idExpr, null);
result.setParameterExpression(argList);
if (argList == null) {
result.setArguments(null);
} else if (argList instanceof ICPPASTExpressionList) {
result.setArguments(((ICPPASTExpressionList) argList).getExpressions());
} else {
result.setArguments(new IASTExpression[] {argList});
}
return result;
}

14
lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRDigraphTrigraphTests.java
View file

@ -10,9 +10,6 @@
*******************************************************************************/
package org.eclipse.cdt.core.lrparser.tests;
import junit.framework.TestCase;
import junit.framework.TestSuite;
import org.eclipse.cdt.core.dom.ast.IASTArrayDeclarator;
import org.eclipse.cdt.core.dom.ast.IASTArrayModifier;
import org.eclipse.cdt.core.dom.ast.IASTArraySubscriptExpression;
@ -20,11 +17,11 @@ import org.eclipse.cdt.core.dom.ast.IASTBinaryExpression;
import org.eclipse.cdt.core.dom.ast.IASTCompoundStatement;
import org.eclipse.cdt.core.dom.ast.IASTDeclarationStatement;
import org.eclipse.cdt.core.dom.ast.IASTDeclarator;
import org.eclipse.cdt.core.dom.ast.IASTExpressionList;
import org.eclipse.cdt.core.dom.ast.IASTEqualsInitializer;
import org.eclipse.cdt.core.dom.ast.IASTExpressionStatement;
import org.eclipse.cdt.core.dom.ast.IASTFunctionCallExpression;
import org.eclipse.cdt.core.dom.ast.IASTFunctionDefinition;
import org.eclipse.cdt.core.dom.ast.IASTEqualsInitializer;
import org.eclipse.cdt.core.dom.ast.IASTInitializerClause;
import org.eclipse.cdt.core.dom.ast.IASTLiteralExpression;
import org.eclipse.cdt.core.dom.ast.IASTPreprocessorMacroDefinition;
import org.eclipse.cdt.core.dom.ast.IASTPreprocessorStatement;
@ -35,6 +32,9 @@ import org.eclipse.cdt.core.dom.ast.IASTUnaryExpression;
import org.eclipse.cdt.core.dom.lrparser.gnu.GCCLanguage;
import org.eclipse.cdt.core.model.ILanguage;
import junit.framework.TestCase;
import junit.framework.TestSuite;
/**
* TODO these tests can be moved into the core
@ -109,8 +109,8 @@ public class LRDigraphTrigraphTests extends TestCase {
// printf(\"%c??/n\", arr??(4??));
IASTFunctionCallExpression expr2 = (IASTFunctionCallExpression)((IASTExpressionStatement)statements[2]).getExpression();
IASTExpressionList params = (IASTExpressionList) expr2.getParameterExpression();
IASTArraySubscriptExpression arr_op2 = (IASTArraySubscriptExpression)params.getExpressions()[1];
IASTInitializerClause[] args = expr2.getArguments();
IASTArraySubscriptExpression arr_op2 = (IASTArraySubscriptExpression) args[1];
assertEquals("4", ((IASTLiteralExpression)arr_op2.getSubscriptExpression()).toString());
}