Command line parsing changes

mosa · Sep 13, 2017 · 06ae922 · 06ae922
1 parent a526363
commit 06ae922
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 22 deletions.
diff --git a/Source/Mosa.Tool.GDBDebugger/MainForm.cs b/Source/Mosa.Tool.GDBDebugger/MainForm.cs
@@ -416,19 +416,12 @@ public void OnRemoveWatch(Object sender, EventArgs e)
 
 		public void LoadArguments(string[] args)
 		{
-			Options = ParseOptions(args);
-		}
-
-		private static Options ParseOptions(string[] args)
-		{
-			ParserResult<Options> result = new Parser(config => config.HelpWriter = Console.Out).ParseArguments<Options>(args);
+			Parser cliParser = new Parser(config => config.HelpWriter = Console.Out);
 
-			if (result.Tag == ParserResultType.NotParsed)
+			cliParser.ParseArguments<Options>(() =>
 			{
-				return new Options();
-			}
-
-			return ((Parsed<Options>)result).Value;
+				return Options;
+			}, args);
 		}
 	}
 }
diff --git a/Source/Mosa.Tool.Launcher/MainForm.cs b/Source/Mosa.Tool.Launcher/MainForm.cs
@@ -521,19 +521,12 @@ private void benRemoveFiles_Click(object sender, EventArgs e)
 
 		public void LoadArguments(string[] args)
 		{
-			Options = ParseOptions(args);
-		}
-
-		private static Options ParseOptions(string[] args)
-		{
-			ParserResult<Options> result = new Parser(config => config.HelpWriter = Console.Out).ParseArguments<Options>(args);
+			Parser cliParser = new Parser(config => config.HelpWriter = Console.Out);
 
-			if (result.Tag == ParserResultType.NotParsed)
+			cliParser.ParseArguments<Options>(() => 
 			{
-				return new Options();
-			}
-
-			return ((Parsed<Options>)result).Value;
+				return Options;
+			}, args);
 		}
 	}
 }