Skip to content

Commit 1fddaa9

Browse files
committed
Reverting back line ending.
1 parent cd4f009 commit 1fddaa9

20 files changed

+567
-567
lines changed

src/libcmdline/Parser.cs

Lines changed: 56 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ public Parser(Action<ParserSettings> configuration)
8888
{
8989
Assumes.NotNull(configuration, "configuration", SR.ArgumentNullException_ParserSettingsDelegateCannotBeNull);
9090

91-
_settings = new ParserSettings();
91+
_settings = new ParserSettings();
9292
configuration.Invoke(_settings);
9393
_settings.Consumed = true;
9494
}
@@ -193,17 +193,17 @@ public T ParseArguments<T>(string[] args, Action onFail)
193193
Assumes.NotNull(args, "args", SR.ArgumentNullException_ArgsStringArrayCannotBeNull);
194194
//Assumes.NotNull(options, "options", SR.ArgumentNullException_OptionsInstanceCannotBeNull);
195195

196-
var resultAndOptions = DoParseArguments<T>(args);
197-
var result = resultAndOptions.Item1;
198-
var options = resultAndOptions.Item2;
199-
200-
if (!result)
201-
{
202-
HandleDynamicAutoBuild(options);
203-
204-
onFail();
205-
}
206-
196+
var resultAndOptions = DoParseArguments<T>(args);
197+
var result = resultAndOptions.Item1;
198+
var options = resultAndOptions.Item2;
199+
200+
if (!result)
201+
{
202+
HandleDynamicAutoBuild(options);
203+
204+
onFail();
205+
}
206+
207207
return options;
208208
}
209209

@@ -229,23 +229,23 @@ public T ParseArguments<T>(string[] args, Action<string, object> onVerbCommand,
229229
//Assumes.NotNull(options, "options", SR.ArgumentNullException_OptionsInstanceCannotBeNull);
230230
Assumes.NotNull(onVerbCommand, "onVerbCommand", SR.ArgumentNullException_OnVerbDelegateCannotBeNull);
231231

232-
var resultAndOptionsAndVerbInstance = DoParseArgumentsVerbs<T>(args);
233-
234-
var result = resultAndOptionsAndVerbInstance.Item1;
232+
var resultAndOptionsAndVerbInstance = DoParseArgumentsVerbs<T>(args);
233+
234+
var result = resultAndOptionsAndVerbInstance.Item1;
235235
var options = resultAndOptionsAndVerbInstance.Item2;
236236
var verbInstance = resultAndOptionsAndVerbInstance.Item3;
237237

238-
//TODO: evaluate mutually activation of delegates
239-
240-
onVerbCommand(args.FirstOrDefault() ?? string.Empty, result ? verbInstance : null);
241-
242-
if (!result)
243-
{
244-
HandleDynamicAutoBuild(options);
245-
246-
onFail();
247-
}
248-
238+
//TODO: evaluate mutually activation of delegates
239+
240+
onVerbCommand(args.FirstOrDefault() ?? string.Empty, result ? verbInstance : null);
241+
242+
if (!result)
243+
{
244+
HandleDynamicAutoBuild(options);
245+
246+
onFail();
247+
}
248+
249249
return options;
250250
}
251251

@@ -277,7 +277,7 @@ private static T SetParserStateIfNeeded<T>(T options, IEnumerable<ParsingError>
277277
where T : new()
278278
{
279279
if (!options.CanReceiveParserState())
280-
{
280+
{
281281
return options;
282282
}
283283

@@ -313,9 +313,9 @@ private static T SetParserStateIfNeeded<T>(T options, IEnumerable<ParsingError>
313313
foreach (var error in errors)
314314
{
315315
state.Errors.Add(error);
316-
}
317-
318-
return options;
316+
}
317+
318+
return options;
319319
}
320320

321321
private static StringComparison GetStringComparison(ParserSettings settings)
@@ -335,17 +335,17 @@ private Tuple<bool, T> DoParseArguments<T>(string[] args)
335335
{
336336
if (this.TryParseHelp(args, pair.Right))
337337
{
338-
DisplayHelpText(options, pair, helpWriter);
338+
DisplayHelpText(options, pair, helpWriter);
339339
return new Tuple<bool, T>(false, options);
340340
}
341341

342-
var optionsAndResult= this.DoParseArgumentsCore(args, options);
342+
var optionsAndResult= this.DoParseArgumentsCore(args, options);
343343
var result = optionsAndResult.Item1;
344-
options = optionsAndResult.Item2;
345-
344+
options = optionsAndResult.Item2;
345+
346346
if (!result)
347-
{
348-
DisplayHelpText(options, pair, helpWriter);
347+
{
348+
DisplayHelpText(options, pair, helpWriter);
349349
return new Tuple<bool, T>(false, options);
350350
}
351351
}
@@ -383,7 +383,7 @@ private Tuple<bool,T> DoParseArgumentsCore<T>(string[] args, T options)
383383
{
384384
var result = parser.Parse(arguments, optionMap, options);
385385
if ((result & PresentParserState.Failure) == PresentParserState.Failure)
386-
{
386+
{
387387
options = SetParserStateIfNeeded(options, parser.PostParsingState);
388388
hadError = true;
389389
continue;
@@ -422,15 +422,15 @@ private Tuple<bool, T, object> DoParseArgumentsVerbs<T>(string[] args)
422422
if (helpInfo != null || _settings.HelpWriter != null)
423423
{
424424
DisplayHelpVerbText(options, helpInfo, null);
425-
}
426-
425+
}
426+
427427
return new Tuple<bool, T, object>(false, options, null);
428428
}
429429

430430
var optionMap = OptionMap.Create(options, verbs, _settings);
431431

432432
if (TryParseHelpVerb(args, options, helpInfo, optionMap))
433-
{
433+
{
434434
return new Tuple<bool, T, object>(false, options, null);
435435
}
436436

@@ -442,8 +442,8 @@ private Tuple<bool, T, object> DoParseArgumentsVerbs<T>(string[] args)
442442
if (helpInfo != null)
443443
{
444444
DisplayHelpVerbText(options, helpInfo, null);
445-
}
446-
445+
}
446+
447447
return new Tuple<bool, T, object>(false, options, null);
448448
}
449449

@@ -454,16 +454,16 @@ private Tuple<bool, T, object> DoParseArgumentsVerbs<T>(string[] args)
454454
verbInstance = verbOption.CreateInstance(options);
455455
}
456456

457-
var resultAndVerbInstance = DoParseArgumentsCore(args.Skip(1).ToArray(), verbInstance);
458-
var result = resultAndVerbInstance.Item1;
457+
var resultAndVerbInstance = DoParseArgumentsCore(args.Skip(1).ToArray(), verbInstance);
458+
var result = resultAndVerbInstance.Item1;
459459
verbInstance = resultAndVerbInstance.Item2;
460-
//if (verbInstance == null && helpInfo != null)
460+
//if (verbInstance == null && helpInfo != null)
461461
if (!result && helpInfo != null)
462462
{
463463
// Particular verb parsing failed, we try to print its help
464464
DisplayHelpVerbText(options, helpInfo, args.First());
465-
}
466-
465+
}
466+
467467
return new Tuple<bool, T, object>(result, options, verbInstance);
468468
}
469469

@@ -560,15 +560,15 @@ private void InvokeAutoBuildIfNeeded<T>(T options)
560560
options,
561561
current => HelpText.DefaultParsingErrorsHandler(options, current),
562562
options.HasVerbs()));
563-
}
564-
565-
private void HandleDynamicAutoBuild<T>(T options)
566-
where T : new()
567-
{
568-
if (_settings.DynamicAutoBuild)
569-
{
570-
InvokeAutoBuildIfNeeded(options);
571-
}
563+
}
564+
565+
private void HandleDynamicAutoBuild<T>(T options)
566+
where T : new()
567+
{
568+
if (_settings.DynamicAutoBuild)
569+
{
570+
InvokeAutoBuildIfNeeded(options);
571+
}
572572
}
573573

574574
private void Dispose(bool disposing)

0 commit comments

Comments
 (0)