From c2c3b6f52666520f7e09bbc578e3cb4e9b53efc7 Mon Sep 17 00:00:00 2001
From: the-Arioch <the_Arioch@nm.ru>
Date: Wed, 5 Oct 2016 12:21:09 +0300
Subject: [PATCH] Encapsulating error messges into custom exception class.
 Collecting my garbage introduced into the global namespace :-)

---
 XmlLite.pas | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/XmlLite.pas b/XmlLite.pas
index 6839b53..3a39e6a 100644
--- a/XmlLite.pas
+++ b/XmlLite.pas
@@ -217,12 +217,6 @@ interface
   );
 {$WARN BOUNDS_ERROR DEFAULT}
 
-  rErrorDecription = record Code: XmlError; Message: String; end;
-  TXMLLiteKnownErrors = array of rErrorDecription;
-
-var
-  XMLLiteErrorMessages: TXMLLiteKnownErrors; // may be localized by thrid-party units
-
 type
   IXMLReader = interface
     ['{7279FC81-709D-4095-B63D-69FE4B0D9030}']
@@ -384,14 +378,21 @@ function OpenXmlFileStreamWriter(const FileName: string): IStream;
 procedure CheckHR(const HR: HRESULT); inline; deprecated 'Use EXmlLite.Check';
 
 type
+  rErrorDecription = record Code: XmlError; Message: String; end;
+  TXMLLiteKnownErrors = array of rErrorDecription;
+
   EXmlLite = class(Exception)
   private
     FErrCode: Cardinal;
   public
     property ErrorCode: Cardinal read FErrCode; // 0 - unknown
+    constructor CreateForErrCode(const FunctionResult: HRESULT);
+  public
+    Class Var XMLLiteErrorMessages: TXMLLiteKnownErrors; // may be localized by thrid-party units
+    Class Constructor InitMessages;
+
     Class Function Check(const FunctionResult: HRESULT): HResult; inline;
     Class Function IsOK(const FunctionResult: HRESULT): boolean; inline;
-    constructor CreateForErrCode(const FunctionResult: HRESULT);
   end;
 
 implementation
@@ -605,13 +606,12 @@ procedure CheckHR(const HR: HRESULT);
   EXmlLite.Check( HR );
 end;
 
-
-function r(const c: cardinal; m: string): rErrorDecription; inline;
-begin
-  Result.Code := XmlError(c);
-  Result.Message := m;
-end;
-
+class constructor EXmlLite.InitMessages;
+  function r(const c: cardinal; m: string): rErrorDecription; inline;
+  begin
+    Result.Code := XmlError(c);
+    Result.Message := m;
+  end;
 begin
   XMLLiteErrorMessages := TXMLLiteKnownErrors.Create(
     r($C00CEE01, 'unexpected end of input'),
@@ -700,4 +700,6 @@ function r(const c: cardinal; m: string): rErrorDecription; inline;
     r($C00CE01F, 'XML: Invalid Unicode characters'),
     r($C00CE06E, 'XML: Invalid charset encoding')
   );
+end;
+
 end.