From 56f79b630766bb134400b4a8da43941cfc31c0c0 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Mon, 15 Jul 2019 10:41:18 -0600 Subject: [PATCH] Change ARI to mention C++11, and remove some rules I noticed that ARI mentions "ISO C 90", but now gdb uses C++11. This patch updates some text to reflect this change. I also noticed that a few rules can be removed now. ARGSUSED doesn't seem to be an issue any more (there's no code mentioning this and I doubt most of us even remember this convention); PARAMS was specific to K&R C; and __func__ is available in C++11. gdb/ChangeLog 2019-07-19 Tom Tromey * contrib/ari/gdb_ari.sh: Mention C++11, not ISO C 90. (ARGSUSED, PARAMS, __func__): Remove rules. --- gdb/ChangeLog | 5 +++++ gdb/contrib/ari/gdb_ari.sh | 42 ++++++-------------------------------- 2 files changed, 11 insertions(+), 36 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 2f73f307419..c5a102f3156 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2019-07-19 Tom Tromey + + * contrib/ari/gdb_ari.sh: Mention C++11, not ISO C 90. + (ARGSUSED, PARAMS, __func__): Remove rules. + 2019-07-19 Alan Hayward * arm-tdep.c (_initialize_arm_tdep): Remove xml tests. diff --git a/gdb/contrib/ari/gdb_ari.sh b/gdb/contrib/ari/gdb_ari.sh index 895654150b3..4bd434c8fec 100755 --- a/gdb/contrib/ari/gdb_ari.sh +++ b/gdb/contrib/ari/gdb_ari.sh @@ -27,7 +27,7 @@ LC_ALL=C ; export LC_ALL # Permanent checks take the form: -# Do not use XXXX, ISO C 90 implies YYYY +# Do not use XXXX, C++11 implies YYYY # Do not use XXXX, instead use YYYY''. # and should never be removed. @@ -255,17 +255,6 @@ BEGIN { } -# Things in comments - -BEGIN { doc["ARGSUSED"] = "\ -Do not use ARGSUSED, unnecessary" - category["ARGSUSED"] = ari_regression -} -/(^|[^_[:alnum:]])ARGSUSED([^_[:alnum:]]|$)/ { - fail("ARGSUSED") -} - - # SNIP - Strip out comments - SNIP FNR == 1 { @@ -433,27 +422,8 @@ FNR == 1 { cont_p { $0 = full_line $0; cont_p = 0; full_line = ""; } -# GDB uses ISO C 90. Check for any non pure ISO C 90 code - -BEGIN { doc["PARAMS"] = "\ -Do not use PARAMS(), ISO C 90 implies prototypes" - category["PARAMS"] = ari_regression -} -/(^|[^_[:alnum:]])PARAMS([^_[:alnum:]]|$)/ { - fail("PARAMS") -} - -BEGIN { doc["__func__"] = "\ -Do not use __func__, ISO C 90 does not support this macro" - category["__func__"] = ari_regression - fix("__func__", "gdbsupport/gdb_assert.h", 1) -} -/(^|[^_[:alnum:]])__func__([^_[:alnum:]]|$)/ { - fail("__func__") -} - BEGIN { doc["__FUNCTION__"] = "\ -Do not use __FUNCTION__, ISO C 90 does not support this macro" +Do not use __FUNCTION__, C++11 does not support this macro" category["__FUNCTION__"] = ari_regression } /(^|[^_[:alnum:]])__FUNCTION__([^_[:alnum:]]|$)/ { @@ -470,7 +440,7 @@ autoconf tests" } BEGIN { doc["PTR"] = "\ -Do not use PTR, ISO C 90 implies `void *'\''" +Do not use PTR, C++11 implies `void *'\''" category["PTR"] = ari_regression #fix("PTR", "gdb/utils.c", 6) } @@ -816,7 +786,7 @@ unconditionally" } BEGIN { doc["bcmp"] = "\ -Do not use bcmp(), ISO C 90 implies memcmp()" +Do not use bcmp(), C++11 implies memcmp()" category["bcmp"] = ari_regression } /(^|[^_[:alnum:]])bcmp[[:space:]]*\(/ { @@ -824,7 +794,7 @@ Do not use bcmp(), ISO C 90 implies memcmp()" } BEGIN { doc["setlinebuf"] = "\ -Do not use setlinebuf(), ISO C 90 implies setvbuf()" +Do not use setlinebuf(), C++11 implies setvbuf()" category["setlinebuf"] = ari_regression } /(^|[^_[:alnum:]])setlinebuf[[:space:]]*\(/ { @@ -832,7 +802,7 @@ Do not use setlinebuf(), ISO C 90 implies setvbuf()" } BEGIN { doc["bcopy"] = "\ -Do not use bcopy(), ISO C 90 implies memcpy() and memmove()" +Do not use bcopy(), C++11 implies memcpy() and memmove()" category["bcopy"] = ari_regression } /(^|[^_[:alnum:]])bcopy[[:space:]]*\(/ { -- 2.30.2