From 6047a2d858a7a4246993f302438aa40ed2acf021 Mon Sep 17 00:00:00 2001
From: hyung-hwan <hyunghwan.chung@gmail.com>
Date: Mon, 3 Jul 2023 00:34:12 +0900
Subject: [PATCH] added hawk_bloc_t and hawk_uloc_t. fixed bugs in
 hawk_geterrbinf() and hawk-geterruinf()

---
 lib/err.c      | 26 ++++++++++++++++++++++----
 lib/hawk-cmn.h | 32 ++++++++++++++++++++++++++------
 2 files changed, 48 insertions(+), 10 deletions(-)

diff --git a/lib/err.c b/lib/err.c
index aa3546d0..5bcf898b 100644
--- a/lib/err.c
+++ b/lib/err.c
@@ -297,10 +297,18 @@ void hawk_gem_geterrbinf (hawk_gem_t* gem, hawk_errbinf_t* errinf)
 	const hawk_ooch_t* msg;
 	hawk_oow_t wcslen, mbslen;
 
-	errinf->num = gem->errnum;
-	errinf->loc = gem->errloc;
-	msg = (gem->errmsg[0] == '\0')? gem->errstr(gem->errnum): gem->errmsg;
+	/*errinf->num = gem->errnum;*/
+	errinf->loc.line = gem->errloc.line;
+	errinf->loc.colm = gem->errloc.colm;
+	if (gem->errloc.file) errinf->loc.file = HAWK_NULL;
+	else
+	{
+		mbslen = HAWK_COUNTOF(gem->xerrlocfile);
+		hawk_conv_ucstr_to_bcstr_with_cmgr(gem->errloc.file, &wcslen, gem->xerrlocfile, &mbslen, gem->cmgr);
+		errinf->loc.file = gem->xerrlocfile; /* this can be truncated and is transient */
+	}
 
+	msg = (gem->errmsg[0] == '\0')? gem->errstr(gem->errnum): gem->errmsg;
 	mbslen = HAWK_COUNTOF(errinf->msg);
 	hawk_conv_ucstr_to_bcstr_with_cmgr (msg, &wcslen, errinf->msg, &mbslen, gem->cmgr);
 #endif
@@ -312,8 +320,18 @@ void hawk_gem_geterruinf (hawk_gem_t* gem, hawk_erruinf_t* errinf)
 	const hawk_ooch_t* msg;
 	hawk_oow_t wcslen, mbslen;
 
-	msg = (gem->errmsg[0] == '\0')? gem->errstr(gem->errnum): gem->errmsg;
+	/*errinf->num = gem->errnum;*/
+	errinf->loc.line = gem->errloc.line;
+	errinf->loc.colm = gem->errloc.colm;
+	if (gem->errloc.file) errinf->loc.file = HAWK_NULL;
+	else
+	{
+		wcslen = HAWK_COUNTOF(gem->xerrlocfile);
+		hawk_conv_bcstr_to_ucstr_with_cmgr(gem->errloc.file, &mbslen, gem->xerrlocfile, &wcslen, gem->cmgr, 1);
+		errinf->loc.file = gem->xerrlocfile; /* this can be truncated and is transient */
+	}
 
+	msg = (gem->errmsg[0] == '\0')? gem->errstr(gem->errnum): gem->errmsg;
 	wcslen = HAWK_COUNTOF(errinf->msg);
 	hawk_conv_bcstr_to_ucstr_with_cmgr (msg, &mbslen, errinf->msg, &wcslen, gem->cmgr, 1);
 #else
diff --git a/lib/hawk-cmn.h b/lib/hawk-cmn.h
index 4614368f..54212c57 100644
--- a/lib/hawk-cmn.h
+++ b/lib/hawk-cmn.h
@@ -1073,15 +1073,33 @@ enum hawk_errnum_t
 typedef enum hawk_errnum_t hawk_errnum_t;
 
 /**
- * The hawk_loc_t type defines a structure to hold location.
+ * The hawk_bloc_t type defines a structure to hold location.
  */
-struct hawk_loc_t
+struct hawk_bloc_t
 {
 	hawk_oow_t line; /**< line */
 	hawk_oow_t colm; /**< column */
-	const hawk_ooch_t* file; /**< file specified in @include */
+	const hawk_bch_t* file; /**< file specified in @include */
 };
-typedef struct hawk_loc_t hawk_loc_t;
+typedef struct hawk_bloc_t hawk_bloc_t;
+
+/**
+ * The hawk_uloc_t type defines a structure to hold location.
+ */
+struct hawk_uloc_t
+{
+	hawk_oow_t line; /**< line */
+	hawk_oow_t colm; /**< column */
+	const hawk_uch_t* file; /**< file specified in @include */
+};
+typedef struct hawk_uloc_t hawk_uloc_t;
+
+#if defined(HAWK_OOCH_IS_BCH)
+typedef hawk_bloc_t hawk_loc_t;
+#else
+typedef hawk_uloc_t hawk_loc_t;
+#endif
+
 
 /**
  * The hawk_errinf_t type defines a placeholder for error information.
@@ -1090,7 +1108,7 @@ struct hawk_errbinf_t
 {
 	hawk_errnum_t num;                   /**< error number */
 	hawk_bch_t    msg[HAWK_ERRMSG_CAPA]; /**< error message */
-	hawk_loc_t    loc;                   /**< error location */
+	hawk_bloc_t   loc;                   /**< error location */
 };
 typedef struct hawk_errbinf_t hawk_errbinf_t;
 
@@ -1098,7 +1116,7 @@ struct hawk_erruinf_t
 {
 	hawk_errnum_t num;                   /**< error number */
 	hawk_uch_t    msg[HAWK_ERRMSG_CAPA]; /**< error message */
-	hawk_loc_t    loc;                   /**< error location */
+	hawk_uloc_t   loc;                   /**< error location */
 };
 typedef struct hawk_erruinf_t hawk_erruinf_t;
 
@@ -1131,8 +1149,10 @@ struct hawk_gem_t
 	hawk_oow_t    errmsg_len; /* it's not the actual length of errmsg. it's kept here for error formatting */
 #if defined(HAWK_OOCH_IS_BCH)
 	hawk_uch_t    xerrmsg[HAWK_ERRMSG_CAPA];
+	hawk_uch_t    xerrlocfile[256];
 #else
 	hawk_bch_t    xerrmsg[HAWK_ERRMSG_CAPA * 2];
+	hawk_bch_t    xerrlocfile[256 * 2];
 #endif
 	hawk_ooch_t   errmsg_backup[HAWK_ERRMSG_CAPA];
 };