From patchwork Wed Jan 7 06:47:36 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Siva Chandra Reddy X-Patchwork-Id: 4539 Received: (qmail 19456 invoked by alias); 7 Jan 2015 06:47:41 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 19439 invoked by uid 89); 7 Jan 2015 06:47:40 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.8 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_LOW, SPF_PASS, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: mail-ob0-f181.google.com Received: from mail-ob0-f181.google.com (HELO mail-ob0-f181.google.com) (209.85.214.181) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-SHA encrypted) ESMTPS; Wed, 07 Jan 2015 06:47:38 +0000 Received: by mail-ob0-f181.google.com with SMTP id gq1so1788581obb.12 for ; Tue, 06 Jan 2015 22:47:36 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:date :message-id:subject:from:to:content-type; bh=e4FW83QsjGgvReyhcz/qHzqBAsDAc+5rAALTMPqmwa0=; b=Yr5dGAbIcoAn7md97y2btvPM0IjCvbpZn0RchXgnYYikOcJ4Ci2W4+2Esp81nmDuL3 XZOFzzb0ba/itr2MZtDHpgsup1HZN7IoR5r4cdP39JgyOVJ8ELw2pCd3nqR877d/5+Kv 9VZXrm+BH8gG1fs6bSsePMOhS/Q02E9ShM0gqQ3TknmJzAC9H/xX6g/6C+3cJURqDDjv rVByMHRPYrhVNbbaciaQU18WD1VRzLzya3udEj/fF+dGvMcKDGXZ/m9HwkgYTyNrhVzd l3pmZi/yobaCZC/nv/PjTzh8ePTJ4f8B5NOAqSaaj5hHB6V+zCJOsEy3EwSLfyr/Qx3k WJWA== X-Gm-Message-State: ALoCoQm5Qp3tiYKwydn+C3JhN2zxiHrw+duMfxy+7vMbVhR34eZDqyYbzs4a95//+2ow06xw/pZj MIME-Version: 1.0 X-Received: by 10.60.63.5 with SMTP id c5mr902922oes.35.1420613256625; Tue, 06 Jan 2015 22:47:36 -0800 (PST) Received: by 10.202.197.133 with HTTP; Tue, 6 Jan 2015 22:47:36 -0800 (PST) In-Reply-To: References: Date: Tue, 6 Jan 2015 22:47:36 -0800 Message-ID: Subject: Re: [PATCH] Remove unwanted spaces when looking up builtin types From: Siva Chandra To: gdb-patches X-IsSubscribed: yes On Wed, Oct 29, 2014 at 11:50 AM, Siva Chandra 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 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. diff --git a/gdb/language.c b/gdb/language.c index 1e6b983..0c13219 100644 --- a/gdb/language.c +++ b/gdb/language.c @@ -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. */ diff --git a/gdb/testsuite/gdb.python/py-type.exp b/gdb/testsuite/gdb.python/py-type.exp index c4c8d9f..0c45ec9 100644 --- a/gdb/testsuite/gdb.python/py-type.exp +++ b/gdb/testsuite/gdb.python/py-type.exp @@ -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"