X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=diagnostic.c;h=4a9122c8701978f9c53629f3742c801987760c6b;hb=f4920eb6dae7e9cbaca37c9c6536894bb463d092;hp=c1a4ad8f57cac5631a3451fbef3f83f8424cf210;hpb=63cf7273d8b513ca93148ba80fac753145789f46;p=cparser

diff --git a/diagnostic.c b/diagnostic.c
index c1a4ad8..4a9122c 100644
--- a/diagnostic.c
+++ b/diagnostic.c
@@ -1,11 +1,32 @@
+/*
+ * This file is part of cparser.
+ * Copyright (C) 2007-2008 Matthias Braun <matze@braunis.de>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
 #include <stdarg.h>
 #include <stdio.h>
 
-#include "adt/error.h"
-#include "ast.h"
 #include "diagnostic.h"
+#include "adt/error.h"
+#include "symbol_t.h"
 #include "token_t.h"
+#include "ast.h"
 #include "type.h"
+#include "warning.h"
 
 /** Number of occurred diagnostics. */
 unsigned diagnostic_count = 0;
@@ -15,10 +36,17 @@ unsigned error_count      = 0;
 unsigned warning_count    = 0;
 /** true if warnings should be inhibited */
 bool inhibit_all_warnings = false;
-/** true if warnings should be treated as errors */
-bool warnings_are_errors  = false;
-/** true if the first error should stop the compilation */
-bool fatal_errors = false;
+
+static const source_position_t *curr_pos = NULL;
+
+/**
+ * prints an additional source position
+ */
+static void print_source_position(FILE *out, const source_position_t *pos) {
+	fprintf(out, "at line %u", pos->linenr);
+	if (curr_pos == NULL || curr_pos->input_name != pos->input_name)
+		fprintf(out, " of \"%s\"", pos->input_name);
+}
 
 /**
  * Issue a diagnostic message.
@@ -66,7 +94,10 @@ static void diagnosticvf(const char *const fmt, va_list ap)
 
 				case 'Y': {
 					const symbol_t *const symbol = va_arg(ap, const symbol_t*);
-					fputs(symbol->string, stderr);
+					if (symbol == NULL)
+						fputs("(null)", stderr);
+					else
+						fputs(symbol->string, stderr);
 					break;
 				}
 
@@ -100,7 +131,7 @@ static void diagnosticvf(const char *const fmt, va_list ap)
 
 				case 'k': {
 					if (extended) {
-						bool              first     = false;
+						bool              first     = true;
 						va_list*          toks      = va_arg(ap, va_list*);
 						const char* const delimiter = va_arg(ap, const char*);
 						for (;;) {
@@ -121,6 +152,12 @@ static void diagnosticvf(const char *const fmt, va_list ap)
 					break;
 				}
 
+				case 'P': {
+					const source_position_t *pos = va_arg(ap, const source_position_t *);
+					print_source_position(stderr, pos);
+					break;
+				}
+
 				default:
 					panic("unknown format specifier");
 			}
@@ -135,52 +172,74 @@ void diagnosticf(const char *const fmt, ...)
 	va_list ap;
 	va_start(ap, fmt);
 	++diagnostic_count;
+	curr_pos = NULL;
 	diagnosticvf(fmt, ap);
 	va_end(ap);
 }
 
-static void errorvf(const source_position_t pos,
+static void errorvf(const source_position_t *pos,
                     const char *const fmt, va_list ap)
 {
-	fprintf(stderr, "%s:%u: error: ", pos.input_name, pos.linenr);
+	fprintf(stderr, "%s:%u: error: ", pos->input_name, pos->linenr);
 	++error_count;
+	curr_pos = pos;
 	diagnosticvf(fmt, ap);
 	fputc('\n', stderr);
 
-	if (fatal_errors)
-		abort();
+	if (warning.fatal_errors)
+		exit(EXIT_FAILURE);
 }
-void errorf(const source_position_t pos, const char *const fmt, ...)
+
+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);
-
-	if (fatal_errors)
-		exit(1);
 }
 
-static void warningvf(const source_position_t pos,
+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);
+	fprintf(stderr, "%s:%u: warning: ", pos->input_name, pos->linenr);
 	++warning_count;
+	curr_pos = pos;
 	diagnosticvf(fmt, ap);
 	fputc('\n', stderr);
 }
 
-void warningf(const source_position_t pos, const char *const fmt, ...)
+void warningf(const source_position_t *pos, const char *const fmt, ...)
 {
 	if (inhibit_all_warnings)
 		return;
 
 	va_list ap;
 	va_start(ap, fmt);
-	if (warnings_are_errors) {
+	curr_pos = pos;
+	if (warning.s_are_errors) {
 		errorvf(pos, fmt, ap);
 	} else {
 		warningvf(pos, fmt, ap);
 	}
 	va_end(ap);
 }
+
+static void internal_errorvf(const source_position_t *pos,
+                    const char *const fmt, va_list ap)
+{
+	fprintf(stderr, "%s:%u: internal error: ", pos->input_name, pos->linenr);
+	curr_pos = pos;
+	diagnosticvf(fmt, ap);
+	fputc('\n', stderr);
+}
+
+void internal_errorf(const source_position_t *pos, const char *const fmt, ...)
+{
+	va_list ap;
+	va_start(ap, fmt);
+	curr_pos = pos;
+	internal_errorvf(pos, fmt, ap);
+	va_end(ap);
+	abort();
+}