X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;ds=sidebyside;f=diagnostic.c;h=abfa8eba5fc68429fae956f67508a4510e254700;hb=c72318cc0dd5197d3bbd75de9cf26f41adbba466;hp=930b9bd52435d7d037102bbb2df59ea74993a224;hpb=f6c1ead779c365453da484355686e5e23ab0023d;p=cparser

diff --git a/diagnostic.c b/diagnostic.c
index 930b9bd..abfa8eb 100644
--- a/diagnostic.c
+++ b/diagnostic.c
@@ -6,9 +6,7 @@
 #include "diagnostic.h"
 #include "token_t.h"
 #include "type.h"
-
-
-//#define ABORT_ON_ERROR
+#include "warning.h"
 
 /** Number of occurred diagnostics. */
 unsigned diagnostic_count = 0;
@@ -16,6 +14,8 @@ unsigned diagnostic_count = 0;
 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.
@@ -61,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);
@@ -130,28 +136,46 @@ void diagnosticf(const char *const fmt, ...)
 	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)
 {
-	++error_count;
 	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, ...)
 {
-	++warning_count;
-	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);
 }