Forráskód Böngészése

Namespace message reporting defines

Rudy Ges 2 éve
szülő
commit
5589eba7cb
35 módosított fájl, 71 hozzáadás és 71 törlés
  1. 10 10
      src-json/define.json
  2. 5 5
      src/compiler/messageReporting.ml
  3. 1 1
      src/core/define.ml
  4. 2 2
      tests/misc/java/projects/Issue11095/pretty-fail.hxml
  5. 1 1
      tests/misc/projects/Issue10623/indent-fail.hxml
  6. 2 2
      tests/misc/projects/Issue10623/pretty-fail.hxml
  7. 1 1
      tests/misc/projects/Issue10844/user-defined-meta-indent-fail.hxml
  8. 1 1
      tests/misc/projects/Issue10844/user-defined-meta-json-indent-fail.hxml
  9. 2 2
      tests/misc/projects/Issue10844/user-defined-meta-json-pretty-fail.hxml
  10. 2 2
      tests/misc/projects/Issue10844/user-defined-meta-pretty-fail.hxml
  11. 2 2
      tests/misc/projects/Issue10863/compile.hxml
  12. 2 2
      tests/misc/projects/Issue10863/logmode-fail.hxml
  13. 1 1
      tests/misc/projects/Issue10863/logmode-fail.hxml.stderr
  14. 1 1
      tests/misc/projects/Issue10863/reporting-fail.hxml
  15. 1 1
      tests/misc/projects/Issue10863/reporting-fail.hxml.stderr
  16. 2 2
      tests/misc/projects/Issue11055/compile-pretty-fail.hxml
  17. 2 2
      tests/misc/projects/Issue11121/compile-fail.hxml
  18. 2 2
      tests/misc/projects/Issue5644/pretty-fail.hxml
  19. 1 1
      tests/misc/projects/Issue5949/indent-fail.hxml
  20. 2 2
      tests/misc/projects/Issue5949/pretty-fail.hxml
  21. 1 1
      tests/misc/projects/Issue6065/indent-fail.hxml
  22. 2 2
      tests/misc/projects/Issue6065/pretty-fail.hxml
  23. 2 2
      tests/misc/projects/Issue6584/pretty-fail.hxml
  24. 2 2
      tests/misc/projects/Issue6790/pretty-fail.hxml
  25. 2 2
      tests/misc/projects/Issue6796/pretty-fail.hxml
  26. 1 1
      tests/misc/projects/Issue6810/indent-fail.hxml
  27. 1 1
      tests/misc/projects/Issue6810/logfile-01-fail.hxml
  28. 3 3
      tests/misc/projects/Issue6810/logfile-02-fail.hxml
  29. 3 3
      tests/misc/projects/Issue6810/logfile-03-fail.hxml
  30. 2 2
      tests/misc/projects/Issue6810/pretty-fail.hxml
  31. 2 2
      tests/misc/projects/Issue7968/pretty-fail.hxml
  32. 1 1
      tests/misc/projects/Issue8303/indent-fail.hxml
  33. 2 2
      tests/misc/projects/Issue8303/pretty-fail.hxml
  34. 2 2
      tests/misc/projects/Issue8471/compile2-pretty.hxml
  35. 2 2
      tests/unit/compile-each.hxml

+ 10 - 10
src-json/define.json

@@ -760,24 +760,24 @@
 	},
 	{
 		"name": "MessageReporting",
-		"define": "message-reporting",
+		"define": "message.reporting",
 		"doc": "Select message reporting mode for compiler output. (default: classic)",
 		"params": ["mode: classic | pretty | indent"]
 	},
 	{
-		"name": "NoColor",
-		"define": "no-color",
-		"doc": "Disable ANSI color codes when using rich output."
+		"name": "MessageNoColor",
+		"define": "message.no-color",
+		"doc": "Disable ANSI color codes in message reporting."
 	},
 	{
-		"name": "MessagesLogFile",
-		"define": "messages-log-file",
-		"doc": "Path to a text file to write messages log to, in addition to regular output."
+		"name": "MessageLogFile",
+		"define": "message.log-file",
+		"doc": "Path to a text file to write message reporting to, in addition to regular output."
 	},
 	{
-		"name": "MessagesLogFormat",
-		"define": "messages-log-format",
-		"doc": "Select message reporting mode for messages log output. (default: indent)",
+		"name": "MessageLogFormat",
+		"define": "message.log-format",
+		"doc": "Select message reporting mode for message log file. (default: indent)",
 		"params": ["format: classic | pretty | indent"]
 	}
 ]

+ 5 - 5
src/compiler/messageReporting.ml

@@ -147,7 +147,7 @@ let compiler_pretty_message_string com ectx cm =
 
 		let gutter_len = (try String.length (Printf.sprintf "%d" (IntMap.find cm.cm_depth ectx.max_lines)) with Not_found -> 0) + 2 in
 
-		let no_color = Define.defined com.defines Define.NoColor in
+		let no_color = Define.defined com.defines Define.MessageNoColor in
 		let c_reset = if no_color then "" else "\x1b[0m" in
 		let c_bold = if no_color then "" else "\x1b[1m" in
 		let c_dim = if no_color then "" else "\x1b[2m" in
@@ -344,9 +344,9 @@ let display_messages ctx on_message = begin
 	in
 
 	let message_formatter = get_formatter ctx.com ectx Define.MessageReporting "classic" in
-	let log_formatter = get_formatter ctx.com ectx Define.MessagesLogFormat "indent" in
+	let log_formatter = get_formatter ctx.com ectx Define.MessageLogFormat "indent" in
 
-	let log_messages = ref (Define.defined ctx.com.defines Define.MessagesLogFile) in
+	let log_messages = ref (Define.defined ctx.com.defines Define.MessageLogFile) in
 	let log_message = ref None in
 	let close_logs = ref None in
 
@@ -354,7 +354,7 @@ let display_messages ctx on_message = begin
 		try begin
 			let buf = Rbuffer.create 16000 in
 
-			let file = Define.defined_value ctx.com.defines Define.MessagesLogFile in
+			let file = Define.defined_value ctx.com.defines Define.MessageLogFile in
 			let chan =
 				Path.mkdir_from_path file;
 				open_out_bin file
@@ -372,7 +372,7 @@ let display_messages ctx on_message = begin
 			));
 		end with
 			| Failure e | Sys_error e -> begin
-				let def = Define.get_define_key Define.MessagesLogFile in
+				let def = Define.get_define_key Define.MessageLogFile in
 				error ctx (Printf.sprintf "Error opening log file: %s. Logging to file disabled (-D %s)" e def) null_pos;
 				log_messages := false;
 			end

+ 1 - 1
src/core/define.ml

@@ -118,7 +118,7 @@ let get_signature def =
 			   Note that we should removed flags like use_rtti_doc here.
 			*)
 			| "display" | "use_rtti_doc" | "macro_times" | "display_details" | "no_copt" | "display_stdin"
-			| "message_reporting" | "messages_log_file" | "messages_log_format" | "no_color"
+			| "message.reporting" | "message.log_file" | "message.log_format" | "message.no_color"
 			| "dump" | "dump_dependencies" | "dump_ignore_var_ids" -> acc
 			| _ -> (k ^ "=" ^ v) :: acc
 		) def.values [] in

+ 2 - 2
tests/misc/java/projects/Issue11095/pretty-fail.hxml

@@ -1,3 +1,3 @@
 compile-fail.hxml
--D message-reporting=pretty
--D no-color
+-D message.reporting=pretty
+-D message.no-color

+ 1 - 1
tests/misc/projects/Issue10623/indent-fail.hxml

@@ -1,2 +1,2 @@
 compile-fail.hxml
--D message-reporting=indent
+-D message.reporting=indent

+ 2 - 2
tests/misc/projects/Issue10623/pretty-fail.hxml

@@ -1,3 +1,3 @@
 compile-fail.hxml
--D message-reporting=pretty
--D no-color
+-D message.reporting=pretty
+-D message.no-color

+ 1 - 1
tests/misc/projects/Issue10844/user-defined-meta-indent-fail.hxml

@@ -1,2 +1,2 @@
 user-defined-meta-fail.hxml
--D message-reporting=indent
+-D message.reporting=indent

+ 1 - 1
tests/misc/projects/Issue10844/user-defined-meta-json-indent-fail.hxml

@@ -1,2 +1,2 @@
 user-defined-meta-json-fail.hxml
--D message-reporting=indent
+-D message.reporting=indent

+ 2 - 2
tests/misc/projects/Issue10844/user-defined-meta-json-pretty-fail.hxml

@@ -1,4 +1,4 @@
 user-defined-meta-json-fail.hxml
--D message-reporting=pretty
--D no-color
+-D message.reporting=pretty
+-D message.no-color
 

+ 2 - 2
tests/misc/projects/Issue10844/user-defined-meta-pretty-fail.hxml

@@ -1,4 +1,4 @@
 user-defined-meta-fail.hxml
--D message-reporting=pretty
--D no-color
+-D message.reporting=pretty
+-D message.no-color
 

+ 2 - 2
tests/misc/projects/Issue10863/compile.hxml

@@ -1,5 +1,5 @@
 -main Main
 -js js.js
--D message-reporting=pretty
--D no-color
+-D message.reporting=pretty
+-D message.no-color
 --no-output

+ 2 - 2
tests/misc/projects/Issue10863/logmode-fail.hxml

@@ -1,3 +1,3 @@
 Any
--D messages-log-file=error.log
--D messages-log-format=awesome
+-D message.log-file=error.log
+-D message.log-format=awesome

+ 1 - 1
tests/misc/projects/Issue10863/logmode-fail.hxml.stderr

@@ -1 +1 @@
-Invalid message reporting mode: "awesome", expected classic | pretty | indent (for -D messages_log_format).
+Invalid message reporting mode: "awesome", expected classic | pretty | indent (for -D message.log_format).

+ 1 - 1
tests/misc/projects/Issue10863/reporting-fail.hxml

@@ -1,2 +1,2 @@
 Any
--D message-reporting=awesome
+-D message.reporting=awesome

+ 1 - 1
tests/misc/projects/Issue10863/reporting-fail.hxml.stderr

@@ -1 +1 @@
-Invalid message reporting mode: "awesome", expected classic | pretty | indent (for -D message_reporting).
+Invalid message reporting mode: "awesome", expected classic | pretty | indent (for -D message.reporting).

+ 2 - 2
tests/misc/projects/Issue11055/compile-pretty-fail.hxml

@@ -1,3 +1,3 @@
 compile-fail.hxml
--D message-reporting=pretty
--D no-color
+-D message.reporting=pretty
+-D message.no-color

+ 2 - 2
tests/misc/projects/Issue11121/compile-fail.hxml

@@ -1,3 +1,3 @@
 --main Main
--D message-reporting=pretty
--D no-color
+-D message.reporting=pretty
+-D message.no-color

+ 2 - 2
tests/misc/projects/Issue5644/pretty-fail.hxml

@@ -1,3 +1,3 @@
 compile-fail.hxml
--D message-reporting=pretty
--D no-color
+-D message.reporting=pretty
+-D message.no-color

+ 1 - 1
tests/misc/projects/Issue5949/indent-fail.hxml

@@ -1,2 +1,2 @@
 compile-fail.hxml
--D message-reporting=indent
+-D message.reporting=indent

+ 2 - 2
tests/misc/projects/Issue5949/pretty-fail.hxml

@@ -1,3 +1,3 @@
 compile-fail.hxml
--D message-reporting=pretty
--D no-color
+-D message.reporting=pretty
+-D message.no-color

+ 1 - 1
tests/misc/projects/Issue6065/indent-fail.hxml

@@ -1,2 +1,2 @@
 compile-fail.hxml
--D message-reporting=indent
+-D message.reporting=indent

+ 2 - 2
tests/misc/projects/Issue6065/pretty-fail.hxml

@@ -1,3 +1,3 @@
 compile-fail.hxml
--D message-reporting=pretty
--D no-color
+-D message.reporting=pretty
+-D message.no-color

+ 2 - 2
tests/misc/projects/Issue6584/pretty-fail.hxml

@@ -1,3 +1,3 @@
 compile5-fail.hxml
--D message-reporting=pretty
--D no-color
+-D message.reporting=pretty
+-D message.no-color

+ 2 - 2
tests/misc/projects/Issue6790/pretty-fail.hxml

@@ -1,3 +1,3 @@
 compile-fail.hxml
--D message-reporting=pretty
--D no-color
+-D message.reporting=pretty
+-D message.no-color

+ 2 - 2
tests/misc/projects/Issue6796/pretty-fail.hxml

@@ -1,3 +1,3 @@
 compile-fail.hxml
--D message-reporting=pretty
--D no-color
+-D message.reporting=pretty
+-D message.no-color

+ 1 - 1
tests/misc/projects/Issue6810/indent-fail.hxml

@@ -1,2 +1,2 @@
 compile-fail.hxml
--D message-reporting=indent
+-D message.reporting=indent

+ 1 - 1
tests/misc/projects/Issue6810/logfile-01-fail.hxml

@@ -1,2 +1,2 @@
--D messages-log-file=logfile-02-fail.hxml.stderr
+-D message.log-file=logfile-02-fail.hxml.stderr
 compile-fail.hxml

+ 3 - 3
tests/misc/projects/Issue6810/logfile-02-fail.hxml

@@ -1,4 +1,4 @@
--D messages-log-file=logfile-03-fail.hxml.stderr
--D messages-log-format=pretty
--D message-reporting=indent
+-D message.log-file=logfile-03-fail.hxml.stderr
+-D message.log-format=pretty
+-D message.reporting=indent
 compile-fail.hxml

+ 3 - 3
tests/misc/projects/Issue6810/logfile-03-fail.hxml

@@ -1,4 +1,4 @@
--D messages-log-file=logfile-04-fail.hxml.stderr
--D messages-log-format=classic
--D message-reporting=pretty
+-D message.log-file=logfile-04-fail.hxml.stderr
+-D message.log-format=classic
+-D message.reporting=pretty
 compile-fail.hxml

+ 2 - 2
tests/misc/projects/Issue6810/pretty-fail.hxml

@@ -1,3 +1,3 @@
 compile-fail.hxml
--D message-reporting=pretty
--D no-color
+-D message.reporting=pretty
+-D message.no-color

+ 2 - 2
tests/misc/projects/Issue7968/pretty-fail.hxml

@@ -1,3 +1,3 @@
 compile-fail.hxml
--D message-reporting=pretty
--D no-color
+-D message.reporting=pretty
+-D message.no-color

+ 1 - 1
tests/misc/projects/Issue8303/indent-fail.hxml

@@ -1,2 +1,2 @@
 compile-fail.hxml
--D message-reporting=indent
+-D message.reporting=indent

+ 2 - 2
tests/misc/projects/Issue8303/pretty-fail.hxml

@@ -1,3 +1,3 @@
 compile-fail.hxml
--D message-reporting=pretty
--D no-color
+-D message.reporting=pretty
+-D message.no-color

+ 2 - 2
tests/misc/projects/Issue8471/compile2-pretty.hxml

@@ -1,3 +1,3 @@
 compile2.hxml
--D message-reporting=pretty
--D no-color
+-D message.reporting=pretty
+-D message.no-color

+ 2 - 2
tests/unit/compile-each.hxml

@@ -10,5 +10,5 @@
 -lib utest
 -D analyzer-optimize
 -D analyzer-user-var-fusion
--D message-reporting=pretty
--D haxe-next
+-D message.reporting=pretty
+-D haxe-next