revert pull dlang#809

quickfur · Mar 14, 2012 · cd6f78e · cd6f78e
1 parent dc89c64
commit cd6f78e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/src/parse.c b/src/parse.c
@@ -1377,10 +1377,15 @@ Parameters *Parser::parseParameters(int *pvarargs, TemplateParameters **tpl)
                         error("scope cannot be ref or out");
 
                     Token *t;
+#if 1
+                    if (tpl && !stc && token.value == TOKidentifier &&
+                        (t = peek(&token), (t->value == TOKcomma || t->value == TOKrparen)))
+#else
                     if (tpl && token.value == TOKidentifier &&
                         (t = peek(&token), (t->value == TOKcomma ||
                                             t->value == TOKrparen ||
                                             t->value == TOKdotdotdot)))
+#endif
                     {   Identifier *id = Lexer::uniqueId("__T");
                         at = new TypeIdentifier(loc, id);
                         if (!*tpl)

diff --git a/test/runnable/funclit.d b/test/runnable/funclit.d
@@ -491,6 +491,7 @@ void test7650()
 
 void test7705()
 {
+/+
     void foo1(void delegate(ref int ) dg){ int x=10; dg(x); }
     foo1((ref x){ pragma(msg, typeof(x)); assert(x == 10); });
     static assert(!__traits(compiles, foo1((x){}) ));
@@ -500,6 +501,7 @@ void test7705()
 
     void foo3(void delegate(int[]...) dg){ dg(1, 2, 3); }
     foo3((x ...){ pragma(msg, typeof(x)); assert(x == [1,2,3]); });
++/
 }
 
 /***************************************************/