3 files changed, 42 insertions, 29 deletions

diff --git a/compiler.c b/compiler.c
index 1199d82..2cc9244 100644
--- a/compiler.c
+++ b/compiler.c
@@ -172,8 +172,8 @@ uc_compiler_syntax_error(uc_compiler_t *compiler, size_t off, const char *fmt, .
 	uc_source_t *source = uc_compiler_current_source(compiler);
 	uc_stringbuf_t *buf = compiler->parser->error;
 	size_t line = 0, byte = 0, len = 0;
-	char *s, *p, *nl;
 	va_list ap;
+	char *s;
 
 	if (compiler->parser->synchronizing)
 		return;
@@ -195,32 +195,8 @@ uc_compiler_syntax_error(uc_compiler_t *compiler, size_t off, const char *fmt, .
 	va_end(ap);
 
 	ucv_stringbuf_append(buf, "Syntax error: ");
-
-	p = strstr(s, "\nSyntax error: ");
-
-	if (!p) {
-		ucv_stringbuf_addstr(buf, s, len);
-		ucv_stringbuf_append(buf, "\n");
-	}
-	else {
-		ucv_stringbuf_printf(buf, "%.*s\n\n", (int)(p - s), s);
-
-		while (len > 0 && s[len-1] == '\n')
-			s[--len] = 0;
-
-		for (p++, nl = strchr(p, '\n'); p != NULL;
-		     p = nl ? nl + 1 : NULL, nl = p ? strchr(p, '\n') : NULL)
-		{
-			if (!nl)
-				ucv_stringbuf_printf(buf, "  | %s", p);
-			else if (nl != p)
-				ucv_stringbuf_printf(buf, "  | %.*s\n", (int)(nl - p), p);
-			else
-				ucv_stringbuf_append(buf, "  |\n");
-		}
-
-		ucv_stringbuf_append(buf, "\n\n");
-	}
+	ucv_stringbuf_addstr(buf, s, len);
+	ucv_stringbuf_append(buf, "\n");
 
 	free(s);
 
@@ -3413,9 +3389,11 @@ uc_compiler_compile_module(uc_compiler_t *compiler, const char *name, uc_value_t
 			err = NULL;
 			res = uc_compiler_compile_module_source(compiler, source, imports, &err);
 
-			if (!res)
+			if (!res) {
+				uc_error_message_indent(&err);
 				uc_compiler_syntax_error(compiler, compiler->parser->curr.pos,
-					"Unable to compile module '%s':\n%s", source->filename, err);
+					"Unable to compile module '%s':\n\n%s", source->filename, err);
+			}
 
 			free(err);
 		}
diff --git a/include/ucode/lib.h b/include/ucode/lib.h
index 416fea5..0709702 100644
--- a/include/ucode/lib.h
+++ b/include/ucode/lib.h
@@ -33,6 +33,7 @@ uc_cfn_ptr_t uc_stdlib_function(const char *name);
 
 __hidden bool uc_source_context_format(uc_stringbuf_t *buf, uc_source_t *src, size_t off, bool compact);
 __hidden bool uc_error_context_format(uc_stringbuf_t *buf, uc_source_t *src, uc_value_t *stacktrace, size_t off);
+__hidden void uc_error_message_indent(char **msg);
 
 __hidden uc_value_t *uc_require_library(uc_vm_t *vm, uc_value_t *nameval, bool so_only);
 
diff --git a/lib.c b/lib.c
index 4c9ff81..fcdd17b 100644
--- a/lib.c
+++ b/lib.c
@@ -208,6 +208,40 @@ uc_error_context_format(uc_stringbuf_t *buf, uc_source_t *src, uc_value_t *stack
 	return uc_source_context_format(buf, src, off, false);
 }
 
+void
+uc_error_message_indent(char **msg) {
+	uc_stringbuf_t *buf = xprintbuf_new();
+	char *s, *p, *nl;
+	size_t len;
+
+	if (!msg || !*msg)
+		return;
+
+	s = *msg;
+	len = strlen(s);
+
+	while (len > 0 && s[len-1] == '\n')
+		s[--len] = 0;
+
+	for (p = s, nl = strchr(p, '\n'); p != NULL;
+	     p = nl ? nl + 1 : NULL, nl = p ? strchr(p, '\n') : NULL)
+	{
+		if (!nl)
+			ucv_stringbuf_printf(buf, "  | %s", p);
+		else if (nl != p)
+			ucv_stringbuf_printf(buf, "  | %.*s\n", (int)(nl - p), p);
+		else
+			ucv_stringbuf_append(buf, "  |\n");
+	}
+
+	ucv_stringbuf_append(buf, "\n");
+
+	*msg = buf->buf;
+
+	free(buf);
+	free(s);
+}
+
 static char *uc_cast_string(uc_vm_t *vm, uc_value_t **v, bool *freeable) {
 	if (ucv_type(*v) == UC_STRING) {
 		*freeable = false;