diff options
7 files changed, 28 insertions, 102 deletions
diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2Tests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2Tests.java index 9dbb5f75076..5dca53d8e59 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2Tests.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2Tests.java @@ -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); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTFunctionCallExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTFunctionCallExpression.java index aa460fdfa56..8abcac924af 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTFunctionCallExpression.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTFunctionCallExpression.java @@ -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(); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTFunctionCallExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTFunctionCallExpression.java index 2e21789d9ad..027b0a95221 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTFunctionCallExpression.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTFunctionCallExpression.java @@ -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}); - } - } } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CNodeFactory.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CNodeFactory.java index d82e74dafd8..e14f1ebf1ea 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CNodeFactory.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CNodeFactory.java @@ -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; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTFunctionCallExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTFunctionCallExpression.java index 3947c98da84..721e2c0a6ba 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTFunctionCallExpression.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTFunctionCallExpression.java @@ -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(); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPNodeFactory.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPNodeFactory.java index ca304376544..06ce67b28a7 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPNodeFactory.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPNodeFactory.java @@ -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; } diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRDigraphTrigraphTests.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRDigraphTrigraphTests.java index fd6f81e894f..22a430425ab 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRDigraphTrigraphTests.java +++ b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRDigraphTrigraphTests.java @@ -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()); } |