diff dmd/parse.c @ 1607:207a8a438dea

Merge DMD r253: refactor: Argument => Parameter --- dmd/arrayop.c | 30 ++++---- dmd/arraytypes.h | 2 +- dmd/class.c | 8 +- dmd/declaration.c | 10 ++-- dmd/declaration.h | 16 ++-- dmd/doc.c | 12 ++-- dmd/dsymbol.c | 4 +- dmd/expression.c | 48 +++++++------- dmd/expression.h | 32 +++++----- dmd/func.c | 78 +++++++++++----------- dmd/init.c | 2 +- dmd/interpret.c | 8 +- dmd/mtype.c | 190 ++++++++++++++++++++++++++-------------------------- dmd/mtype.h | 32 +++++----- dmd/opover.c | 34 +++++----- dmd/parse.c | 40 ++++++------ dmd/parse.h | 2 +- dmd/statement.c | 90 +++++++++++++------------- dmd/statement.h | 14 ++-- dmd/struct.c | 8 +- dmd/template.c | 30 ++++---- gen/functions.cpp | 10 ++-- gen/functions.h | 2 +- gen/tocall.cpp | 10 ++-- gen/typinf.cpp | 6 +- 25 files changed, 359 insertions(+), 359 deletions(-)
author Leandro Lucarella <llucax@gmail.com>
date Wed, 06 Jan 2010 15:18:20 -0300
parents eae495e6ae8d
children c61782a76dff
line wrap: on
line diff
--- a/dmd/parse.c	Wed Jan 06 15:18:19 2010 -0300
+++ b/dmd/parse.c	Wed Jan 06 15:18:20 2010 -0300
@@ -788,7 +788,7 @@
 Dsymbol *Parser::parseCtor()
 {
     CtorDeclaration *f;
-    Arguments *arguments;
+    Parameters *arguments;
     int varargs;
     Loc loc = this->loc;
 
@@ -914,7 +914,7 @@
 NewDeclaration *Parser::parseNew()
 {
     NewDeclaration *f;
-    Arguments *arguments;
+    Parameters *arguments;
     int varargs;
     Loc loc = this->loc;
 
@@ -934,7 +934,7 @@
 DeleteDeclaration *Parser::parseDelete()
 {
     DeleteDeclaration *f;
-    Arguments *arguments;
+    Parameters *arguments;
     int varargs;
     Loc loc = this->loc;
 
@@ -951,9 +951,9 @@
  * Parse parameter list.
  */
 
-Arguments *Parser::parseParameters(int *pvarargs)
+Parameters *Parser::parseParameters(int *pvarargs)
 {
-    Arguments *arguments = new Arguments();
+    Parameters *arguments = new Parameters();
     int varargs = 0;
     int hasdefault = 0;
 
@@ -962,7 +962,7 @@
     {   Type *tb;
 	Identifier *ai = NULL;
 	Type *at;
-	Argument *a;
+	Parameter *a;
 	StorageClass storageClass = 0;
 	Expression *ae;
 
@@ -1021,12 +1021,12 @@
 		    if (storageClass & (STCout | STCref))
 			error("variadic argument cannot be out or ref");
 		    varargs = 2;
-		    a = new Argument(storageClass, at, ai, ae);
+		    a = new Parameter(storageClass, at, ai, ae);
 		    arguments->push(a);
 		    nextToken();
 		    break;
 		}
-		a = new Argument(storageClass, at, ai, ae);
+		a = new Parameter(storageClass, at, ai, ae);
 		arguments->push(a);
 		if (token.value == TOKcomma)
 		{   nextToken();
@@ -1950,7 +1950,7 @@
 	    {	// Handle delegate declaration:
 		//	t delegate(parameter list)
 		//	t function(parameter list)
-		Arguments *arguments;
+		Parameters *arguments;
 		int varargs;
 		enum TOK save = token.value;
 
@@ -2058,7 +2058,7 @@
 	    }
 #endif
 	    case TOKlparen:
-	    {	Arguments *arguments;
+	    {	Parameters *arguments;
 		int varargs;
 
 		if (tpl)
@@ -3009,7 +3009,7 @@
 	case TOKforeach_reverse:
 	{
 	    enum TOK op = token.value;
-	    Arguments *arguments;
+	    Parameters *arguments;
 
 	    Statement *d;
 	    Statement *body;
@@ -3018,7 +3018,7 @@
 	    nextToken();
 	    check(TOKlparen);
 
-	    arguments = new Arguments();
+	    arguments = new Parameters();
 
 	    while (1)
 	    {
@@ -3026,7 +3026,7 @@
 		Identifier *ai = NULL;
 		Type *at;
 		unsigned storageClass;
-		Argument *a;
+		Parameter *a;
 
 		storageClass = STCin;
 		if (token.value == TOKinout || token.value == TOKref)
@@ -3048,7 +3048,7 @@
 		if (!ai)
 		    error("no identifier for declarator %s", at->toChars());
 	      Larg:
-		a = new Argument(storageClass, at, ai, NULL);
+		a = new Parameter(storageClass, at, ai, NULL);
 		arguments->push(a);
 		if (token.value == TOKcomma)
 		{   nextToken();
@@ -3066,7 +3066,7 @@
 	}
 
 	case TOKif:
-	{   Argument *arg = NULL;
+	{   Parameter *arg = NULL;
 	    Expression *condition;
 	    Statement *ifbody;
 	    Statement *elsebody;
@@ -3082,7 +3082,7 @@
 		    Token *t = peek(&token);
 		    if (t->value == TOKassign)
 		    {
-			arg = new Argument(STCin, NULL, token.ident, NULL);
+			arg = new Parameter(STCin, NULL, token.ident, NULL);
 			nextToken();
 			nextToken();
 		    }
@@ -3105,7 +3105,7 @@
 		tb = parseBasicType();
 		at = parseDeclarator(tb, &ai);
 		check(TOKassign);
-		arg = new Argument(STCin, at, ai, NULL);
+		arg = new Parameter(STCin, at, ai, NULL);
 	    }
 
 	    // Check for " ident;"
@@ -3114,7 +3114,7 @@
 		Token *t = peek(&token);
 		if (t->value == TOKcomma || t->value == TOKsemicolon)
 		{
-		    arg = new Argument(STCin, NULL, token.ident, NULL);
+		    arg = new Parameter(STCin, NULL, token.ident, NULL);
 		    nextToken();
 		    nextToken();
 		    if (1 || !global.params.useDeprecated)
@@ -4488,7 +4488,7 @@
 	    /* function type(parameters) { body }
 	     * delegate type(parameters) { body }
 	     */
-	    Arguments *arguments;
+	    Parameters *arguments;
 	    int varargs;
 	    FuncLiteralDeclaration *fd;
 	    Type *t;
@@ -4497,7 +4497,7 @@
 	    {
 		t = NULL;
 		varargs = 0;
-		arguments = new Arguments();
+		arguments = new Parameters();
 	    }
 	    else
 	    {