Fix and Testcase for 197633, syntax error with variadic macro.

core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2Tests.java

@@ -3908,4 +3908,20 @@ public class AST2Tests extends AST2BaseTest {
 		}
 	}
 	
+	//  #define foo(f,...)
+	//	void bar(void){}
+	//	int main(int argc, char **argv) {
+	//	   foo("a", bar);        // ok
+	//	   foo("a", bar, bar);   // ok
+	//	   foo("a", bar());      // Eclipse Syntax error
+	//	   foo("a", bar, bar()); // Eclipse Syntax error
+	//	   foo("a", bar(), bar); // Eclipse Syntax error
+	//     return 0;
+	//  }
+	public void testBug197633_parenthesisInVarargMacros() throws Exception {
+		StringBuffer buffer = getContents(1)[0];
+		final String content = buffer.toString();
+		parse( content, ParserLanguage.CPP); 
+		parse( content, ParserLanguage.C); 
+	}
 }

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner2/BaseScanner.java

@@ -2992,6 +2992,10 @@ abstract class BaseScanner implements IScanner {
             skipOverWhiteSpace();
         }
         --bufferPos[bufferStackPos];
+        // correct argEnd when reaching limit, (bug 179383)
+        if (argEnd==limit) {
+        	argEnd--;
+        }
         return argEnd;
     }
 
@@ -3279,7 +3283,6 @@ abstract class BaseScanner implements IScanner {
         int currarg = 0;
         CharArrayObjectMap argmap = new CharArrayObjectMap(arglist.length);
 
-        boolean insideString = false;
         while (bufferPos[bufferStackPos] < limit) {
             skipOverWhiteSpace();
 
@@ -3311,36 +3314,27 @@ abstract class BaseScanner implements IScanner {
             int argstart = bufferPos[bufferStackPos];
 
             int argend = -1;
-            if ((macro.hasGCCVarArgs() || macro.hasVarArgs())
+            if ((macro.hasGCCVarArgs() || macro.hasVarArgs()) && currarg == macro.getVarArgsPosition()) {
-                    && currarg == macro.getVarArgsPosition()) {
-                --bufferPos[bufferStackPos]; // go back to first char of macro arguments
-
                 // there are varargs and the other parameters have been accounted
                 // for, the rest will replace __VA_ARGS__ or name where
                 // "name..." is the parameter
-                do {
+                for (;;) {
-                    if (buffer[bufferPos[bufferStackPos]] == '"') {
+                	argend= skipOverMacroArg();
-                        if (insideString)
+                    skipOverWhiteSpace();
-                            insideString = false;
+                    // to continue we need at least a comma and another char.
-                        else
+                    if (bufferPos[bufferStackPos]+2 >= limit) { 
-                            insideString = true;
+                    	break;
                     }
-
+                    if (buffer[++bufferPos[bufferStackPos]] == ')') {
-                    if (!insideString
+                    	bufferPos[bufferStackPos]--;
-                            && buffer[bufferPos[bufferStackPos]] == ')') {
+                    	break;
-                        --bufferPos[bufferStackPos];
-                        break;
                     }
-                } while (++bufferPos[bufferStackPos] < limit);
+                    // it's a comma
-                argend = bufferPos[bufferStackPos];
+                    bufferPos[bufferStackPos]++;
+                } 
             } else {
                 argend = skipOverMacroArg();
             }
-
-            // correct argend when reaching limit, (bug 179383)
-            if (argend==limit) {
-            	argend--;
-            }
             
             char[] arg = EMPTY_CHAR_ARRAY;
             int arglen = argend - argstart + 1;