Browse Source

Fixed lambda parameter commas.

newNRvisualizers
Mike Krüger 15 years ago
parent
commit
84135f5421
  1. 6
      ICSharpCode.NRefactory.CSharp/Parser/CSharpParser.cs
  2. 473
      ICSharpCode.NRefactory.CSharp/Parser/mcs/cs-parser.cs
  3. 5
      ICSharpCode.NRefactory.CSharp/Parser/mcs/cs-parser.jay

6
ICSharpCode.NRefactory.CSharp/Parser/CSharpParser.cs

@ -2249,9 +2249,6 @@ namespace ICSharpCode.NRefactory.CSharp @@ -2249,9 +2249,6 @@ namespace ICSharpCode.NRefactory.CSharp
var paramLocation = LocationsBag.GetLocations (parameters);
for (int i = 0; i < parameters.Count; i++) {
if (paramLocation != null && i > 0 && i - 1 < paramLocation.Count) {
parent.AddChild (new CSharpTokenNode (Convert (paramLocation [i - 1]), 1), ParameterDeclaration.Roles.Comma);
}
var p = (Parameter)parameters.FixedParameters [i];
var location = LocationsBag.GetLocations (p);
ParameterDeclaration parameterDeclarationExpression = new ParameterDeclaration ();
@ -2291,6 +2288,9 @@ namespace ICSharpCode.NRefactory.CSharp @@ -2291,6 +2288,9 @@ namespace ICSharpCode.NRefactory.CSharp
parameterDeclarationExpression.AddChild ((Expression)p.DefaultValue.Accept (this), ParameterDeclaration.Roles.Expression);
}
parent.AddChild (parameterDeclarationExpression, InvocationExpression.Roles.Parameter);
if (paramLocation != null && i < paramLocation.Count) {
parent.AddChild (new CSharpTokenNode (Convert (paramLocation [i]), 1), ParameterDeclaration.Roles.Comma);
}
}
}

473
ICSharpCode.NRefactory.CSharp/Parser/mcs/cs-parser.cs

File diff suppressed because it is too large Load Diff

5
ICSharpCode.NRefactory.CSharp/Parser/mcs/cs-parser.jay

@ -4166,7 +4166,7 @@ lambda_parameter_list @@ -4166,7 +4166,7 @@ lambda_parameter_list
{
var pars = new List<Parameter> (4);
pars.Add ((Parameter) $1);
parameterListCommas.Clear ();
$$ = pars;
}
| lambda_parameter_list COMMA lambda_parameter
@ -4178,7 +4178,7 @@ lambda_parameter_list @@ -4178,7 +4178,7 @@ lambda_parameter_list
}
pars.Add (p);
lbag.AppendTo (pars, GetLocation ($2));
parameterListCommas.Add (GetLocation ($2));
$$ = pars;
}
@ -4209,6 +4209,7 @@ opt_lambda_parameter_list @@ -4209,6 +4209,7 @@ opt_lambda_parameter_list
| lambda_parameter_list {
var pars_list = (List<Parameter>) $1;
$$ = new ParametersCompiled (pars_list.ToArray ());
lbag.AddLocation ($$, parameterListCommas);
}
;

Loading…
Cancel
Save