This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
Re: [pushed] gdb/python: exception trying to create empty array
- From: Joel Brobecker <brobecker at adacore dot com>
- To: Doug Evans <dje at google dot com>
- Cc: gdb-patches <gdb-patches at sourceware dot org>
- Date: Wed, 7 Jan 2015 07:38:48 +0400
- Subject: Re: [pushed] gdb/python: exception trying to create empty array
- Authentication-results: sourceware.org; auth=none
- References: <1420556955-13827-1-git-send-email-brobecker at adacore dot com> <CADPb22R9OYrvjgpHr63V5ewZPxAmyrcSwMOUAkd05HesPxfwrg at mail dot gmail dot com>
> I think it might not be immediately obvious to the reader why the test
> is "n2 < n1 - 1".
> [E.g, there's no
> Can you add a comment?
Sure. Attached is the patch I just pushed.
gdb/ChangeLog:
* guile/scm-type.c (tyscm_array_1): Add comment.
* python/py-type.c (typy_array_1): Add comment.
--
Joel
>From e810d75b1c9bef779b29df9d2c609fd5891d5917 Mon Sep 17 00:00:00 2001
From: Joel Brobecker <brobecker@adacore.com>
Date: Wed, 7 Jan 2015 07:34:29 +0400
Subject: [PATCH] [python,guile] Add comment beside conditions testing empty
arrays.
gdb/ChangeLog:
* guile/scm-type.c (tyscm_array_1): Add comment.
* python/py-type.c (typy_array_1): Add comment.
---
gdb/ChangeLog | 5 +++++
gdb/guile/scm-type.c | 2 +-
gdb/python/py-type.c | 2 +-
3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 8e3737d..0b63d34 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2015-01-07 Joel Brobecker <brobecker@adacore.com>
+
+ * guile/scm-type.c (tyscm_array_1): Add comment.
+ * python/py-type.c (typy_array_1): Add comment.
+
2015-01-06 Joel Brobecker <brobecker@adacore.com>
* guile/scm-type.c (tyscm_array_1): Do not raise out-of-range
diff --git a/gdb/guile/scm-type.c b/gdb/guile/scm-type.c
index 4f46139..196b4a1 100644
--- a/gdb/guile/scm-type.c
+++ b/gdb/guile/scm-type.c
@@ -713,7 +713,7 @@ tyscm_array_1 (SCM self, SCM n1_scm, SCM n2_scm, int is_vector,
n1 = 0;
}
- if (n2 < n1 - 1)
+ if (n2 < n1 - 1) /* Note: An empty array has n2 == n1 - 1. */
{
gdbscm_out_of_range_error (func_name, SCM_ARG3,
scm_cons (scm_from_long (n1),
diff --git a/gdb/python/py-type.c b/gdb/python/py-type.c
index 8e82c99..bf92363 100644
--- a/gdb/python/py-type.c
+++ b/gdb/python/py-type.c
@@ -528,7 +528,7 @@ typy_array_1 (PyObject *self, PyObject *args, int is_vector)
n1 = 0;
}
- if (n2 < n1 - 1)
+ if (n2 < n1 - 1) /* Note: An empty array has n2 == n1 - 1. */
{
PyErr_SetString (PyExc_ValueError,
_("Array length must not be negative"));
--
1.9.1