From db70bb0f2964bce706b49852bc6e3787d87c4d0a Mon Sep 17 00:00:00 2001 From: Thomas Corbat Date: Tue, 9 Jul 2013 14:40:50 +0200 Subject: [PATCH] Refactoring: - Merged declaration an initialization of result variable in initializerList, as conditional initialization is executed exactly once, unless a parse exception occurs. - Removed dead code: Conditional return. Change-Id: Ia8c2bcb5f76a56d6b71ad80095a546ebd4f9ac03 --- .../internal/core/dom/parser/cpp/GNUCPPSourceParser.java | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/GNUCPPSourceParser.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/GNUCPPSourceParser.java index 8289a2fceb1..4298ba09e0d 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/GNUCPPSourceParser.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/GNUCPPSourceParser.java @@ -3546,7 +3546,7 @@ public class GNUCPPSourceParser extends AbstractGNUSourceCodeParser { */ private List initializerList(boolean allowSkipping) throws EndOfFileException, BacktrackException { - List result= null; + List result= new ArrayList(); // List of initializer clauses loop: while (true) { // Clause may be null, add to initializer anyways, such that the size can be computed. @@ -3563,9 +3563,6 @@ public class GNUCPPSourceParser extends AbstractGNUSourceCodeParser { clause= setRange(packExpansion, clause, endOffset); } } - if (result == null) { - result= new ArrayList(); - } result.add(clause); if (LT(1) != IToken.tCOMMA) break; @@ -3577,10 +3574,6 @@ public class GNUCPPSourceParser extends AbstractGNUSourceCodeParser { } consume(IToken.tCOMMA); } - - if (result == null) - return Collections.emptyList(); - return result; }