enhanced syntax error message handling.

exposed hcl_setsynerr(), hcl_setsynerrbfmt(), hcl_setsynerrufmt().
hid hcl_synerrnum_to_errstr()

moo/lib/err.c

@@ -171,7 +171,7 @@ const moo_ooch_t* moo_errnum_to_errstr (moo_errnum_t errnum)
 }
 
 #if defined(MOO_INCLUDE_COMPILER)
-const moo_ooch_t* moo_synerrnum_to_errstr (moo_synerrnum_t errnum)
+static const moo_ooch_t* synerr_to_errstr (moo_synerrnum_t errnum)
 {
 	static moo_ooch_t e_unknown[] = {'u','n','k','n','o','w','n',' ','e','r','r','o','r','\0'};
 	return (errnum >= 0 && errnum < MOO_COUNTOF(synerrstr))? synerrstr[errnum]: e_unknown;
@@ -346,6 +346,81 @@ void moo_seterrwithsyserr (moo_t* moo, int syserr)
 	}
 }
 
+
+#if defined(MOO_INCLUDE_COMPILER)
+
+void hcl_setsynerrbfmt (moo_t* moo, moo_synerrnum_t num, const moo_ioloc_t* loc, const moo_oocs_t* tgt, const moo_bch_t* msgfmt, ...)
+{
+	if (msgfmt) 
+	{
+		va_list ap;
+		va_start (ap, msgfmt);
+		moo_seterrbfmtv (moo, MOO_ESYNERR, msgfmt, ap);
+		va_end (ap);
+	}
+	else 
+	{
+		moo_seterrbfmt (moo, MOO_ESYNERR, "syntax error - %js", synerr_to_errstr(num));
+	}
+	moo->c->synerr.num = num;
+
+	/* The SCO compiler complains of this ternary operation saying:
+	 *    error: operands have incompatible types: op ":" 
+	 * it seems to complain of type mismatch between *loc and
+	 * moo->c->tok.loc due to 'const' prefixed to loc. */
+	/*moo->c->synerr.loc = loc? *loc: moo->c->tok.loc;*/
+	if (loc)
+		moo->c->synerr.loc = *loc;
+	else
+		moo->c->synerr.loc = moo->c->tok.loc;
+	
+	if (tgt) moo->c->synerr.tgt = *tgt;
+	else 
+	{
+		moo->c->synerr.tgt.ptr = MOO_NULL;
+		moo->c->synerr.tgt.len = 0;
+	}
+}
+
+void hcl_setsynerrufmt (moo_t* moo, moo_synerrnum_t num, const moo_ioloc_t* loc, const moo_oocs_t* tgt, const moo_uch_t* msgfmt, ...)
+{
+	if (msgfmt) 
+	{
+		va_list ap;
+		va_start (ap, msgfmt);
+		moo_seterrufmtv (moo, MOO_ESYNERR, msgfmt, ap);
+		va_end (ap);
+	}
+	else 
+	{
+		moo_seterrbfmt (moo, MOO_ESYNERR, "syntax error - %js", synerr_to_errstr(num));
+	}
+	moo->c->synerr.num = num;
+
+	/* The SCO compiler complains of this ternary operation saying:
+	 *    error: operands have incompatible types: op ":" 
+	 * it seems to complain of type mismatch between *loc and
+	 * moo->c->tok.loc due to 'const' prefixed to loc. */
+	/*moo->c->synerr.loc = loc? *loc: moo->c->tok.loc;*/
+	if (loc)
+		moo->c->synerr.loc = *loc;
+	else
+		moo->c->synerr.loc = moo->c->tok.loc;
+	
+	if (tgt) moo->c->synerr.tgt = *tgt;
+	else 
+	{
+		moo->c->synerr.tgt.ptr = MOO_NULL;
+		moo->c->synerr.tgt.len = 0;
+	}
+}
+
+void hcl_setsynerr (moo_t* moo, moo_synerrnum_t num, const moo_ioloc_t* loc, const moo_oocs_t* tgt)
+{
+	hcl_setsynerrbfmt (moo, num, loc, tgt, MOO_NULL);
+}
+#endif
+
 /* -------------------------------------------------------------------------- 
  * ASSERTION FAILURE HANDLERsemaphore heap full
  * -------------------------------------------------------------------------- */

moo/lib/main.c

@@ -2382,18 +2382,16 @@ int main (int argc, char* argv[])
 					moo_logbfmt (moo, MOO_LOG_STDERR, "%s", xtn->source_path);
 				}
 
-				moo_logbfmt (moo, MOO_LOG_STDERR, "[%zu,%zu] syntax error - %js", synerr.loc.line, synerr.loc.colm, moo_synerrnum_to_errstr(synerr.num));
+				moo_logbfmt (moo, MOO_LOG_STDERR, "[%zu,%zu] %js", 
+					synerr.loc.line, synerr.loc.colm,
+					(moo_geterrmsg(moo) != moo_geterrstr(moo)? moo_geterrmsg(moo): moo_geterrstr(moo))
+				);
 
 				if (synerr.tgt.len > 0)
 				{
 					moo_logbfmt (moo, MOO_LOG_STDERR, " - %.*js", synerr.tgt.len, synerr.tgt.ptr);
 				}
 
-				if (moo_geterrmsg(moo) != moo_geterrstr(moo))
-				{
-					moo_logbfmt (moo, MOO_LOG_STDERR, " - %js", moo_geterrmsg(moo));
-				}
-				
 				moo_logbfmt (moo, MOO_LOG_STDERR, "\n");
 			}
 			else

moo/lib/moo-prv.h

@@ -992,6 +992,34 @@ void moo_seterrufmtv (
 	va_list          ap
 );
 
+
+#if defined(MOO_INCLUDE_COMPILER)
+void hcl_setsynerrbfmt (
+	moo_t*             moo,
+	moo_synerrnum_t    num,
+	const moo_ioloc_t* loc,
+	const moo_oocs_t*  tgt,
+	const moo_bch_t*   msgfmt,
+	...
+);
+
+void hcl_setsynerrufmt (
+	moo_t*             moo,
+	moo_synerrnum_t    num,
+	const moo_ioloc_t* loc,
+	const moo_oocs_t*  tgt,
+	const moo_uch_t*   msgfmt,
+	...
+);
+
+void hcl_setsynerr (
+	moo_t*             moo,
+	moo_synerrnum_t    num,
+	const moo_ioloc_t* loc,
+	const moo_oocs_t*  tgt
+);
+#endif
+
 /* ========================================================================= */
 /* heap.c                                                                    */
 /* ========================================================================= */

moo/lib/moo.h

@@ -2178,9 +2178,6 @@ MOO_EXPORT void moo_getsynerr (
 	moo_synerr_t* synerr
 );
 
-MOO_EXPORT const moo_ooch_t* moo_synerrnum_to_errstr (
-	moo_synerrnum_t errnum
-);
 #endif
 
 #if defined(__cplusplus)