X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fgmcs%2Fcs-parser.jay;h=06a28d3720836dc77878610a274d24e38e913586;hb=60e8d68027b115d6b4c1df3e179bb0cd7b5ee171;hp=ffea068381519643ea0a5a37edad81351d6436df;hpb=1fb5ed27a3a1eadd80b69e453e1920476ce2a6fe;p=mono.git

diff --git a/mcs/gmcs/cs-parser.jay b/mcs/gmcs/cs-parser.jay
index ffea0683815..06a28d37208 100644
--- a/mcs/gmcs/cs-parser.jay
+++ b/mcs/gmcs/cs-parser.jay
@@ -1184,7 +1184,7 @@ formal_parameter_list
 		Parameter [] pars = new Parameter [pars_list.Count];
 		pars_list.CopyTo (pars);
 
-	  	$$ = new Parameters (pars, null, lexer.Location); 
+	  	$$ = new Parameters (pars, null); 
 	  } 
 	| fixed_parameters COMMA parameter_array
 	  {
@@ -1193,7 +1193,7 @@ formal_parameter_list
 		Parameter [] pars = new Parameter [pars_list.Count];
 		pars_list.CopyTo (pars);
 
-		$$ = new Parameters (pars, (Parameter) $3, lexer.Location); 
+		$$ = new Parameters (pars, (Parameter) $3); 
 	  }
 	| fixed_parameters COMMA ARGLIST
 	  {
@@ -1202,7 +1202,7 @@ formal_parameter_list
 		Parameter [] pars = new Parameter [pars_list.Count];
 		pars_list.CopyTo (pars);
 
-		$$ = new Parameters (pars, true, lexer.Location);
+		$$ = new Parameters (pars, true);
 	  }
 	| parameter_array COMMA fixed_parameters
 	  {
@@ -1216,11 +1216,11 @@ formal_parameter_list
 	  }
 	| parameter_array 
 	  {
-		$$ = new Parameters (null, (Parameter) $1, lexer.Location);
+		$$ = new Parameters (null, (Parameter) $1);
 	  }
 	| ARGLIST
 	  {
-		$$ = new Parameters (null, true, lexer.Location);
+		$$ = new Parameters (null, true);
 	  }
 	;
 
@@ -1247,7 +1247,7 @@ fixed_parameter
 	  type
 	  IDENTIFIER
 	  {
-		$$ = new Parameter ((Expression) $3, (string) $4, (Parameter.Modifier) $2, (Attributes) $1);
+		$$ = new Parameter ((Expression) $3, (string) $4, (Parameter.Modifier) $2, (Attributes) $1, lexer.Location);
 	  }
 	| opt_attributes
 	  opt_parameter_modifier
@@ -1296,7 +1296,7 @@ parameter_modifier
 parameter_array
 	: opt_attributes PARAMS type IDENTIFIER
 	  { 
-		$$ = new Parameter ((Expression) $3, (string) $4, Parameter.Modifier.PARAMS, (Attributes) $1);
+		$$ = new Parameter ((Expression) $3, (string) $4, Parameter.Modifier.PARAMS, (Attributes) $1, lexer.Location);
 		note ("type must be a single-dimension array type"); 
 	  }
 	| opt_attributes PARAMS parameter_modifier type IDENTIFIER 
@@ -1427,12 +1427,12 @@ set_accessor_declaration
 		Parameter [] args;
 		Parameter implicit_value_parameter = new Parameter (
 			implicit_value_parameter_type, "value", 
-			Parameter.Modifier.NONE, null);
+			Parameter.Modifier.NONE, null, lexer.Location);
 
 		if (parsing_indexer == false) {
 			args  = new Parameter [1];
 			args [0] = implicit_value_parameter;
-			current_local_parameters = new Parameters (args, null, lexer.Location);
+			current_local_parameters = new Parameters (args, null);
 		} else {
 			Parameter [] fpars = indexer_parameters.FixedParameters;
 
@@ -1445,7 +1445,7 @@ set_accessor_declaration
 			} else 
 				args = null;
 			current_local_parameters = new Parameters (
-				args, indexer_parameters.ArrayParameter, lexer.Location);
+				args, indexer_parameters.ArrayParameter);
 		}
 		
 		lexer.PropertyParsing = false;
@@ -1842,13 +1842,13 @@ operator_declaration
 		
 		Parameter [] param_list = new Parameter [decl.arg2type != null ? 2 : 1];
 
-		param_list[0] = new Parameter (decl.arg1type, decl.arg1name, Parameter.Modifier.NONE, null);
+		param_list[0] = new Parameter (decl.arg1type, decl.arg1name, Parameter.Modifier.NONE, null, decl.location);
 		if (decl.arg2type != null)
-			param_list[1] = new Parameter (decl.arg2type, decl.arg2name, Parameter.Modifier.NONE, null);
+			param_list[1] = new Parameter (decl.arg2type, decl.arg2name, Parameter.Modifier.NONE, null, decl.location);
 
 		Operator op = new Operator (
 			current_class, decl.optype, decl.ret_type, (int) $2, 
-			new Parameters (param_list, null, decl.location),
+			new Parameters (param_list, null),
 			(ToplevelBlock) $5, (Attributes) $1, decl.location);
 
 		if (RootContext.Documentation != null) {
@@ -1887,9 +1887,9 @@ operator_declarator
 		Parameter [] pars = new Parameter [1];
 		Expression type = (Expression) $5;
 
-		pars [0] = new Parameter (type, (string) $6, Parameter.Modifier.NONE, null);
+		pars [0] = new Parameter (type, (string) $6, Parameter.Modifier.NONE, null, lexer.Location);
 
-		current_local_parameters = new Parameters (pars, null, lexer.Location);
+		current_local_parameters = new Parameters (pars, null);
 
 		if (RootContext.Documentation != null) {
 			tmpComment = Lexer.consume_doc_comment ();
@@ -1912,10 +1912,10 @@ operator_declarator
 		Expression typeL = (Expression) $5;
 		Expression typeR = (Expression) $8;
 
-	       pars [0] = new Parameter (typeL, (string) $6, Parameter.Modifier.NONE, null);
-	       pars [1] = new Parameter (typeR, (string) $9, Parameter.Modifier.NONE, null);
+	       pars [0] = new Parameter (typeL, (string) $6, Parameter.Modifier.NONE, null, lexer.Location);
+	       pars [1] = new Parameter (typeR, (string) $9, Parameter.Modifier.NONE, null, lexer.Location);
 
-	       current_local_parameters = new Parameters (pars, null, lexer.Location);
+	       current_local_parameters = new Parameters (pars, null);
 
 		if (RootContext.Documentation != null) {
 			tmpComment = Lexer.consume_doc_comment ();
@@ -1978,9 +1978,9 @@ conversion_operator_declarator
 	  {
 		Parameter [] pars = new Parameter [1];
 
-		pars [0] = new Parameter ((Expression) $5, (string) $6, Parameter.Modifier.NONE, null);
+		pars [0] = new Parameter ((Expression) $5, (string) $6, Parameter.Modifier.NONE, null, lexer.Location);
 
-		current_local_parameters = new Parameters (pars, null, lexer.Location);  
+		current_local_parameters = new Parameters (pars, null);  
 		  
 		if (RootContext.Documentation != null) {
 			tmpComment = Lexer.consume_doc_comment ();
@@ -1994,9 +1994,9 @@ conversion_operator_declarator
 	  {
 		Parameter [] pars = new Parameter [1];
 
-		pars [0] = new Parameter ((Expression) $5, (string) $6, Parameter.Modifier.NONE, null);
+		pars [0] = new Parameter ((Expression) $5, (string) $6, Parameter.Modifier.NONE, null, lexer.Location);
 
-		current_local_parameters = new Parameters (pars, null, lexer.Location);  
+		current_local_parameters = new Parameters (pars, null);  
 		  
 		if (RootContext.Documentation != null) {
 			tmpComment = Lexer.consume_doc_comment ();
@@ -2151,7 +2151,7 @@ destructor_declaration
                         
 			Method d = new Destructor (
 				current_class, TypeManager.system_void_expr, m, "Finalize", 
-				new Parameters (null, null, l), (Attributes) $1, l);
+				new Parameters (null, null), (Attributes) $1, l);
 			if (RootContext.Documentation != null)
 				d.DocComment = ConsumeStoredComment ();
 		  
@@ -2261,11 +2261,11 @@ add_accessor_declaration
 		Parameter [] args = new Parameter [1];
 		Parameter implicit_value_parameter = new Parameter (
 			implicit_value_parameter_type, "value", 
-			Parameter.Modifier.NONE, null);
+			Parameter.Modifier.NONE, null, lexer.Location);
 
 		args [0] = implicit_value_parameter;
 		
-		current_local_parameters = new Parameters (args, null, lexer.Location);  
+		current_local_parameters = new Parameters (args, null);  
 		lexer.EventParsing = false;
 	  }
           block
@@ -2289,11 +2289,11 @@ remove_accessor_declaration
 		Parameter [] args = new Parameter [1];
 		Parameter implicit_value_parameter = new Parameter (
 			implicit_value_parameter_type, "value", 
-			Parameter.Modifier.NONE, null);
+			Parameter.Modifier.NONE, null, lexer.Location);
 
 		args [0] = implicit_value_parameter;
 		
-		current_local_parameters = new Parameters (args, null, lexer.Location);  
+		current_local_parameters = new Parameters (args, null);  
 		lexer.EventParsing = false;
 	  }
           block
@@ -3280,7 +3280,7 @@ anonymous_method_signature
 			ArrayList par_list = (ArrayList) $2;
 			Parameter [] pars = new Parameter [par_list.Count];
 			par_list.CopyTo (pars);
-			$$ = new Parameters (pars, null, lexer.Location);
+			$$ = new Parameters (pars, null);
 		}
 	  }
 	;
@@ -3307,7 +3307,7 @@ anonymous_method_parameter_list
 
 anonymous_method_parameter
 	: opt_parameter_modifier type IDENTIFIER {
-		$$ = new Parameter ((Expression) $2, (string) $3, (Parameter.Modifier) $1, null);
+		$$ = new Parameter ((Expression) $2, (string) $3, (Parameter.Modifier) $1, null, lexer.Location);
 	  }
 	| PARAMS type IDENTIFIER {
 		Report.Error (1670, lexer.Location, "params modifier not allowed in anonymous method declaration");