Remove unwanted spaces when looking up builtin types
Commit Message
On Wed, Oct 29, 2014 at 11:50 AM, Siva Chandra <sivachandra@google.com> wrote:
> Currently, if we do something like gdb.lookup_type(" unsigned long "),
> GDB errors out because of the leading and trailing spaces. The
> attached patch fixes this problem.
>
> A practical situation where this problem is hit is when invoking
> template methods. Its not uncommon to do things like this:
>
> (gdb) p foo.bar< unsigned long >()
>
> If "bar" happens to be an xmethod, then its implementation will
> typically need to parse the name of the method ("bar< unsigned long >"
> in the above example) to get the template argument and lookup the
> type. GDB currently fails for such cases. One could of course
> sanitize/fix such inputs in Python before calling lookup_type, but I
> think it is better done on the GDB side as having white spaces is
> valid syntax.
This is still relevant, but required a rebase over the recent changes
to language.c.
2015-01-06 Siva Chandra Reddy <sivachandra@google.com>
gdb/ChangeLog:
* language.c (language_lookup_primitive_type_1): Remove
unwanted space in the type name before looking it up.
(whitespace_p): New function.
gdb/testsuite/ChangeLog:
* gdb.python/py-type.exp: Add new tests.
Comments
> +/* Return 1 if C is a whitespace character, 0 otherwise. */
> +
> +static int
> +whitespace_p (const char c)
> +{
> + if (c == ' ' || c == '\n' || c == '\t')
> + return 1;
> + else
> + return 0;
Why not using isspace directly? Apologies if this was explained
before, but then, a comment would be helpful, and maybe a more
specific function name. My first reaction to this kind of routine
was that this should be in one of our "utils" files, so as to allow
other parts of the code to use it as well.
@@ -987,6 +987,17 @@ language_bool_type (const struct language_defn *la,
return ld->arch_info[la->la_language].bool_type_default;
}
+/* Return 1 if C is a whitespace character, 0 otherwise. */
+
+static int
+whitespace_p (const char c)
+{
+ if (c == ' ' || c == '\n' || c == '\t')
+ return 1;
+ else
+ return 0;
+}
+
/* Helper function for primitive type lookup. */
static struct type **
@@ -994,13 +1005,39 @@ language_lookup_primitive_type_1 (const struct language_arch_info *lai,
const char *name)
{
struct type **p;
+ int len = strlen (name);
+ int i, j;
+ char *clean_name = (char *) xmalloc (sizeof (char) * len + 1);
+
+ /* Remove unwanted whitespace in the typename. This could happen, for
+ example, if one does gdb.lookup_type(' unsigned long ') in Python. */
+ for (i = 0, j = 0; i < len; i++)
+ {
+ if (whitespace_p (name[i]))
+ {
+ if (j == 0 || clean_name[j - 1] == ' ')
+ continue;
+ }
+
+ if (whitespace_p (name[i]))
+ clean_name[j] = ' ';
+ else
+ clean_name[j] = name[i];
+
+ j++;
+ }
+ if (j > 0 && clean_name[j - 1] == ' ')
+ j--;
+ clean_name[j] = '\0';
for (p = lai->primitive_type_vector; (*p) != NULL; p++)
{
- if (strcmp (TYPE_NAME (*p), name) == 0)
- return p;
+ if (strcmp (TYPE_NAME (*p), clean_name) == 0)
+ break;
}
- return NULL;
+ xfree (clean_name);
+
+ return p;
}
/* See language.h. */
@@ -270,3 +270,15 @@ with_test_prefix "lang_cpp" {
test_template
test_enums
}
+
+# Tests to lookup builtin types
+gdb_test "python print gdb.lookup_type ('unsigned int')" "unsigned int" \
+ "lookup unsigned int"
+gdb_test "python print gdb.lookup_type (' unsigned long ')" "unsigned long" \
+ "lookup unsigned long"
+gdb_test "python print gdb.lookup_type (' unsigned char ')" "unsigned char" \
+ "lookup unsigned char"
+gdb_test "python print gdb.lookup_type (' unsigned\\n char ')" "unsigned char" \
+ "lookup unsigned char"
+gdb_test "python print gdb.lookup_type (' unsigned\\tlong ')" "unsigned long" \
+ "lookup unsigned long"