X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=diagnostic.c;h=abfa8eba5fc68429fae956f67508a4510e254700;hb=775e3ea067f4a25ba7629047c3f035dd632bc9f3;hp=9a7ca82fb0b25bb160bd3b190a69a0214f52ca9a;hpb=63e9daef66b06084272b2be411bfd1c1ed64dbc6;p=cparser

diff --git a/diagnostic.c b/diagnostic.c
index 9a7ca82..abfa8eb 100644
--- a/diagnostic.c
+++ b/diagnostic.c
@@ -6,14 +6,20 @@
 #include "diagnostic.h"
 #include "token_t.h"
 #include "type.h"
-
-
-//#define ABORT_ON_ERROR
-
-
-bool found_error;
-
-
+#include "warning.h"
+
+/** Number of occurred diagnostics. */
+unsigned diagnostic_count = 0;
+/** Number of occurred errors. */
+unsigned error_count      = 0;
+/** Number of occurred warnings. */
+unsigned warning_count    = 0;
+/** true if warnings should be inhibited */
+bool inhibit_all_warnings = false;
+
+/**
+ * Issue a diagnostic message.
+ */
 static void diagnosticvf(const char *const fmt, va_list ap)
 {
 	for (const char* f = fmt; *f != '\0'; ++f) {
@@ -38,7 +44,7 @@ static void diagnosticvf(const char *const fmt, va_list ap)
 				}
 
 				case 'c': {
-					const unsigned char val = va_arg(ap, int);
+					const unsigned char val = (unsigned char) va_arg(ap, int);
 					fputc(val, stderr);
 					break;
 				}
@@ -55,6 +61,12 @@ static void diagnosticvf(const char *const fmt, va_list ap)
 					break;
 				}
 
+				case 'Y': {
+					const symbol_t *const symbol = va_arg(ap, const symbol_t*);
+					fputs(symbol->string, stderr);
+					break;
+				}
+
 				case 'E': {
 					const expression_t* const expr = va_arg(ap, const expression_t*);
 					print_expression(expr);
@@ -119,31 +131,51 @@ void diagnosticf(const char *const fmt, ...)
 {
 	va_list ap;
 	va_start(ap, fmt);
+	++diagnostic_count;
 	diagnosticvf(fmt, ap);
 	va_end(ap);
 }
 
-void errorf(const source_position_t pos, const char *const fmt, ...)
+static void errorvf(const source_position_t pos,
+                    const char *const fmt, va_list ap)
 {
-	found_error = true;
 	fprintf(stderr, "%s:%u: error: ", pos.input_name, pos.linenr);
+	++error_count;
+	diagnosticvf(fmt, ap);
+	fputc('\n', stderr);
+
+	if (warning.fatal_errors)
+		exit(EXIT_FAILURE);
+}
+
+void errorf(const source_position_t pos, const char *const fmt, ...)
+{
 	va_list ap;
 	va_start(ap, fmt);
-	diagnosticvf(fmt, ap);
+	errorvf(pos, fmt, ap);
 	va_end(ap);
-	fputc('\n', stderr);
+}
 
-#ifdef ABORT_ON_ERROR
-	abort();
-#endif
+static void warningvf(const source_position_t pos,
+                      const char *const fmt, va_list ap)
+{
+	fprintf(stderr, "%s:%u: warning: ", pos.input_name, pos.linenr);
+	++warning_count;
+	diagnosticvf(fmt, ap);
+	fputc('\n', stderr);
 }
 
 void warningf(const source_position_t pos, const char *const fmt, ...)
 {
-	fprintf(stderr, "%s:%u: warning: ", pos.input_name, pos.linenr);
+	if (inhibit_all_warnings)
+		return;
+
 	va_list ap;
 	va_start(ap, fmt);
-	diagnosticvf(fmt, ap);
+	if (warning.s_are_errors) {
+		errorvf(pos, fmt, ap);
+	} else {
+		warningvf(pos, fmt, ap);
+	}
 	va_end(ap);
-	fputc('\n', stderr);
 }