X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=diagnostic.c;h=447ed7d784920f34952f3c3a2e09e50e97ca5739;hb=f62e85e79349d1b37a5c1f38f30d3c7bcbeebfc6;hp=5fb6677f088e19a6cbefdcc7ff85f0c704b06502;hpb=1217a460fb779a253866f4e135834c82326f0b1b;p=cparser

diff --git a/diagnostic.c b/diagnostic.c
index 5fb6677..447ed7d 100644
--- a/diagnostic.c
+++ b/diagnostic.c
@@ -30,12 +30,13 @@
 #include "warning.h"
 
 /** Number of occurred diagnostics. */
-unsigned diagnostic_count = 0;
+unsigned diagnostic_count        = 0;
 /** Number of occurred errors. */
-unsigned error_count      = 0;
+unsigned error_count             = 0;
 /** Number of occurred warnings. */
-unsigned warning_count    = 0;
-bool     show_column      = true;
+unsigned warning_count           = 0;
+bool     show_column             = true;
+bool     diagnostics_show_option = true;
 
 static const source_position_t *curr_pos = NULL;
 
@@ -152,7 +153,7 @@ static void diagnosticvf(const char *const fmt, va_list ap)
 						va_list*          toks      = va_arg(ap, va_list*);
 						const char* const delimiter = va_arg(ap, const char*);
 						for (;;) {
-							const token_type_t tok = va_arg(*toks, token_type_t);
+							const token_kind_t tok = va_arg(*toks, token_kind_t);
 							if (tok == 0)
 								break;
 							if (first) {
@@ -160,11 +161,11 @@ static void diagnosticvf(const char *const fmt, va_list ap)
 							} else {
 								fputs(delimiter, stderr);
 							}
-							print_token_type(stderr, tok);
+							print_token_kind(stderr, tok);
 						}
 					} else {
-						const token_type_t token = va_arg(ap, token_type_t);
-						print_token_type(stderr, token);
+						const token_kind_t token = va_arg(ap, token_kind_t);
+						print_token_kind(stderr, token);
 					}
 					break;
 				}
@@ -219,15 +220,16 @@ static void diagnosticposvf(source_position_t const *const pos, char const *cons
 	fprintf(out, " %s: ", kind);
 	curr_pos = pos;
 	diagnosticvf(fmt, ap);
-	fputc('\n', out);
 }
 
 static void errorvf(const source_position_t *pos,
                     const char *const fmt, va_list ap)
 {
+	curr_pos = pos;
 	++error_count;
 	diagnosticposvf(pos, "error", fmt, ap);
-	if (warning.fatal_errors)
+	fputc('\n', stderr);
+	if (is_warn_on(WARN_FATAL_ERRORS))
 		exit(EXIT_FAILURE);
 }
 
@@ -235,27 +237,34 @@ void errorf(const source_position_t *pos, const char *const fmt, ...)
 {
 	va_list ap;
 	va_start(ap, fmt);
-	curr_pos = pos;
 	errorvf(pos, fmt, ap);
 	va_end(ap);
 }
 
-static void warningvf(const source_position_t *pos,
-                      const char *const fmt, va_list ap)
-{
-	++warning_count;
-	diagnosticposvf(pos, "warning", fmt, ap);
-}
-
-void warningf(const source_position_t *pos, const char *const fmt, ...)
+void warningf(warning_t const warn, source_position_t const* pos, char const *const fmt, ...)
 {
 	va_list ap;
 	va_start(ap, fmt);
-	curr_pos = pos;
-	if (warning.s_are_errors) {
-		errorvf(pos, fmt, ap);
-	} else {
-		warningvf(pos, fmt, ap);
+	warning_switch_t const *const s = get_warn_switch(warn);
+	switch ((unsigned) s->state) {
+			char const* kind;
+		case WARN_STATE_ON:
+			if (is_warn_on(WARN_ERROR)) {
+		case WARN_STATE_ON | WARN_STATE_ERROR:
+				++error_count;
+				kind = "error";
+			} else {
+		case WARN_STATE_ON | WARN_STATE_NO_ERROR:
+				++warning_count;
+				kind = "warning";
+			}
+			diagnosticposvf(pos, kind, fmt, ap);
+			if (diagnostics_show_option)
+				fprintf(stderr, " [-W%s]\n", s->name);
+			break;
+
+		default:
+			break;
 	}
 	va_end(ap);
 }
@@ -264,6 +273,7 @@ static void internal_errorvf(const source_position_t *pos,
                     const char *const fmt, va_list ap)
 {
 	diagnosticposvf(pos, "internal error", fmt, ap);
+	fputc('\n', stderr);
 }
 
 void internal_errorf(const source_position_t *pos, const char *const fmt, ...)