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

Cosmetics.

Browse source
This commit is contained in:
Sergey Prigogin 2013-05-07 19:47:40 -07:00
parent fd5ee15baa
commit b7f27c70ca
3 changed files with 45 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2TemplateTests.java
View file

@ -3523,7 +3523,7 @@ public class AST2TemplateTests extends AST2TestBase {
// template<typename T> void f(T); // template<typename T> void f(T);
// }; // };
// template<typename T> void A<float>::f(T){} //problem on f // template<typename T> void A<float>::f(T){} //problem on f
public void testClassTemplateMemberFunctionTemplate_Bug104262() throws Exception { public void testClassTemplateMemberFunctionTemplate_104262() throws Exception {
final String code = getAboveComment(); final String code = getAboveComment();
parseAndCheckBindings(code); parseAndCheckBindings(code);
BindingAssertionHelper bh= new BindingAssertionHelper(code, CPP); BindingAssertionHelper bh= new BindingAssertionHelper(code, CPP);
@ -3574,7 +3574,7 @@ public class AST2TemplateTests extends AST2TestBase {
// this->a= 1; // this->a= 1;
// } // }
// }; // };
public void testFieldReference_Bug257186() throws Exception { public void testFieldReference_257186() throws Exception {
final String code = getAboveComment(); final String code = getAboveComment();
parseAndCheckBindings(code); parseAndCheckBindings(code);
BindingAssertionHelper bh= new BindingAssertionHelper(code, CPP); BindingAssertionHelper bh= new BindingAssertionHelper(code, CPP);
@ -3596,7 +3596,7 @@ public class AST2TemplateTests extends AST2TestBase {
// f(b); g(b); h(b); m(b); // f(b); g(b); h(b); m(b);
// } // }
// }; // };
public void testUnknownReferences_Bug257194() throws Exception { public void testUnknownReferences_257194() throws Exception {
final String code = getAboveComment(); final String code = getAboveComment();
parseAndCheckBindings(code); parseAndCheckBindings(code);
BindingAssertionHelper bh= new BindingAssertionHelper(code, CPP); BindingAssertionHelper bh= new BindingAssertionHelper(code, CPP);
@ -3620,7 +3620,7 @@ public class AST2TemplateTests extends AST2TestBase {
// v.x; v.y(); // v.x; v.y();
// } // }
// }; // };
public void testTypeOfUnknownReferences_Bug257194a() throws Exception { public void testTypeOfUnknownReferences_257194a() throws Exception {
final String code = getAboveComment(); final String code = getAboveComment();
parseAndCheckBindings(code); parseAndCheckBindings(code);
BindingAssertionHelper bh= new BindingAssertionHelper(code, CPP); BindingAssertionHelper bh= new BindingAssertionHelper(code, CPP);
@ -3645,7 +3645,7 @@ public class AST2TemplateTests extends AST2TestBase {
// v->x; v->y(); // v->x; v->y();
// } // }
// }; // };
public void testTypeOfUnknownReferences_Bug257194b() throws Exception { public void testTypeOfUnknownReferences_257194b() throws Exception {
final String code = getAboveComment(); final String code = getAboveComment();
parseAndCheckBindings(code); parseAndCheckBindings(code);
BindingAssertionHelper bh= new BindingAssertionHelper(code, CPP); BindingAssertionHelper bh= new BindingAssertionHelper(code, CPP);
@ -5214,7 +5214,7 @@ public class AST2TemplateTests extends AST2TestBase {
// void test() { // void test() {
// sort(MySort<int>); // sort(MySort<int>);
// } // }
public void testAdressOfUniqueTemplateInst_Bug326076() throws Exception { public void testAdressOfUniqueTemplateInst_326076() throws Exception {
parseAndCheckBindings(); parseAndCheckBindings();
} }
@ -5229,7 +5229,7 @@ public class AST2TemplateTests extends AST2TestBase {
// f(g, '1'); // f(g, '1');
// f(g, 1); // f(g, 1);
// } // }
public void testInstantiationOfFunctionTemplateWithOverloadedFunctionSetArgument_Bug326492() throws Exception { public void testInstantiationOfFunctionTemplateWithOverloadedFunctionSetArgument_326492() throws Exception {
String code= getAboveComment(); String code= getAboveComment();
BindingAssertionHelper bh= new BindingAssertionHelper(code, CPP); BindingAssertionHelper bh= new BindingAssertionHelper(code, CPP);
ICPPFunctionTemplate f1= bh.assertNonProblem("f(T (*)(int), char)", 1); ICPPFunctionTemplate f1= bh.assertNonProblem("f(T (*)(int), char)", 1);
@ -5259,7 +5259,7 @@ public class AST2TemplateTests extends AST2TestBase {
// Ptr<ns::T> parm; // Ptr<ns::T> parm;
// f(parm); // f(parm);
// } // }
public void testADLForTemplateSpecializations_Bug327069() throws Exception { public void testADLForTemplateSpecializations_327069() throws Exception {
parseAndCheckBindings(); parseAndCheckBindings();
} }
@ -5269,7 +5269,7 @@ public class AST2TemplateTests extends AST2TestBase {
// void x(int* (*) (int*)) { // void x(int* (*) (int*)) {
// x(f); // x(f);
// } // }
public void testPartialOrderingInNonCallContext_Bug326900() throws Exception { public void testPartialOrderingInNonCallContext_326900() throws Exception {
parseAndCheckBindings(); parseAndCheckBindings();
} }
@ -5281,7 +5281,7 @@ public class AST2TemplateTests extends AST2TestBase {
// X x; // X x;
// y(x); // y(x);
// } // }
public void testPartialOrderingForConversions_Bug326900() throws Exception { public void testPartialOrderingForConversions_326900() throws Exception {
parseAndCheckBindings(); parseAndCheckBindings();
} }
@ -5297,7 +5297,7 @@ public class AST2TemplateTests extends AST2TestBase {
// L<S>::CI l; // L<S>::CI l;
// l.m().foo = 1; // l.m().foo = 1;
// } // }
public void testNestedTypedefSpecialization_Bug329795() throws Exception { public void testNestedTypedefSpecialization_329795() throws Exception {
String code= getAboveComment(); String code= getAboveComment();
BindingAssertionHelper bh= new BindingAssertionHelper(code, CPP); BindingAssertionHelper bh= new BindingAssertionHelper(code, CPP);
ICPPField f1= bh.assertNonProblem("foo;", 3); ICPPField f1= bh.assertNonProblem("foo;", 3);
@ -5319,7 +5319,7 @@ public class AST2TemplateTests extends AST2TestBase {
// TestImpl::Inner2* ptr2=ptr1->ptr2; // TestImpl::Inner2* ptr2=ptr1->ptr2;
// func(ptr2->ptr1); // func(ptr2->ptr1);
// } // }
public void testSpecializationViaNotDirectlyEnclosingTemplate_Bug333186() throws Exception { public void testSpecializationViaNotDirectlyEnclosingTemplate_333186() throws Exception {
parseAndCheckBindings(); parseAndCheckBindings();
} }
@ -5332,21 +5332,21 @@ public class AST2TemplateTests extends AST2TestBase {
// //
// struct C {}; // struct C {};
// template <class C& c> class Z{}; // template <class C& c> class Z{};
public void testNonTypeTemplateParameterWithTypenameKeyword_Bug333186() throws Exception { public void testNonTypeTemplateParameterWithTypenameKeyword_333186() throws Exception {
parseAndCheckBindings(); parseAndCheckBindings();
} }
// template <typename T, typename U = int> void f() { // template <typename T, typename U = int> void f() {
// f<int>(); // f<int>();
// } // }
public void testDefaultTmplArgumentOfFunctionTemplate_Bug333325() throws Exception { public void testDefaultTmplArgumentOfFunctionTemplate_333325() throws Exception {
parseAndCheckBindings(); parseAndCheckBindings();
} }
// template <void (*Func)()> class X {}; // template <void (*Func)()> class X {};
// template <typename T> void Y(); // template <typename T> void Y();
// X< Y<int> > x; // X< Y<int> > x;
public void testFunctionInstanceAsTemplateArg_Bug333529() throws Exception { public void testFunctionInstanceAsTemplateArg_333529() throws Exception {
parseAndCheckBindings(); parseAndCheckBindings();
} }
@ -5372,7 +5372,7 @@ public class AST2TemplateTests extends AST2TestBase {
// void test() { // void test() {
// P(C()); // P(C());
// } // }
public void testFunctionInstanceAsTemplateArg_Bug334472() throws Exception { public void testFunctionInstanceAsTemplateArg_334472() throws Exception {
parseAndCheckBindings(); parseAndCheckBindings();
} }
@ -5382,7 +5382,7 @@ public class AST2TemplateTests extends AST2TestBase {
// g<int>(); // g<int>();
// g<int, int>(); // g<int, int>();
// } // }
public void testFunctionTemplateSignatures_Bug335062() throws Exception { public void testFunctionTemplateSignatures_335062() throws Exception {
parseAndCheckBindings(); parseAndCheckBindings();
} }
@ -5404,7 +5404,7 @@ public class AST2TemplateTests extends AST2TestBase {
// void g() { // void g() {
// function(0); // ERROR HERE // function(0); // ERROR HERE
// } // }
public void testSyntaxErrorInReturnTypeOfFunctionInstance_Bug336426() throws Exception { public void testSyntaxErrorInReturnTypeOfFunctionInstance_336426() throws Exception {
parseAndCheckBindings(); parseAndCheckBindings();
} }
@ -5412,7 +5412,7 @@ public class AST2TemplateTests extends AST2TestBase {
// template <typename Functor> void f(Functor functor) { // template <typename Functor> void f(Functor functor) {
// A<decltype(functor())> a; // A<decltype(functor())> a;
// } // }
public void testFunctionCallOnDependentName_Bug337686() throws Exception { public void testFunctionCallOnDependentName_337686() throws Exception {
parseAndCheckBindings(); parseAndCheckBindings();
} }
@ -5424,7 +5424,7 @@ public class AST2TemplateTests extends AST2TestBase {
// h(s, 1); // h(s, 1);
// h(s, 1, 2); // h(s, 1, 2);
// } // }
public void testVariadicFunctionTemplate_Bug333389() throws Exception { public void testVariadicFunctionTemplate_333389() throws Exception {
parseAndCheckBindings(); parseAndCheckBindings();
} }
@ -5547,7 +5547,7 @@ public class AST2TemplateTests extends AST2TestBase {
// ft(&Foo::function); // ft(&Foo::function);
// return 0; // return 0;
// } // }
public void testAddressOfMethodForInstantiation_Bug344310() throws Exception { public void testAddressOfMethodForInstantiation_344310() throws Exception {
parseAndCheckBindings(); parseAndCheckBindings();
} }
@ -7328,7 +7328,7 @@ public class AST2TemplateTests extends AST2TestBase {
// } // }
// void test() { // void test() {
// N::impl<T>::type operand; // N::impl<T>::type operand;
// operand.kind(); // ERROR HERE: Method 'kind' could not be resolved // operand.kind();
// } // }
public void testNameLookupInDependentExpression_399829a() throws Exception { public void testNameLookupInDependentExpression_399829a() throws Exception {
parseAndCheckBindings(); parseAndCheckBindings();
@ -7352,7 +7352,7 @@ public class AST2TemplateTests extends AST2TestBase {
// } // }
// void test() { // void test() {
// N::impl<S>::type operand; // N::impl<S>::type operand;
// operand.kind(); // ERROR HERE: Method 'kind' could not be resolved // operand.kind();
// } // }
public void testNameLookupInDependentExpression_399829b() throws Exception { public void testNameLookupInDependentExpression_399829b() throws Exception {
parseAndCheckBindings(); parseAndCheckBindings();

34
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalUnary.java
View file

@ -75,11 +75,12 @@ public class EvalUnary extends CPPDependentEvaluation {
private ICPPFunction fOverload= CPPFunction.UNINITIALIZED_FUNCTION; private ICPPFunction fOverload= CPPFunction.UNINITIALIZED_FUNCTION;
private IType fType; private IType fType;
public EvalUnary(int operator, ICPPEvaluation operand, IBinding addressOfQualifiedNameBinding, public EvalUnary(int operator, ICPPEvaluation operand, IBinding addressOfQualifiedNameBinding,
IASTNode pointOfDefinition) { IASTNode pointOfDefinition) {
this(operator, operand, addressOfQualifiedNameBinding, findEnclosingTemplate(pointOfDefinition)); this(operator, operand, addressOfQualifiedNameBinding, findEnclosingTemplate(pointOfDefinition));
} }
public EvalUnary(int operator, ICPPEvaluation operand, IBinding addressOfQualifiedNameBinding,
public EvalUnary(int operator, ICPPEvaluation operand, IBinding addressOfQualifiedNameBinding,
IBinding templateDefinition) { IBinding templateDefinition) {
super(templateDefinition); super(templateDefinition);
fOperator= operator; fOperator= operator;
@ -161,7 +162,7 @@ public class EvalUnary extends CPPDependentEvaluation {
if (fAddressOfQualifiedNameBinding instanceof ICPPMember) { if (fAddressOfQualifiedNameBinding instanceof ICPPMember) {
ICPPMember member= (ICPPMember) fAddressOfQualifiedNameBinding; ICPPMember member= (ICPPMember) fAddressOfQualifiedNameBinding;
if (!member.isStatic()) if (!member.isStatic())
return null; return null;
} }
@ -176,7 +177,8 @@ public class EvalUnary extends CPPDependentEvaluation {
} else { } else {
args = new ICPPEvaluation[] { fArgument }; args = new ICPPEvaluation[] { fArgument };
} }
return CPPSemantics.findOverloadedOperator(point, getTemplateDefinitionScope(), args, type, op, LookupMode.LIMITED_GLOBALS); return CPPSemantics.findOverloadedOperator(point, getTemplateDefinitionScope(), args, type,
op, LookupMode.LIMITED_GLOBALS);
} }
@Override @Override
@ -207,7 +209,8 @@ public class EvalUnary extends CPPDependentEvaluation {
ICPPMember member= (ICPPMember) fAddressOfQualifiedNameBinding; ICPPMember member= (ICPPMember) fAddressOfQualifiedNameBinding;
if (!member.isStatic()) { if (!member.isStatic()) {
try { try {
return new CPPPointerToMemberType(member.getType(), member.getClassOwner(), false, false, false); return new CPPPointerToMemberType(member.getType(), member.getClassOwner(),
false, false, false);
} catch (DOMException e) { } catch (DOMException e) {
return e.getProblem(); return e.getProblem();
} }
@ -245,7 +248,7 @@ public class EvalUnary extends CPPDependentEvaluation {
public IValue getValue(IASTNode point) { public IValue getValue(IASTNode point) {
if (isValueDependent()) if (isValueDependent())
return Value.create(this); return Value.create(this);
if (getOverload(point) != null) { if (getOverload(point) != null) {
// TODO(sprigogin): Simulate execution of a function call. // TODO(sprigogin): Simulate execution of a function call.
return Value.create(this); return Value.create(this);
@ -253,11 +256,13 @@ public class EvalUnary extends CPPDependentEvaluation {
switch (fOperator) { switch (fOperator) {
case op_sizeof: { case op_sizeof: {
SizeAndAlignment info = SizeofCalculator.getSizeAndAlignment(fArgument.getTypeOrFunctionSet(point), point); SizeAndAlignment info =
SizeofCalculator.getSizeAndAlignment(fArgument.getTypeOrFunctionSet(point), point);
return info == null ? Value.UNKNOWN : Value.create(info.size); return info == null ? Value.UNKNOWN : Value.create(info.size);
} }
case op_alignOf: { case op_alignOf: {
SizeAndAlignment info = SizeofCalculator.getSizeAndAlignment(fArgument.getTypeOrFunctionSet(point), point); SizeAndAlignment info =
SizeofCalculator.getSizeAndAlignment(fArgument.getTypeOrFunctionSet(point), point);
return info == null ? Value.UNKNOWN : Value.create(info.alignment); return info == null ? Value.UNKNOWN : Value.create(info.alignment);
} }
case op_noexcept: case op_noexcept:
@ -273,7 +278,7 @@ public class EvalUnary extends CPPDependentEvaluation {
IValue val = fArgument.getValue(point); IValue val = fArgument.getValue(point);
if (val == null) if (val == null)
return Value.UNKNOWN; return Value.UNKNOWN;
Long num = val.numericalValue(); Long num = val.numericalValue();
if (num != null) { if (num != null) {
return Value.evaluateUnaryExpression(fOperator, num); return Value.evaluateUnaryExpression(fOperator, num);
@ -307,7 +312,8 @@ public class EvalUnary extends CPPDependentEvaluation {
marshalTemplateDefinition(buffer); marshalTemplateDefinition(buffer);
} }
public static ISerializableEvaluation unmarshal(short firstBytes, ITypeMarshalBuffer buffer) throws CoreException { public static ISerializableEvaluation unmarshal(short firstBytes, ITypeMarshalBuffer buffer)
throws CoreException {
int op= buffer.getByte(); int op= buffer.getByte();
ICPPEvaluation arg= (ICPPEvaluation) buffer.unmarshalEvaluation(); ICPPEvaluation arg= (ICPPEvaluation) buffer.unmarshalEvaluation();
IBinding binding= buffer.unmarshalBinding(); IBinding binding= buffer.unmarshalBinding();
@ -328,17 +334,17 @@ public class EvalUnary extends CPPDependentEvaluation {
} }
if (argument == fArgument && aoqn == fAddressOfQualifiedNameBinding) if (argument == fArgument && aoqn == fAddressOfQualifiedNameBinding)
return this; return this;
return new EvalUnary(fOperator, argument, aoqn, getTemplateDefinition()); return new EvalUnary(fOperator, argument, aoqn, getTemplateDefinition());
} }
@Override @Override
public ICPPEvaluation computeForFunctionCall(CPPFunctionParameterMap parameterMap, public ICPPEvaluation computeForFunctionCall(CPPFunctionParameterMap parameterMap, int maxdepth,
int maxdepth, IASTNode point) { IASTNode point) {
ICPPEvaluation argument = fArgument.computeForFunctionCall(parameterMap, maxdepth, point); ICPPEvaluation argument = fArgument.computeForFunctionCall(parameterMap, maxdepth, point);
if (argument == fArgument) if (argument == fArgument)
return this; return this;
return new EvalUnary(fOperator, argument, fAddressOfQualifiedNameBinding, getTemplateDefinition()); return new EvalUnary(fOperator, argument, fAddressOfQualifiedNameBinding, getTemplateDefinition());
} }

4
lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRTemplateTests.java
View file

@ -103,10 +103,10 @@ public class LRTemplateTests extends AST2TemplateTests {
public void testFunctionParameterPacksInNonFinalPosition_324096() throws Exception {} public void testFunctionParameterPacksInNonFinalPosition_324096() throws Exception {}
//decltype related //decltype related
@Override @Override
public void testFunctionCallOnDependentName_Bug337686() throws Exception {} public void testFunctionCallOnDependentName_337686() throws Exception {}
//variadic template //variadic template
@Override @Override
public void testVariadicFunctionTemplate_Bug333389() throws Exception {} public void testVariadicFunctionTemplate_333389() throws Exception {}
//auto //auto
@Override @Override
public void testRRefVsRef_351927() throws Exception {} public void testRRefVsRef_351927() throws Exception {}