From b4271a2cb3b527acaa8119b5bb65dd86594eadad Mon Sep 17 00:00:00 2001 From: Vivian Kong Date: Thu, 3 Jun 2010 20:35:48 +0000 Subject: [PATCH] Bug 315435 Fix the regression test failures in cdt70 for John Liu --- .../eclipse/cdt/core/parser/tests/ast2/AST2CPPTests.java | 4 ++-- .../dom/parser/cpp/CPPASTConstructorChainInitializer.java | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2CPPTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2CPPTests.java index 623040ccc25..350fe623b3e 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2CPPTests.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2CPPTests.java @@ -2129,7 +2129,7 @@ public class AST2CPPTests extends AST2BaseTest { } // class Other { - // void m(); + // void m(); }; // class A { // friend void set(); // friend void Other::m(); @@ -5593,7 +5593,7 @@ public class AST2CPPTests extends AST2BaseTest { // void foo/*_d*/(unsigned short x) {} // void foo/*_e*/(long x) {} // void foo/*_f*/(unsigned long x) {} - // void foo/*_g*/(long long x) {} + // void foo/*_g*/(long long g) {} // void foo/*_h*/(unsigned long long x) {} // void foo/*_i*/(float x) {} // void foo/*_j*/(double x) {} diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTConstructorChainInitializer.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTConstructorChainInitializer.java index c6a267435f9..c2c42818266 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTConstructorChainInitializer.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTConstructorChainInitializer.java @@ -201,12 +201,15 @@ public class CPPASTConstructorChainInitializer extends ASTNode implements @Deprecated public void setInitializerValue(IASTExpression expression) { assertNotFrozen(); + //CDT_70_FIX_FROM_50-#6 + CPPASTConstructorInitializer ctorInit= new CPPASTConstructorInitializer(); if (expression == null) { - setInitializer(null); + //add an empty initializer, fix test testBug89539 for xlc parser + setInitializer(ctorInit); } else if (expression instanceof IASTInitializer) { setInitializer((IASTInitializer) expression); } else { - CPPASTConstructorInitializer ctorInit= new CPPASTConstructorInitializer(); + ctorInit.setExpression(expression); ctorInit.setOffsetAndLength((ASTNode) expression); setInitializer(ctorInit);