Merge pull request #272 from IntelliTect/Chapter11Regions

BenjaminMichaelis · web-flow · commit d32310c0011c · 2022-05-12T16:39:13.000-07:00
Add regions to chapter 11
diff --git a/src/Chapter11/Listing11.01.ThrowingAnException.cs b/src/Chapter11/Listing11.01.ThrowingAnException.cs
@@ -2,6 +2,7 @@
 {
     using System;
 
+    #region INCLUDE
     public sealed class TextNumberParser
     {
         public static int Parse(string textDigit)
@@ -10,34 +11,34 @@ public static int Parse(string textDigit)
                 { "zero", "one", "two", "three", "four", 
                   "five", "six", "seven", "eight", "nine" };
 
-#if !PRECSHARP7
             int result = Array.IndexOf(
                 digitTexts,
                 // Leveraging C# 2.0’s null-coalescing operator
                 (textDigit ??
                   // Leveraging C# 7.0’s throw expression
                   throw new ArgumentNullException(nameof(textDigit))
                 ).ToLower());
-
-#else
-            if(textDigit == null) throw new ArgumentNullException(nameof(textDigit))
-            int result = Array.IndexOf(
-                digitTexts, textDigit?.ToLower());
-#endif
+            #region EXCLUDE
+            // If running with pre C# 7.0, you will have to use this
+            // if (textDigit == null) throw new ArgumentNullException(nameof(textDigit));
+            // int result = Array.IndexOf(
+            //     digitTexts, textDigit?.ToLower());
+            #endregion EXCLUDE
 
             if (result < 0)
             {
-#if !PRECSHARP6
+                // Leveraging C# 6.0's nameof operator
                 throw new ArgumentException(
                     "The argument did not represent a digit", nameof(textDigit));
-#else
-                throw new ArgumentException(
-                    "The argument did not represent a digit",
-                    "textDigit");
-#endif
+                #region EXCLUDE
+                // If pre C# 6.0 will have to use this because the nameof operator doesn't exist yet
+                // throw new ArgumentException(
+                //     "The argument did not represent a digit",
+                //     "textDigit");
+                #endregion EXCLUDE
             }
-
             return result;
         }
     }
+    #endregion INCLUDE
 }
diff --git a/src/Chapter11/Listing11.02.CatchingDifferentExceptionTypes.cs b/src/Chapter11/Listing11.02.CatchingDifferentExceptionTypes.cs
@@ -1,19 +1,21 @@
 ﻿namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter11.Listing11_02
 {
 #pragma warning disable 0168 // Disabled warning for unused variables for elucidation
-    using System;
     using System.ComponentModel;
+    #region INCLUDE
+    using System;
 
     public sealed class Program
     {
         public static void Main(string[] args)
         {
             try
             {
+                #region EXCLUDE
                 //throw new Win32Exception(42);
                 // ...
                 //TextNumberParser.Parse("negative forty-two");
-                // ...
+                #endregion EXCLUDE
                 throw new InvalidOperationException(
                     "Arbitrary exception");
                 // ...
@@ -30,7 +32,13 @@ public static void Main(string[] args)
             }
             catch(InvalidOperationException exception)
             {
+                bool exceptionHandled = false;
                 // Handle InvalidOperationException
+                // ...
+                if(!exceptionHandled)
+                {
+                    throw;
+                }
             }
             catch(Exception exception)
             {
@@ -43,4 +51,5 @@ public static void Main(string[] args)
             }
         }
     }
+    #endregion INCLUDE
 }
diff --git a/src/Chapter11/Listing11.03.UsingExceptionDispatchInfoToRethrowException.cs b/src/Chapter11/Listing11.03.UsingExceptionDispatchInfoToRethrowException.cs
@@ -1,13 +1,13 @@
 ﻿namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter11.Listing11_03
 {
-#pragma warning disable 0168 // Disabled warning for unused variables for elucidation
+    #region INCLUDE
     using System;
-    using System.IO;
-    using System.Linq;
-    using System.Net;
     using System.Runtime.ExceptionServices;
     using System.Threading.Tasks;
-
+    using System.Net;
+    using System.Linq;
+    using System.IO;
+    #region EXCLUDE
     public sealed class Program
     {
         public static void Main(string[] args)
@@ -19,6 +19,7 @@ public static void Main(string[] args)
             }
 
             Console.Write(url);
+    #endregion EXCLUDE
             Task task = WriteWebRequestSizeAsync(url);
             try
             {
@@ -30,10 +31,12 @@ public static void Main(string[] args)
             catch (AggregateException exception)
             {
                 exception = exception.Flatten();
+                #region HIGHLIGHT
                 ExceptionDispatchInfo.Capture(
                     exception.InnerException??exception).Throw();
+                #endregion HIGHLIGHT
             }
-
+    #endregion INCLUDE
         }
 
 
diff --git a/src/Chapter11/Listing11.04.CreatingCustomException.cs b/src/Chapter11/Listing11.04.CreatingCustomException.cs
@@ -3,7 +3,7 @@
 
 namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter11.Listing11_04
 {
-
+    #region INCLUDE
     class DatabaseException : Exception
     {
         public DatabaseException(
@@ -39,7 +39,7 @@ public DatabaseException(
         {
             // ...
         }
-
+        #region EXCLUDE
         // Used for deserialization of exceptions
         public DatabaseException(
             SerializationInfo serializationInfo,
@@ -48,7 +48,9 @@ public DatabaseException(
         {
             //...
         }
+        #endregion EXCLUDE
     }
+    #endregion INCLUDE
 
     // Create mock versions of the database exception classes rather
     // than referencing the real libraries.
diff --git a/src/Chapter11/Listing11.05.DefiningASerializableException.cs b/src/Chapter11/Listing11.05.DefiningASerializableException.cs
@@ -3,9 +3,14 @@
 
 namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter11.Listing11_05
 {
-
+    #region INCLUDE
+    // Supporting serialization via an attribute
+    #region HIGHLIGHT
+    [Serializable]
+    #endregion HIGHLIGHT
     class DatabaseException : Exception
     {
+        #region EXCLUDE
         public DatabaseException(
             string? message,
             System.Data.SqlClient.SQLException? exception)
@@ -39,16 +44,20 @@ public DatabaseException(
         {
             // ...
         }
+        #endregion EXCLUDE
 
        // Used for deserialization of exceptions
        public DatabaseException(
+        #region HIGHLIGHT
            SerializationInfo serializationInfo,
            StreamingContext context)
            : base(serializationInfo, context)
-       {
-           //...
-       }
+        #endregion HIGHLIGHT
+        {
+            //...
+        }
     }
+    #endregion INCLUDE
 
     // Create mock versions of the database exception classes rather
     // than referencing the real libraries.
diff --git a/src/Chapter11/Listing11.06.OverflowingAnIntegerValue.cs b/src/Chapter11/Listing11.06.OverflowingAnIntegerValue.cs
@@ -1,14 +1,16 @@
 namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter11.Listing11_06
 {
+    #region INCLUDE
+    using System;
     public class Program
     {
         public static void Main()
         {
             // int.MaxValue equals 2147483647
             int n = int.MaxValue;
             n = n + 1;
-            System.Console.WriteLine(n);
+            Console.WriteLine(n);
         }
     }
-
+    #endregion INCLUDE
 }
diff --git a/src/Chapter11/Listing11.07.ACheckedBlockExample.cs b/src/Chapter11/Listing11.07.ACheckedBlockExample.cs
@@ -1,16 +1,23 @@
 namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter11.Listing11_07
 {
+    #region INCLUDE
+    using System;
     public class Program
     {
         public static void Main()
         {
+            #region HIGHLIGHT
             checked
             {
+            #endregion HIGHLIGHT
                 // int.MaxValue equals 2147483647
                 int n = int.MaxValue;
                 n = n + 1;
-                System.Console.WriteLine(n);
+                Console.WriteLine(n);
+            #region HIGHLIGHT
             }
+            #endregion HIGHLIGHT
         }
     }
+    #endregion INCLUDE
 }
diff --git a/src/Chapter11/Listing11.08.AnUnCheckedBlockExample.cs b/src/Chapter11/Listing11.08.AnUnCheckedBlockExample.cs
@@ -1,16 +1,23 @@
 namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter11.Listing11_08
 {
+    #region INCLUDE
+    using System;
     public class Program
     {
         public static void Main()
         {
+            #region HIGHLIGHT
             unchecked
             {
+            #endregion HIGHLIGHT
                 // int.MaxValue equals 2147483647
                 int n = int.MaxValue;
                 n = n + 1;
-                System.Console.WriteLine(n);
+                Console.WriteLine(n);
+            #region HIGHLIGHT
             }
+            #endregion HIGHLIGHT
         }
     }
+    #endregion INCLUDE
 }

Original file line number	Diff line number	Diff line change
`@@ -1,19 +1,21 @@`
`1`	`1`	`namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter11.Listing11_02`
`2`	`2`	`{`
`3`	`3`	`#pragma warning disable 0168 // Disabled warning for unused variables for elucidation`
`4`		`- using System;`
`5`	`4`	`using System.ComponentModel;`
	`5`	`+ #region INCLUDE`
	`6`	`+ using System;`
`6`	`7`
`7`	`8`	`public sealed class Program`
`8`	`9`	`{`
`9`	`10`	`public static void Main(string[] args)`
`10`	`11`	`{`
`11`	`12`	`try`
`12`	`13`	`{`
	`14`	`+ #region EXCLUDE`
`13`	`15`	`//throw new Win32Exception(42);`
`14`	`16`	`// ...`
`15`	`17`	`//TextNumberParser.Parse("negative forty-two");`
`16`		`- // ...`
	`18`	`+ #endregion EXCLUDE`
`17`	`19`	`throw new InvalidOperationException(`
`18`	`20`	`"Arbitrary exception");`
`19`	`21`	`// ...`
`@@ -30,7 +32,13 @@ public static void Main(string[] args)`
`30`	`32`	`}`
`31`	`33`	`catch(InvalidOperationException exception)`
`32`	`34`	`{`
	`35`	`+ bool exceptionHandled = false;`
`33`	`36`	`// Handle InvalidOperationException`
	`37`	`+ // ...`
	`38`	`+ if(!exceptionHandled)`
	`39`	`+ {`
	`40`	`+ throw;`
	`41`	`+ }`
`34`	`42`	`}`
`35`	`43`	`catch(Exception exception)`
`36`	`44`	`{`
`@@ -43,4 +51,5 @@ public static void Main(string[] args)`
`43`	`51`	`}`
`44`	`52`	`}`
`45`	`53`	`}`
	`54`	`+ #endregion INCLUDE`
`46`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,13 @@`
`1`	`1`	`namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter11.Listing11_03`
`2`	`2`	`{`
`3`		`-#pragma warning disable 0168 // Disabled warning for unused variables for elucidation`
	`3`	`+ #region INCLUDE`
`4`	`4`	`using System;`
`5`		`- using System.IO;`
`6`		`- using System.Linq;`
`7`		`- using System.Net;`
`8`	`5`	`using System.Runtime.ExceptionServices;`
`9`	`6`	`using System.Threading.Tasks;`
`10`		`-`
	`7`	`+ using System.Net;`
	`8`	`+ using System.Linq;`
	`9`	`+ using System.IO;`
	`10`	`+ #region EXCLUDE`
`11`	`11`	`public sealed class Program`
`12`	`12`	`{`
`13`	`13`	`public static void Main(string[] args)`
`@@ -19,6 +19,7 @@ public static void Main(string[] args)`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`Console.Write(url);`
	`22`	`+ #endregion EXCLUDE`
`22`	`23`	`Task task = WriteWebRequestSizeAsync(url);`
`23`	`24`	`try`
`24`	`25`	`{`
`@@ -30,10 +31,12 @@ public static void Main(string[] args)`
`30`	`31`	`catch (AggregateException exception)`
`31`	`32`	`{`
`32`	`33`	`exception = exception.Flatten();`
	`34`	`+ #region HIGHLIGHT`
`33`	`35`	`ExceptionDispatchInfo.Capture(`
`34`	`36`	`exception.InnerException??exception).Throw();`
	`37`	`+ #endregion HIGHLIGHT`
`35`	`38`	`}`
`36`		`-`
	`39`	`+ #endregion INCLUDE`
`37`	`40`	`}`
`38`	`41`
`39`	`42`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`
`4`	`4`	`namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter11.Listing11_04`
`5`	`5`	`{`
`6`		`-`
	`6`	`+ #region INCLUDE`
`7`	`7`	`class DatabaseException : Exception`
`8`	`8`	`{`
`9`	`9`	`public DatabaseException(`
`@@ -39,7 +39,7 @@ public DatabaseException(`
`39`	`39`	`{`
`40`	`40`	`// ...`
`41`	`41`	`}`
`42`		`-`
	`42`	`+ #region EXCLUDE`
`43`	`43`	`// Used for deserialization of exceptions`
`44`	`44`	`public DatabaseException(`
`45`	`45`	`SerializationInfo serializationInfo,`
`@@ -48,7 +48,9 @@ public DatabaseException(`
`48`	`48`	`{`
`49`	`49`	`//...`
`50`	`50`	`}`
	`51`	`+ #endregion EXCLUDE`
`51`	`52`	`}`
	`53`	`+ #endregion INCLUDE`
`52`	`54`
`53`	`55`	`// Create mock versions of the database exception classes rather`
`54`	`56`	`// than referencing the real libraries.`
Original file line number	Diff line number	Diff line change
`@@ -1,14 +1,16 @@`
`1`	`1`	`namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter11.Listing11_06`
`2`	`2`	`{`
	`3`	`+ #region INCLUDE`
	`4`	`+ using System;`
`3`	`5`	`public class Program`
`4`	`6`	`{`
`5`	`7`	`public static void Main()`
`6`	`8`	`{`
`7`	`9`	`// int.MaxValue equals 2147483647`
`8`	`10`	`int n = int.MaxValue;`
`9`	`11`	`n = n + 1;`
`10`		`- System.Console.WriteLine(n);`
	`12`	`+ Console.WriteLine(n);`
`11`	`13`	`}`
`12`	`14`	`}`
`13`		`-`
	`15`	`+ #endregion INCLUDE`
`14`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,16 +1,23 @@`
`1`	`1`	`namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter11.Listing11_07`
`2`	`2`	`{`
	`3`	`+ #region INCLUDE`
	`4`	`+ using System;`
`3`	`5`	`public class Program`
`4`	`6`	`{`
`5`	`7`	`public static void Main()`
`6`	`8`	`{`
	`9`	`+ #region HIGHLIGHT`
`7`	`10`	`checked`
`8`	`11`	`{`
	`12`	`+ #endregion HIGHLIGHT`
`9`	`13`	`// int.MaxValue equals 2147483647`
`10`	`14`	`int n = int.MaxValue;`
`11`	`15`	`n = n + 1;`
`12`		`- System.Console.WriteLine(n);`
	`16`	`+ Console.WriteLine(n);`
	`17`	`+ #region HIGHLIGHT`
`13`	`18`	`}`
	`19`	`+ #endregion HIGHLIGHT`
`14`	`20`	`}`
`15`	`21`	`}`
	`22`	`+ #endregion INCLUDE`
`16`	`23`	`}`