diff mbox

[review] Remove ARI check for multiple calls to warning or error

Message ID gerrit.1576173077000.I0618683623a3c7324460c7b9e5d7f252d88c2e8d@gnutoolchain-gerrit.osci.io
State New
Headers show

Commit Message

Simon Marchi (Code Review) Dec. 12, 2019, 5:51 p.m. UTC
Change URL: https://gnutoolchain-gerrit.osci.io/r/c/binutils-gdb/+/756
......................................................................

Remove ARI check for multiple calls to warning or error

ARI has a check for multiple calls to warning or error, suggesting
that they be combined into a single call.  This triggers at three
places in gdb, and after examining these, I think they all make sense
as-is.  Instead, it makes sense to remove this check from ARI.

gdb/ChangeLog
2019-12-12  Tom Tromey  <tromey@adacore.com>

	* contrib/ari/gdb_ari.sh: Remove check for multiple calls to
	warning or error.

Change-Id: I0618683623a3c7324460c7b9e5d7f252d88c2e8d
---
M gdb/ChangeLog
M gdb/contrib/ari/gdb_ari.sh
2 files changed, 5 insertions(+), 15 deletions(-)

Comments

Simon Marchi (Code Review) Dec. 13, 2019, 2:27 p.m. UTC | #1
Pedro Alves has posted comments on this change.

Change URL: https://gnutoolchain-gerrit.osci.io/r/c/binutils-gdb/+/756
......................................................................


Patch Set 1:

(1 comment)

| --- /dev/null
| +++ /COMMIT_MSG
| @@ -1,0 +1,20 @@ 
| +Parent:     0ecf9a76 (Remove "fix" call for "long long" from ARI)
| +Author:     Tom Tromey <tromey@adacore.com>
| +AuthorDate: 2019-12-12 10:40:08 -0700
| +Commit:     Tom Tromey <tromey@adacore.com>
| +CommitDate: 2019-12-12 10:40:08 -0700
| +
| +Remove ARI check for multiple calls to warning or error
| +
| +ARI has a check for multiple calls to warning or error, suggesting
| +that they be combined into a single call.  This triggers at three
| +places in gdb, and after examining these, I think they all make sense
| +as-is.  Instead, it makes sense to remove this check from ARI.

PS1, Line 12:

What are these places?

| +
| +gdb/ChangeLog
| +2019-12-12  Tom Tromey  <tromey@adacore.com>
| +
| +	* contrib/ari/gdb_ari.sh: Remove check for multiple calls to
| +	warning or error.
| +
| +Change-Id: I0618683623a3c7324460c7b9e5d7f252d88c2e8d
Simon Marchi (Code Review) Dec. 13, 2019, 7:24 p.m. UTC | #2
Tom Tromey has posted comments on this change.

Change URL: https://gnutoolchain-gerrit.osci.io/r/c/binutils-gdb/+/756
......................................................................


Patch Set 1:

(1 comment)

| --- /dev/null
| +++ /COMMIT_MSG
| @@ -1,0 +1,20 @@ 
| +Parent:     0ecf9a76 (Remove "fix" call for "long long" from ARI)
| +Author:     Tom Tromey <tromey@adacore.com>
| +AuthorDate: 2019-12-12 10:40:08 -0700
| +Commit:     Tom Tromey <tromey@adacore.com>
| +CommitDate: 2019-12-12 10:40:08 -0700
| +
| +Remove ARI check for multiple calls to warning or error
| +
| +ARI has a check for multiple calls to warning or error, suggesting
| +that they be combined into a single call.  This triggers at three
| +places in gdb, and after examining these, I think they all make sense
| +as-is.  Instead, it makes sense to remove this check from ARI.

PS1, Line 12:

> What are these places?

See throw_bad_regnum_error, guile_repl_command, and the end of
value_cast

| +
| +gdb/ChangeLog
| +2019-12-12  Tom Tromey  <tromey@adacore.com>
| +
| +	* contrib/ari/gdb_ari.sh: Remove check for multiple calls to
| +	warning or error.
| +
| +Change-Id: I0618683623a3c7324460c7b9e5d7f252d88c2e8d
Simon Marchi (Code Review) Dec. 13, 2019, 8:41 p.m. UTC | #3
Pedro Alves has posted comments on this change.

Change URL: https://gnutoolchain-gerrit.osci.io/r/c/binutils-gdb/+/756
......................................................................


Patch Set 1: Code-Review+2

(1 comment)

| --- /dev/null
| +++ /COMMIT_MSG
| @@ -1,0 +1,20 @@ 
| +Parent:     0ecf9a76 (Remove "fix" call for "long long" from ARI)
| +Author:     Tom Tromey <tromey@adacore.com>
| +AuthorDate: 2019-12-12 10:40:08 -0700
| +Commit:     Tom Tromey <tromey@adacore.com>
| +CommitDate: 2019-12-12 10:40:08 -0700
| +
| +Remove ARI check for multiple calls to warning or error
| +
| +ARI has a check for multiple calls to warning or error, suggesting
| +that they be combined into a single call.  This triggers at three
| +places in gdb, and after examining these, I think they all make sense
| +as-is.  Instead, it makes sense to remove this check from ARI.

PS1, Line 12:

> > What are these places?
> 
> See throw_bad_regnum_error, guile_repl_command, and the end of value_cast

Thanks.  (It'd be nice to have them mentioned in the commit log.)

| +
| +gdb/ChangeLog
| +2019-12-12  Tom Tromey  <tromey@adacore.com>
| +
| +	* contrib/ari/gdb_ari.sh: Remove check for multiple calls to
| +	warning or error.
| +
| +Change-Id: I0618683623a3c7324460c7b9e5d7f252d88c2e8d
Simon Marchi (Code Review) Dec. 13, 2019, 10:15 p.m. UTC | #4
Tom Tromey has posted comments on this change.

Change URL: https://gnutoolchain-gerrit.osci.io/r/c/binutils-gdb/+/756
......................................................................


Patch Set 1:

(1 comment)

| --- /dev/null
| +++ /COMMIT_MSG
| @@ -1,0 +1,20 @@ 
| +Parent:     0ecf9a76 (Remove "fix" call for "long long" from ARI)
| +Author:     Tom Tromey <tromey@adacore.com>
| +AuthorDate: 2019-12-12 10:40:08 -0700
| +Commit:     Tom Tromey <tromey@adacore.com>
| +CommitDate: 2019-12-12 10:40:08 -0700
| +
| +Remove ARI check for multiple calls to warning or error
| +
| +ARI has a check for multiple calls to warning or error, suggesting
| +that they be combined into a single call.  This triggers at three
| +places in gdb, and after examining these, I think they all make sense
| +as-is.  Instead, it makes sense to remove this check from ARI.

PS1, Line 12:

> > > What are these places?
> > 
> > See throw_bad_regnum_error, guile_repl_command, and the end of value_cast
> 
> Thanks.  (It'd be nice to have them mentioned in the commit log.)

I've made this change, and I'm going to push this series.
There's still some more work to be done before ARI is really
reliable.  What I'd like is if we could make it an ordinary
part of the build somehow, so we don't get these warnings
only after pushing.

| +
| +gdb/ChangeLog
| +2019-12-12  Tom Tromey  <tromey@adacore.com>
| +
| +	* contrib/ari/gdb_ari.sh: Remove check for multiple calls to
| +	warning or error.
| +
| +Change-Id: I0618683623a3c7324460c7b9e5d7f252d88c2e8d
diff mbox

Patch

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 2911956..3453b07 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,10 @@ 
 2019-12-12  Tom Tromey  <tromey@adacore.com>
 
+	* contrib/ari/gdb_ari.sh: Remove check for multiple calls to
+	warning or error.
+
+2019-12-12  Tom Tromey  <tromey@adacore.com>
+
 	* contrib/ari/gdb_ari.sh: Remove call to "fix" for "long long".
 
 2019-12-05  Tom Tromey  <tromey@adacore.com>
diff --git a/gdb/contrib/ari/gdb_ari.sh b/gdb/contrib/ari/gdb_ari.sh
index 5f05890..3ed9116 100755
--- a/gdb/contrib/ari/gdb_ari.sh
+++ b/gdb/contrib/ari/gdb_ari.sh
@@ -619,21 +619,6 @@ 
 
 # General problems
 
-BEGIN { doc["multiple messages"] = "\
-Do not use multiple calls to warning or error, instead use a single call"
-    category["multiple messages"] = ari_gettext
-}
-FNR == 1 {
-    warning_fnr = -1
-}
-/(^|[^_[:alnum:]])(warning|error)[[:space:]]*\(/ {
-    if (FNR == warning_fnr + 1) {
-	fail("multiple messages")
-    } else {
-	warning_fnr = FNR
-    }
-}
-
 # Commented out, but left inside sources, just in case.
 # BEGIN { doc["inline"] = "\
 # Do not use the inline attribute; \