add __parameters to IsExpression

dlang · Jul 1, 2012 · 08811d7 · 08811d7 · yebblies · Jul 2, 2012
1 parent 7307e71
commit 08811d7
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 2 deletions.
diff --git a/src/declaration.h b/src/declaration.h
@@ -88,7 +88,7 @@ enum PURE;
                                          // and used only in backend process, so it's rvalue
 
 #ifdef BUG6652
-#define STCbug6652      0x800000000000LL // 
+#define STCbug6652      0x800000000000LL //
 #endif
 
 struct Match

diff --git a/src/expression.c b/src/expression.c
@@ -5774,6 +5774,7 @@ Expression *IsExp::semantic(Scope *sc)
                 break;
 
             case TOKfunction:
+            case TOKparameters:
             {
                 if (targ->ty != Tfunction)
                     goto Lno;
@@ -5789,7 +5790,9 @@ Expression *IsExp::semantic(Scope *sc)
                 for (size_t i = 0; i < dim; i++)
                 {   Parameter *arg = Parameter::getNth(params, i);
                     assert(arg && arg->type);
-                    args->push(new Parameter(arg->storageClass, arg->type, arg->ident, arg->defaultArg));
+                    args->push(new Parameter(arg->storageClass, arg->type,
+                        (tok2 == TOKparameters) ? arg->ident : NULL,
+                        (tok2 == TOKparameters) ? arg->defaultArg : NULL));
                 }
                 tded = new TypeTuple(args);
                 break;

diff --git a/src/idgen.c b/src/idgen.c
@@ -333,6 +333,7 @@ Msgtable msgtable[] =
     { "derivedMembers" },
     { "isSame" },
     { "compiles" },
+    { "parameters" },
 };
 
 

diff --git a/src/lexer.c b/src/lexer.c
@@ -2912,6 +2912,7 @@ static Keyword keywords[] =
 
     // Added after 1.0
     {   "__argTypes",   TOKargTypes     },
+    {   "__parameters", TOKparameters   },
     {   "ref",          TOKref          },
     {   "macro",        TOKmacro        },
 #if DMDV2

diff --git a/src/lexer.h b/src/lexer.h
@@ -156,6 +156,7 @@ enum TOK
         TOKref,
         TOKmacro,
 #if DMDV2
+        TOKparameters,
         TOKtraits,
         TOKoverloadset,
         TOKpure,

diff --git a/src/parse.c b/src/parse.c
@@ -5423,6 +5423,7 @@ Expression *Parser::parsePrimaryExp()
                          token.value == TOKenum ||
                          token.value == TOKinterface ||
                          token.value == TOKargTypes ||
+                         token.value == TOKparameters ||
 #if DMDV2
                          token.value == TOKconst && peek(&token)->value == TOKrparen ||
                          token.value == TOKinvariant && peek(&token)->value == TOKrparen ||