X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;ds=sidebyside;f=diagnostic.c;h=abfa8eba5fc68429fae956f67508a4510e254700;hb=f017f4f5080052f95185056b3af472ab737bc64a;hp=952bf19eb8e51db1811f6678788b0d19ba0e6766;hpb=454eb435e0b2813b55b2dbd2bc8ff36076d9b277;p=cparser

diff --git a/diagnostic.c b/diagnostic.c
index 952bf19..abfa8eb 100644
--- a/diagnostic.c
+++ b/diagnostic.c
@@ -1,33 +1,181 @@
 #include <stdarg.h>
 #include <stdio.h>
 
+#include "adt/error.h"
+#include "ast.h"
 #include "diagnostic.h"
+#include "token_t.h"
+#include "type.h"
+#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;
 
-void parser_print_prefix_pos(const source_position_t pos)
+/**
+ * Issue a diagnostic message.
+ */
+static void diagnosticvf(const char *const fmt, va_list ap)
 {
-	fprintf(stderr, "%s:%u: ", pos.input_name, pos.linenr);
+	for (const char* f = fmt; *f != '\0'; ++f) {
+		if (*f == '%') {
+			++f;
+
+			bool extended = false;
+			if (*f == '#') {
+				extended = true;
+				++f;
+			}
+
+			switch (*f) {
+				case '%':
+					fputc(*f, stderr);
+					break;
+
+				case 'C': {
+					const wint_t val = va_arg(ap, wint_t);
+					fputwc(val, stderr);
+					break;
+				}
+
+				case 'c': {
+					const unsigned char val = (unsigned char) va_arg(ap, int);
+					fputc(val, stderr);
+					break;
+				}
+
+				case 'd': {
+					const int val = va_arg(ap, int);
+					fprintf(stderr, "%d", val);
+					break;
+				}
+
+				case 's': {
+					const char* const str = va_arg(ap, const char*);
+					fputs(str, stderr);
+					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);
+					break;
+				}
+
+				case 'Q': {
+					const unsigned qualifiers = va_arg(ap, unsigned);
+					print_type_qualifiers(qualifiers);
+					break;
+				}
+
+				case 'T': {
+					const type_t* const type = va_arg(ap, const type_t*);
+					const symbol_t*     sym  = NULL;
+					if (extended) {
+						sym = va_arg(ap, const symbol_t*);
+					}
+					print_type_ext(type, sym, NULL);
+					break;
+				}
+
+				case 'K': {
+					const token_t* const token = va_arg(ap, const token_t*);
+					print_token(stderr, token);
+					break;
+				}
+
+				case 'k': {
+					if (extended) {
+						bool              first     = false;
+						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);
+							if (tok == 0)
+								break;
+							if (first) {
+								first = false;
+							} else {
+								fputs(delimiter, stderr);
+							}
+							print_token_type(stderr, tok);
+						}
+					} else {
+						const token_type_t token = va_arg(ap, token_type_t);
+						print_token_type(stderr, token);
+					}
+					break;
+				}
+
+				default:
+					panic("unknown format specifier");
+			}
+		} else {
+			fputc(*f, stderr);
+		}
+	}
 }
 
-void parser_print_warning_prefix_pos(const source_position_t pos)
+void diagnosticf(const char *const fmt, ...)
 {
-	parser_print_prefix_pos(pos);
-	fputs("warning: ", stderr);
+	va_list ap;
+	va_start(ap, fmt);
+	++diagnostic_count;
+	diagnosticvf(fmt, ap);
+	va_end(ap);
 }
 
-void parse_warning_pos(const source_position_t pos, const char *const message)
+static void errorvf(const source_position_t pos,
+                    const char *const fmt, va_list ap)
 {
-	parser_print_prefix_pos(pos);
-	fprintf(stderr, "warning: %s\n", message);
+	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 parse_warning_posf(const source_position_t pos, const char *const fmt, ...)
+void errorf(const source_position_t pos, const char *const fmt, ...)
 {
-	parser_print_prefix_pos(pos);
-	fputs("warning: ", stderr);
 	va_list ap;
 	va_start(ap, fmt);
-	vfprintf(stderr, fmt, ap);
+	errorvf(pos, fmt, ap);
 	va_end(ap);
+}
+
+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, ...)
+{
+	if (inhibit_all_warnings)
+		return;
+
+	va_list ap;
+	va_start(ap, fmt);
+	if (warning.s_are_errors) {
+		errorvf(pos, fmt, ap);
+	} else {
+		warningvf(pos, fmt, ap);
+	}
+	va_end(ap);
+}