2
0
Эх сурвалжийг харах

[eval] fix inconsistent error formatting (#6410)

see vshaxe/vshaxe#138
Jens Fischer 8 жил өмнө
parent
commit
c4af0df349

+ 4 - 4
src/macro/eval/evalExceptions.ml

@@ -85,7 +85,7 @@ let format_pos p =
 	Lexer.get_error_pos error_printer p
 
 let uncaught_exception_string v p extra =
-	(Printf.sprintf "%s: Uncaught exception %s%s" (format_pos p) (value_string v) extra)
+	(Printf.sprintf "%s : Uncaught exception %s%s" (format_pos p) (value_string v) extra)
 
 let get_exc_error_message ctx v stack p =
 	let pl = List.map (fun env -> {pfile = rev_hash_s env.env_info.pfile;pmin = env.env_leave_pmin; pmax = env.env_leave_pmax}) stack in
@@ -95,8 +95,8 @@ let get_exc_error_message ctx v stack p =
 		let extra = if ctx.record_stack then "" else "\nNo stack information available, consider compiling with -D eval-stack" in
 		uncaught_exception_string v p extra
 	| _ ->
-		let sstack = String.concat "\n" (List.map (fun p -> Printf.sprintf "%s: Called from here" (format_pos p)) pl) in
-		Printf.sprintf "%s: Uncaught exception %s\n%s" (format_pos p) (value_string v) sstack
+		let sstack = String.concat "\n" (List.map (fun p -> Printf.sprintf "%s : Called from here" (format_pos p)) pl) in
+		Printf.sprintf "%s : Uncaught exception %s\n%s" (format_pos p) (value_string v) sstack
 
 let build_exception_stack ctx environment_offset =
 	let eval = get_eval ctx in
@@ -146,4 +146,4 @@ let catch_exceptions ctx ?(final=(fun() -> ())) f p =
 		final();
 		raise exc
 	in
-	r
+	r