[src/trunk]: src/usr.bin/xlint/lint1 lint: in debug output, use uniform file ...

[rillig <rillig%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b521b2d5d7ec
branches:  trunk
changeset: 981779:b521b2d5d7ec
user:      rillig <rillig%NetBSD.org@localhost>
date:      Sun Mar 21 08:52:05 2021 +0000

description:
lint: in debug output, use uniform file location references

This makes it easy to click on the location in the IDE instead of having
to manually parse the location and navigate to it.

No functional change outside debug mode.

diffstat:

 usr.bin/xlint/lint1/cgram.y |  24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)

diffs (72 lines):

diff -r 3049867ceac8 -r b521b2d5d7ec usr.bin/xlint/lint1/cgram.y
--- a/usr.bin/xlint/lint1/cgram.y       Sun Mar 21 08:46:26 2021 +0000
+++ b/usr.bin/xlint/lint1/cgram.y       Sun Mar 21 08:52:05 2021 +0000
@@ -1,5 +1,5 @@
 %{
-/* $NetBSD: cgram.y,v 1.189 2021/03/21 08:46:26 rillig Exp $ */
+/* $NetBSD: cgram.y,v 1.190 2021/03/21 08:52:05 rillig Exp $ */
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All Rights Reserved.
@@ -35,7 +35,7 @@
 
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: cgram.y,v 1.189 2021/03/21 08:46:26 rillig Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.190 2021/03/21 08:52:05 rillig Exp $");
 #endif
 
 #include <limits.h>
@@ -75,8 +75,8 @@
 static void
 CLEAR_WARN_FLAGS(const char *file, size_t line)
 {
-       printf("%s, %d: clear flags %s %zu\n", curr_pos.p_file,
-           curr_pos.p_line, file, line);
+       printf("%s:%d: %s:%zu: clearing flags\n",
+           curr_pos.p_file, curr_pos.p_line, file, line);
        clear_warn_flags();
        olwarn = LWARN_BAD;
 }
@@ -85,8 +85,8 @@
 SAVE_WARN_FLAGS(const char *file, size_t line)
 {
        lint_assert(olwarn == LWARN_BAD);
-       printf("%s, %d: save flags %s %zu = %d\n", curr_pos.p_file,
-           curr_pos.p_line, file, line, lwarn);
+       printf("%s:%d: %s:%zu: saving flags %d\n",
+           curr_pos.p_file, curr_pos.p_line, file, line, lwarn);
        olwarn = lwarn;
 }
 
@@ -95,24 +95,24 @@
 {
        if (olwarn != LWARN_BAD) {
                lwarn = olwarn;
-               printf("%s, %d: restore flags %s %zu = %d\n", curr_pos.p_file,
-                   curr_pos.p_line, file, line, lwarn);
+               printf("%s:%d: %s:%zu: restoring flags %d\n",
+                   curr_pos.p_file, curr_pos.p_line, file, line, lwarn);
                olwarn = LWARN_BAD;
        } else
                CLEAR_WARN_FLAGS(file, line);
 }
 #define cgram_debug(fmt, args...) printf("cgram_debug: " fmt "\n", ##args)
 #else
-#define CLEAR_WARN_FLAGS(f, l) clear_warn_flags(), olwarn = LWARN_BAD
+#define CLEAR_WARN_FLAGS(f, l) clear_warn_flags(), olwarn = LWARN_BAD
 #define SAVE_WARN_FLAGS(f, l)  olwarn = lwarn
 #define RESTORE_WARN_FLAGS(f, l) \
        (void)(olwarn == LWARN_BAD ? (clear_warn_flags(), 0) : (lwarn = olwarn))
 #define cgram_debug(fmt, args...) do { } while (false)
 #endif
 
-#define clear_warning_flags() CLEAR_WARN_FLAGS(__FILE__, __LINE__)
-#define save_warning_flags() SAVE_WARN_FLAGS(__FILE__, __LINE__)
-#define restore_warning_flags() RESTORE_WARN_FLAGS(__FILE__, __LINE__)
+#define clear_warning_flags()  CLEAR_WARN_FLAGS(__FILE__, __LINE__)
+#define save_warning_flags()   SAVE_WARN_FLAGS(__FILE__, __LINE__)
+#define restore_warning_flags()        RESTORE_WARN_FLAGS(__FILE__, __LINE__)
 
 /* unbind the anonymous struct members from the struct */
 static void