@@ -88,7 +88,7 @@ public Parser(Action<ParserSettings> configuration)
88
88
{
89
89
Assumes . NotNull ( configuration , "configuration" , SR . ArgumentNullException_ParserSettingsDelegateCannotBeNull ) ;
90
90
91
- _settings = new ParserSettings ( ) ;
91
+ _settings = new ParserSettings ( ) ;
92
92
configuration . Invoke ( _settings ) ;
93
93
_settings . Consumed = true ;
94
94
}
@@ -193,17 +193,17 @@ public T ParseArguments<T>(string[] args, Action onFail)
193
193
Assumes . NotNull ( args , "args" , SR . ArgumentNullException_ArgsStringArrayCannotBeNull ) ;
194
194
//Assumes.NotNull(options, "options", SR.ArgumentNullException_OptionsInstanceCannotBeNull);
195
195
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
+
207
207
return options ;
208
208
}
209
209
@@ -229,23 +229,23 @@ public T ParseArguments<T>(string[] args, Action<string, object> onVerbCommand,
229
229
//Assumes.NotNull(options, "options", SR.ArgumentNullException_OptionsInstanceCannotBeNull);
230
230
Assumes . NotNull ( onVerbCommand , "onVerbCommand" , SR . ArgumentNullException_OnVerbDelegateCannotBeNull ) ;
231
231
232
- var resultAndOptionsAndVerbInstance = DoParseArgumentsVerbs < T > ( args ) ;
233
-
234
- var result = resultAndOptionsAndVerbInstance . Item1 ;
232
+ var resultAndOptionsAndVerbInstance = DoParseArgumentsVerbs < T > ( args ) ;
233
+
234
+ var result = resultAndOptionsAndVerbInstance . Item1 ;
235
235
var options = resultAndOptionsAndVerbInstance . Item2 ;
236
236
var verbInstance = resultAndOptionsAndVerbInstance . Item3 ;
237
237
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
+
249
249
return options ;
250
250
}
251
251
@@ -277,7 +277,7 @@ private static T SetParserStateIfNeeded<T>(T options, IEnumerable<ParsingError>
277
277
where T : new ( )
278
278
{
279
279
if ( ! options . CanReceiveParserState ( ) )
280
- {
280
+ {
281
281
return options ;
282
282
}
283
283
@@ -313,9 +313,9 @@ private static T SetParserStateIfNeeded<T>(T options, IEnumerable<ParsingError>
313
313
foreach ( var error in errors )
314
314
{
315
315
state . Errors . Add ( error ) ;
316
- }
317
-
318
- return options ;
316
+ }
317
+
318
+ return options ;
319
319
}
320
320
321
321
private static StringComparison GetStringComparison ( ParserSettings settings )
@@ -335,17 +335,17 @@ private Tuple<bool, T> DoParseArguments<T>(string[] args)
335
335
{
336
336
if ( this . TryParseHelp ( args , pair . Right ) )
337
337
{
338
- DisplayHelpText ( options , pair , helpWriter ) ;
338
+ DisplayHelpText ( options , pair , helpWriter ) ;
339
339
return new Tuple < bool , T > ( false , options ) ;
340
340
}
341
341
342
- var optionsAndResult = this . DoParseArgumentsCore ( args , options ) ;
342
+ var optionsAndResult = this . DoParseArgumentsCore ( args , options ) ;
343
343
var result = optionsAndResult . Item1 ;
344
- options = optionsAndResult . Item2 ;
345
-
344
+ options = optionsAndResult . Item2 ;
345
+
346
346
if ( ! result )
347
- {
348
- DisplayHelpText ( options , pair , helpWriter ) ;
347
+ {
348
+ DisplayHelpText ( options , pair , helpWriter ) ;
349
349
return new Tuple < bool , T > ( false , options ) ;
350
350
}
351
351
}
@@ -383,7 +383,7 @@ private Tuple<bool,T> DoParseArgumentsCore<T>(string[] args, T options)
383
383
{
384
384
var result = parser . Parse ( arguments , optionMap , options ) ;
385
385
if ( ( result & PresentParserState . Failure ) == PresentParserState . Failure )
386
- {
386
+ {
387
387
options = SetParserStateIfNeeded ( options , parser . PostParsingState ) ;
388
388
hadError = true ;
389
389
continue ;
@@ -422,15 +422,15 @@ private Tuple<bool, T, object> DoParseArgumentsVerbs<T>(string[] args)
422
422
if ( helpInfo != null || _settings . HelpWriter != null )
423
423
{
424
424
DisplayHelpVerbText ( options , helpInfo , null ) ;
425
- }
426
-
425
+ }
426
+
427
427
return new Tuple < bool , T , object > ( false , options , null ) ;
428
428
}
429
429
430
430
var optionMap = OptionMap . Create ( options , verbs , _settings ) ;
431
431
432
432
if ( TryParseHelpVerb ( args , options , helpInfo , optionMap ) )
433
- {
433
+ {
434
434
return new Tuple < bool , T , object > ( false , options , null ) ;
435
435
}
436
436
@@ -442,8 +442,8 @@ private Tuple<bool, T, object> DoParseArgumentsVerbs<T>(string[] args)
442
442
if ( helpInfo != null )
443
443
{
444
444
DisplayHelpVerbText ( options , helpInfo , null ) ;
445
- }
446
-
445
+ }
446
+
447
447
return new Tuple < bool , T , object > ( false , options , null ) ;
448
448
}
449
449
@@ -454,16 +454,16 @@ private Tuple<bool, T, object> DoParseArgumentsVerbs<T>(string[] args)
454
454
verbInstance = verbOption . CreateInstance ( options ) ;
455
455
}
456
456
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 ;
459
459
verbInstance = resultAndVerbInstance . Item2 ;
460
- //if (verbInstance == null && helpInfo != null)
460
+ //if (verbInstance == null && helpInfo != null)
461
461
if ( ! result && helpInfo != null )
462
462
{
463
463
// Particular verb parsing failed, we try to print its help
464
464
DisplayHelpVerbText ( options , helpInfo , args . First ( ) ) ;
465
- }
466
-
465
+ }
466
+
467
467
return new Tuple < bool , T , object > ( result , options , verbInstance ) ;
468
468
}
469
469
@@ -560,15 +560,15 @@ private void InvokeAutoBuildIfNeeded<T>(T options)
560
560
options ,
561
561
current => HelpText . DefaultParsingErrorsHandler ( options , current ) ,
562
562
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
+ }
572
572
}
573
573
574
574
private void Dispose ( bool disposing )
0 commit comments