From 36d26c19e8086024572afd8067dd2b50ed9e6c12 Mon Sep 17 00:00:00 2001 From: Sergey Prigogin Date: Wed, 30 Dec 2015 09:50:51 -0800 Subject: [PATCH] Revert "Bug 84144 [Parser2] GCC: labels as values" This reverts commit 6e7a509f9b7325ee070c47754cae46de91fa9c5b. Change-Id: I7efcd8ac5d4c4507e827faed6072d6a314dc0b25 --- .../cdt/core/parser/tests/ast2/AST2Tests.java | 14 +------------- .../dom/parser/AbstractGNUSourceCodeParser.java | 2 +- 2 files changed, 2 insertions(+), 14 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 ef4211a2ee3..2a7a50676ec 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 @@ -7515,19 +7515,7 @@ public class AST2Tests extends AST2TestBase { public void testExpressionLabelReference_84144() throws Exception { parseAndCheckBindings(true); } - - // void f() - // { - // unsigned long long labelPtr; - // labelPtr = (unsigned long long) &&L; - // goto *labelPtr; - // L: - // return; - // } - public void testExpressionLabelReferenceCast_84144() throws Exception { - parseAndCheckBindings(true); - } - + // int version = 0; // int NextVersion() { // return __atomic_add_fetch(&version, 1, 5); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/AbstractGNUSourceCodeParser.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/AbstractGNUSourceCodeParser.java index cadc42c0b71..718482429ff 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/AbstractGNUSourceCodeParser.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/AbstractGNUSourceCodeParser.java @@ -13,7 +13,6 @@ * Sergey Prigogin (Google) * Thomas Corbat (IFS) * Anders Dahlberg (Ericsson) - bug 84144 - * Justin You (Synopsys) - bug 84144 * Alexander Nyßen (itemis AG) - bug 475908 *******************************************************************************/ package org.eclipse.cdt.internal.core.dom.parser; @@ -2568,6 +2567,7 @@ public abstract class AbstractGNUSourceCodeParser implements ISourceCodeParser { skipBrackets(IToken.tLPAREN, IToken.tRPAREN, IToken.tSEMI); switch (LTcatchEOF(1)) { case IToken.tAMPERASSIGN: + case IToken.tAND: case IToken.tARROW: case IToken.tARROWSTAR: case IToken.tASSIGN: