From 8cea6a4915ef087596eb71fcbc7f6d32c57bddb6 Mon Sep 17 00:00:00 2001
From: Norayr Chilingarian <norayr@arnet.am>
Date: Wed, 23 Oct 2013 18:40:35 +0400
Subject: [PATCH] ulmErrors ported.

Former-commit-id: 9f8fefcd1bd2c8eb08d8113de4877d7781eafc25
---
 makefile                  |  1 +
 src/lib/ulm/ulmErrors.Mod | 11 ++++++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/makefile b/makefile
index 6309201d..75a41d7a 100644
--- a/makefile
+++ b/makefile
@@ -161,6 +161,7 @@ stage6:
 	$(VOCSTATIC) -sP ulmSysTypes.Mod
 	$(VOCSTATIC) -sP ulmSys.Mod
 	$(VOCSTATIC) -sP ulmSysConversions.Mod
+	$(VOCSTATIC) -sP ulmErrors.Mod
 
 stage7:
 	#objects := $(wildcard *.o)
diff --git a/src/lib/ulm/ulmErrors.Mod b/src/lib/ulm/ulmErrors.Mod
index c0d8710d..edb1cb6f 100644
--- a/src/lib/ulm/ulmErrors.Mod
+++ b/src/lib/ulm/ulmErrors.Mod
@@ -31,11 +31,12 @@
    ----------------------------------------------------------------------------
 *)
 
-MODULE Errors;
+MODULE ulmErrors;
 
    (* translate events to errors *)
 
-   IMPORT Disciplines, Events, Objects, RelatedEvents, Streams, Strings;
+   IMPORT Disciplines := ulmDisciplines, Events := ulmEvents, Objects := ulmObjects, RelatedEvents := ulmRelatedEvents, Streams := ulmStreams, Strings := ulmStrings,
+   SYS := SYSTEM;
 
    CONST
       (* Kind = (debug, message, warning, error, fatal, bug) *)
@@ -115,7 +116,7 @@ MODULE Errors;
       VAR
 	 writeDiscipline: WriteDiscipline;
    BEGIN
-      IF Disciplines.Seek(event.type, writeDiscId, writeDiscipline) THEN
+      IF Disciplines.Seek(event.type, writeDiscId, SYS.VAL(Disciplines.Discipline, writeDiscipline)) THEN
 	 writeDiscipline.write(s, event);
       ELSE
 	 IF ~Streams.WritePart(s, event.message, 0,
@@ -128,7 +129,7 @@ MODULE Errors;
       VAR
 	 disc: HandlerDiscipline;
    BEGIN
-      IF Disciplines.Seek(event.type, handlerDiscId, disc) &
+      IF Disciplines.Seek(event.type, handlerDiscId, SYS.VAL(Disciplines.Discipline, disc)) &
 	    (disc.kind IN disc.hs.handlerSet) THEN
 	 disc.hs.handler[disc.kind](event, disc.kind);
       END;
@@ -154,4 +155,4 @@ BEGIN
    kindText[error] := "error";
    kindText[fatal] := "fatal";
    kindText[bug] := "bug";
-END Errors.
+END ulmErrors.