Assembler labels, bug 226121.

3 files changed, 31 insertions, 20 deletions

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 27717a5bedd..ec1785d4e0a 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
@@ -80,24 +80,16 @@ import org.eclipse.cdt.core.parser.ParserMode;
 public abstract class AbstractGNUSourceCodeParser implements ISourceCodeParser {
 
     protected final AbstractParserLogService log;
-
     protected final IScanner scanner;
-
     protected final ParserMode mode;
 
     protected final boolean supportStatementsInExpressions;
-
     protected final boolean supportTypeOfUnaries;
-
     protected final boolean supportAlignOfUnaries;
-
     protected final boolean supportKnRC;
-    
     protected final boolean supportAttributeSpecifiers;
-    
     protected final boolean supportDeclspecSpecifiers;
-
-	protected final IBuiltinBindingsProvider builtinBindingsProvider;
+    protected final IBuiltinBindingsProvider builtinBindingsProvider;
 	
     protected AbstractGNUSourceCodeParser(IScanner scanner,
             IParserLogService logService, ParserMode parserMode,
@@ -1405,12 +1397,19 @@ public abstract class AbstractGNUSourceCodeParser implements ISourceCodeParser {
         	consume();
         }
         
-        consume(IToken.tLPAREN);
+        StringBuilder buffer= new StringBuilder();
+        asmExpression(buffer);
+        int lastOffset = consume(IToken.tSEMI).getEndOffset();
+
+        return buildASMDirective(first.getOffset(), buffer.toString(), lastOffset);
+    }
+
+	protected IToken asmExpression(StringBuilder content) throws EndOfFileException, BacktrackException {
+		IToken t= consume(IToken.tLPAREN);
     	boolean needspace= false;
-		StringBuffer buffer= new StringBuffer();
         int open= 1;
         while (open > 0) {
-        	IToken t= consume();
+        	t= consume();
 			switch(t.getType()) {
 			case IToken.tLPAREN:
 				open++;
@@ -1422,18 +1421,18 @@ public abstract class AbstractGNUSourceCodeParser implements ISourceCodeParser {
         		throw new EndOfFileException();
         	
         	default:
-        		if (needspace) {
-        			buffer.append(' ');
+        		if (content != null) {
+        			if (needspace) {
+        				content.append(' ');
+        			}
+        			content.append(t.getCharImage());
+        			needspace= true;
         		}
-        		buffer.append(t.getCharImage());
-        		needspace= true;
         		break;
 			}
         }
-        int lastOffset = consume(IToken.tSEMI).getEndOffset();
-
-        return buildASMDirective(first.getOffset(), buffer.toString(), lastOffset);
-    }
+		return t;
+	}
 
     /**
      * @param offset
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/GNUCSourceParser.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/GNUCSourceParser.java
index 6b67e444f57..7746eaf04b2 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/GNUCSourceParser.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/GNUCSourceParser.java
@@ -1936,6 +1936,11 @@ public class GNUCSourceParser extends AbstractGNUSourceCodeParser {
 
         } while (false);
 
+    	if (LT(1) == IToken.t_asm) { // asm labels bug 226121
+    		consume();
+    		finalOffset= asmExpression(null).getEndOffset();
+    	}
+
         // Consume any number of __attribute__ and __declspec tokens after the parameters
         __attribute_decl_seq(supportAttributeSpecifiers, supportDeclspecSpecifiers);
 
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 fd2149b56a4..da094cfe676 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
@@ -3825,6 +3825,13 @@ public class GNUCPPSourceParser extends AbstractGNUSourceCodeParser {
 
         } while (false);
 
+        if (LT(1) == IToken.t_asm) { // asm labels bug 226121
+        	consume();
+            finalOffset= asmExpression(null).getEndOffset();
+        }
+        if(supportAttributeSpecifiers)
+        	__attribute_decl_seq(supportAttributeSpecifiers, false);
+        
         IASTDeclarator d = null;
         if (isFunction) {