From dd099d8ba42f2190d808f5a1997791754f9f6c63 Mon Sep 17 00:00:00 2001
From: "Frank B. Brokken" <f.b.brokken@rug.nl>
Date: Sun, 3 Dec 2017 10:24:28 +0100
Subject: [PATCH] added missing section about error_category to the adv. templ.
 chapter

---
 annotations/yo/advancedtemplates.yo                |  2 +-
 annotations/yo/advancedtemplates/errorcategory.yo  |  2 +-
 annotations/yo/advancedtemplates/errorcondition.yo |  6 +++---
 annotations/yo/cplusplus.yo                        | 12 ------------
 annotations/yo/exceptions.yo                       |  1 -
 5 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/annotations/yo/advancedtemplates.yo b/annotations/yo/advancedtemplates.yo
index 0b565efa..dd555518 100644
--- a/annotations/yo/advancedtemplates.yo
+++ b/annotations/yo/advancedtemplates.yo
@@ -1,3 +1,4 @@
+
 includefile(advancedtemplates/intro)
 
 lsect(SUBTLE)(Subtleties)
@@ -149,4 +150,3 @@ includefile(advancedtemplates/expressiontemplates)
 
     subsect(The BasicType trait class and ordering classes)
     includefile(advancedtemplates/basictype)
-
diff --git a/annotations/yo/advancedtemplates/errorcategory.yo b/annotations/yo/advancedtemplates/errorcategory.yo
index 45ebe809..391ef216 100644
--- a/annotations/yo/advancedtemplates/errorcategory.yo
+++ b/annotations/yo/advancedtemplates/errorcategory.yo
@@ -121,7 +121,7 @@ category class we take the following steps:
 tt(std::error_code) we can use it in our programs. Here is a little demo
 program illustrating its use:
 
-    verbinsert(-as4 examples/errcode/part/main.cc;
+    verbinsert(-as4 examples/errcode/part/main.cc)
     
 In the next section defining and using error conditions is covered in detail.
 
diff --git a/annotations/yo/advancedtemplates/errorcondition.yo b/annotations/yo/advancedtemplates/errorcondition.yo
index 0aa2bc26..cd62f035 100644
--- a/annotations/yo/advancedtemplates/errorcondition.yo
+++ b/annotations/yo/advancedtemplates/errorcondition.yo
@@ -4,7 +4,7 @@ related to its on-board calculator. If we're using facilities provided by
 libraries then several more enums might also be available that we could use in
 our simulator. E.g., there could be a data base of airport approach charts,
 defining an tt(ApproachChartError) enum, and the simulator's GPS might come
-with its own tt(GPGError) enum.
+with its own tt(GPSError) enum.
 
 Errors can usually be categorized. In our simulator we might recognize user
 input errors, unavailable requests, system failures, etc..
@@ -50,8 +50,8 @@ new error conditions to the current set. Here is its interface:
 
 The members tt(name) and tt(message) have trivial implementations.  The member
 tt(equivalent) receives an tt(error_code) object and an error condition enum
-value (as an tt(int)). The function must return tt(true) if the provided
-tt(error_code) is associated with the provided error condition enum
+value (as an tt(int)). The function must return tt(true) if its
+tt(error_code) is associated with the received error condition enum
 value. tt(Equivalent) itself doesn't perform those checks. Rather, it
 retrieves the tt(error_code's error_category) and uses that object's
 tt(equivalent) function to perform the test:
diff --git a/annotations/yo/cplusplus.yo b/annotations/yo/cplusplus.yo
index 3a62822f..c532f943 100644
--- a/annotations/yo/cplusplus.yo
+++ b/annotations/yo/cplusplus.yo
@@ -36,8 +36,6 @@ IFDEF(latex)(latexcommand(
 \pagestyle{headings}
 \pagenumbering{arabic}))()
 
-COMMENT(
-
 COMMENT( 1 )
 lchapter(Overview)(Overview Of The Chapters)
 includefile(overview)
@@ -74,14 +72,10 @@ COMMENT( 9 )
 lchapter(MEMORY)(Classes And Memory Allocation)
 includefile(memory)
 
-END)
-
 COMMENT( 10 )
 lchapter(EXCEPTIONS)(Exceptions)
 includefile(exceptions)
 
-COMMENT(
-
 COMMENT( 11 )
 lchapter(OVERLOADING)(More Operator Overloading)
 includefile(overloading)
@@ -130,19 +124,13 @@ COMMENT( 22 )
 lchapter(TEMPCLASS)(Class Templates)
 includefile(classtemplates)
 
-END)
-
 COMMENT( 23 )
 lchapter(ADVANCEDTEMPL)(Advanced Template Use)
 includefile(advancedtemplates)
 
-COMMENT(
-
 COMMENT( 24 )
 lchapter(CONCRETE)(Concrete Examples)
 includefile(concrete)
 
-END)
-
 IFDEF(latex)(latexcommand(\printindex))()
 
diff --git a/annotations/yo/exceptions.yo b/annotations/yo/exceptions.yo
index 0f6cc780..678e9a96 100644
--- a/annotations/yo/exceptions.yo
+++ b/annotations/yo/exceptions.yo
@@ -75,4 +75,3 @@ includefile(exceptions/function)
 
 lsect(CONSEXCEPTIONS)(Exceptions in constructors and destructors)
 includefile(exceptions/constructors)
-