Skip to content

Proposed cleanup of list 7.32 #443

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 23, 2023
Merged

Proposed cleanup of list 7.32 #443

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e1eabdc
Proposed cleanup of list 7.32
Keboo Jan 26, 2023
0f3cdec
Fixing tests
Keboo May 22, 2023
9e259fd
Merge branch 'v11.0' into chap7Suggestions
Keboo May 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/Chapter07.Tests/Listing07.32.Tests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public void ParseHelpCommand(string command)
{
command = item;
IntelliTect.TestTools.Console.ConsoleAssert.Expect(
"Command Help...", () => Program.Main(command));
"Command Help...", () => Program.Main(new[] { command }));
}
}

Expand All @@ -31,7 +31,7 @@ public void ParseCatCommand(string command, string fileName)
{
command = $"{item}";
IntelliTect.TestTools.Console.ConsoleAssert.Expect(
$"Catalog '{fileName}'...", () => Program.Main(command, fileName));
$"Catalog '{fileName}'...", () => Program.Main(new[] { command, fileName }));
}
}

Expand All @@ -44,7 +44,7 @@ public void ParseCopyCommand(string command, string sourceFile, string targetFil
{
command = $"{item}";
IntelliTect.TestTools.Console.ConsoleAssert.Expect(
$"Copy '{sourceFile}' '{targetFile}'...", () => Program.Main(command, sourceFile, targetFile));
$"Copy '{sourceFile}' '{targetFile}'...", () => Program.Main(new[] { command, sourceFile, targetFile }));
}
}

Expand Down
8 changes: 4 additions & 4 deletions src/Chapter07/Listing07.32.ListPatternMatching.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@ namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter07.Listing07_32;
public class Program
{
#region INCLUDE
public static void Main(params string[] args)
public static void Main(string[] args)
{
// For simplicitly, commands are assumed
// For simplicity, options are assumed
// to all be lower case.

// The first argument is the command and is
// The first argument is the option and is
// identified by a '/', '-', or '--' prefix.

switch (args)
{
case ["--help" or ['/' or '-', 'h' or '?']]:
// e.g. /?, -?, /h, -h, --help
// e.g. --help, /h, -h, /?, -?
DisplayHelp();
break;
case [ ['/' or '-', char command], ..]:
Expand Down