From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 77398 invoked by alias); 17 May 2018 13:40:35 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 77324 invoked by uid 89); 17 May 2018 13:40:33 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.7 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,KAM_SHORT autolearn=ham version=3.3.2 spammy= X-HELO: sesbmg22.ericsson.net Received: from sesbmg22.ericsson.net (HELO sesbmg22.ericsson.net) (193.180.251.48) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 17 May 2018 13:40:30 +0000 Received: from ESESSHC017.ericsson.se (Unknown_Domain [153.88.183.69]) by sesbmg22.ericsson.net (Symantec Mail Security) with SMTP id 70.3F.05787.B468DFA5; Thu, 17 May 2018 15:40:27 +0200 (CEST) Received: from ESESSMB501.ericsson.se (153.88.183.162) by ESESSHC017.ericsson.se (153.88.183.69) with Microsoft SMTP Server (TLS) id 14.3.382.0; Thu, 17 May 2018 15:39:41 +0200 Received: from ESESSMB504.ericsson.se (153.88.183.165) by ESESSMB501.ericsson.se (153.88.183.162) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1466.3; Thu, 17 May 2018 15:39:41 +0200 Received: from NAM02-CY1-obe.outbound.protection.outlook.com (153.88.183.157) by ESESSMB504.ericsson.se (153.88.183.165) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1466.3 via Frontend Transport; Thu, 17 May 2018 15:39:41 +0200 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=simon.marchi@ericsson.com; Received: from elxacz23q12.ca.am.ericsson.se (192.75.88.130) by BYAPR15MB2392.namprd15.prod.outlook.com (2603:10b6:a02:8d::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.755.16; Thu, 17 May 2018 13:39:39 +0000 From: Simon Marchi To: CC: Simon Marchi Subject: [PATCH] Make format_pieces recognize the \e escape sequence Date: Thu, 17 May 2018 14:36:00 -0000 Message-ID: <1526564365-4036-1-git-send-email-simon.marchi@ericsson.com> MIME-Version: 1.0 Content-Type: text/plain X-ClientProxiedBy: SN2PR01CA0053.prod.exchangelabs.com (2603:10b6:800::21) To BYAPR15MB2392.namprd15.prod.outlook.com (2603:10b6:a02:8d::11) X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(5600026)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020);SRVR:BYAPR15MB2392; X-Microsoft-Exchange-Diagnostics: 1;BYAPR15MB2392;3:lQJ8aYRKrgurZ4wVHCpszzZAovPRpz85Qs9sNARt8dxueah8745vfzl6MowprIPI/LWUbi0cI55EZjeTDS0XpvdpPEBtVqVAQ7u5Ks/g18xLg424bJ4ec5ZuzaoX7kFKAuCVuqPPWbftfvJfAPV3xMEnjWUYHnF1EkLxE4Yu96XvGMH3Rm3rJ22H5DKzVmluJAPetMxHo4gCR8xO4JJhxBn88hB8y151+0nDRlDvLY6USCVJ0NAU7E81+UkWtRVu;25:i1DOFm7EkSqQI1hY2ql0RnunGULlnmTD/l2RbhFfDuXA+yH2F1XS6wl1yaLMNJm+Mmj7NS/Ji3DWkYnFSzzjwbx3MUIsw+KWQWaREepS4JOW1+DxpdlnNukSRQU49JWKl3cOZMUpNOyeaSUiLTOTX4c95/9OxHS/NpXWUn+DTqpVuwaPjg8EjT+jfVjTW0AKd+fJ/6lvPjtr6ZJUArQ68Puwk6z24tq9/7C2JQSv7bW4tIeRLZIFeVPAIw2/sNgRyQYg02eVY1vXtACKbYMidQfHw4FOaayZgM/ii8C0G5E+p+iqj4ntnRoYsagBtPECge+f6f8h3r6C8MrmN2rkmQ==;31:BzBl+BldseM4tpK4YshthkAUbpPYSPYKTV235kHWyJ18fII+3+6Lq/5GAMIzO+tQu0HiUxMkcIcjwxcleSyFVRavj7RraA6I45wdQLBGiAryaY6wayoNgXulT5nBlHd0En0TJGYzftmPnmnj8LMYUsFuoIrKI/dY0fG6Gg0aPKfS6s0xjvUJQ5hYxJ3SqSvF3SmpqgRoq0xyxDQFw+rJoE0qJgbHJkIh/bDa00/FzCE= X-MS-TrafficTypeDiagnostic: BYAPR15MB2392: X-Microsoft-Exchange-Diagnostics: 1;BYAPR15MB2392;20:q2Uu4funqhuKoW8aTuyEMVm/sQUwPGXnWEgcNcoJKzTHJDfjkM4nBAd+RoWtFEiDMTHRrLqxlsIrhOh9+63AN5mEZy3z5nqbIe1nsYzXjcgAYD+TBp5TnvFA0sz7eYl6mlLsAgD3RkRHxEZ0s11Vhe9NUQQIcnRrZpHder1NQ8++AwYFbpb8YgReGAs7ckBFLOWRpaljC0lO+AUkXwoX1kbc1LcJb7G88GXp0aZj9ByfCqqxIDzvTH74zRWDft2mH3/7LUi+ZppBpxvZKiLDEuwe0H0ydLuUbva9lz6Sq/efjJB2znhzP6u0ItvKKygitAj5gMr7Zc737Dec8UeGQRpVlp40hW5BoNZkZvsdOdam97J1ZvhbsXkapjro/tDsRXn7E+1UmuYvRZzomFKuZxdcHVdTO5uO/u+BX7wVlkTwiW5DoOEAS0jDXcqt8ffxrgzdF5Lr4g1diH8hvyASYf4p1RPiLX4XnZbtyQ62D6E8uURKODg/6gyWGkqUbCuv;4:/3A9LcHQWup9YgUSiq3KB4Tlo70Dc+tonaFXRCr4na6rQoaUi2iN82K9ZSkAH03yOu7lAyJMaIgnRyHu1Ej4GrC489VKtqKZ3aLTbCiY5bPyiNkc0oGGDmfYrg/U+0XLCldvr9m4ge2X7QpVYmFBrk0J3HKu9AY3jb3IFPcQdYKSFP762YH0nFb9RTXOb5dN9gQw3RRti/gWn90RhNLrMQupb3qdgiR0i5RQpCRaz2eEghHMQv+PXHRysY0rPW3lvsDGyHLy9z9I6PiVNJ6NiQfJbk+SvneyBiK9frrJcnppi04+oySctvcraUcYwf28N1pf6X0e8GB4zzF7bXDQCq+WVnNBhnLAlSN6lHUtHm0= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(250305191791016)(22074186197030); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(10201501046)(93006095)(93001095)(3002001)(3231254)(944501410)(52105095)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123564045)(20161123558120)(20161123560045)(6072148)(201708071742011)(7699016);SRVR:BYAPR15MB2392;BCL:0;PCL:0;RULEID:;SRVR:BYAPR15MB2392; X-Forefront-PRVS: 067553F396 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(396003)(366004)(39380400002)(376002)(39860400002)(346002)(54534003)(199004)(189003)(107886003)(16526019)(48376002)(2361001)(47776003)(25786009)(26005)(50226002)(2906002)(8936002)(52116002)(68736007)(81156014)(51416003)(186003)(316002)(478600001)(86362001)(97736004)(6486002)(81166006)(53936002)(16586007)(305945005)(3846002)(486006)(50466002)(6116002)(66066001)(8676002)(36756003)(1857600001)(6666003)(6916009)(6512007)(6306002)(5660300001)(4326008)(7736002)(6506007)(59450400001)(2351001)(476003)(386003)(44832011)(106356001)(956004)(2616005)(105586002)(2004002);DIR:OUT;SFP:1101;SCL:1;SRVR:BYAPR15MB2392;H:elxacz23q12.ca.am.ericsson.se;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1; Received-SPF: None (protection.outlook.com: ericsson.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;BYAPR15MB2392;23:OTPtPa5rNlMIkFIiCrMh+duyrONd1XuD+h4tXTkdn?= =?us-ascii?Q?uexpVN+1o2keMUeS7wpSAjSNFKuv66TIFK2A74igRYM4bLkEJLfLNX39/vyg?= =?us-ascii?Q?9Zk/2QBGmamfEkK5iS8CCel2vP7WcKkEwTJuEVBVoTBj3r0gSdB78Pa/6m4r?= =?us-ascii?Q?5lbcSjoKBHdS5fdMtmuSh6IPAIQLdGnEJppXAr/ZXcMT5MfNTHsyhvhI0g9d?= =?us-ascii?Q?bPkjvZLrcutaSsVpV/itkh3Oly8FTpAbLVZmg/snpL9dFsS8Bunf0TwrsQYZ?= =?us-ascii?Q?Tfv6rpXln42HRaKrT6bC0axAD7tCQS3T8tlJy1puF4fUTpnKlXviiOjv3glC?= =?us-ascii?Q?DJYy8rfy7WB+3gnQEYOvtfvdhBzf7uL/S4RQtbW1GS2ptPIt3XNUCjEhW+na?= =?us-ascii?Q?K/Imx/TEN2veRLxt/d7Ut0vcYO0VuQyq/1KsSMZ6GKB9373+dvOi9TIFXJCo?= =?us-ascii?Q?cb/ihsGn9dAbrmEI+5Au0PZ+rkLfWV429TKMCZpmeb0RhL7dxNlJb2+WIi8f?= =?us-ascii?Q?UJyfryMxBDYjcv0kaP0fHnQ58RLsviT38yPt8jAPnBxhgqcuawjPu9UKi0Ur?= =?us-ascii?Q?0m/j77NvMQl9Hk7VuPf75m7ib6dWnPdkY8ixLVJgrR7Jj8ZIAoVWEahSfL7k?= =?us-ascii?Q?rczSyXSSLM974zfDQ2sc4Ktc2RG5dRxOTrprriri86mIFwc12p6uBlN0iBmJ?= =?us-ascii?Q?UpmGZdJzx1Nryu1tEpgHmZlLQndtZS+rNUmA5IvoIyj6Hr/kEcoEpkoH5pkW?= =?us-ascii?Q?x8OqTrOykHFlphqtcAym0PSIQOD7noEXGZliopZ2BKebyWW35kcll/io8OqM?= =?us-ascii?Q?8gdDnpiSdeCS43dHswADzw/kzxNB5wLhht4tq05Lm4seOava5Fgzgs9VvfZe?= =?us-ascii?Q?zKgpiXk4DwzpYKaM0Tsa4T2vPdEZnBvw24/qwRtmbbkrqsB1Fqn01ZBsjd1x?= =?us-ascii?Q?36HVvy4O3PVlv6CplPPRgiX7Sj/XOIa+IX2j+wtZIDcY5abzksH/Om4WliMG?= =?us-ascii?Q?PB+/yoTNCou4lMIZ5C4dflSTJd7lqDXc/LxLV9oe0o3q/BZT9MVdOnxDPwG4?= =?us-ascii?Q?GdztRII34WKeKSfiUvua0xIkNBPs1YpdHG+XbuHBlo8ZqqjczzW9jewedVrd?= =?us-ascii?Q?t+R10gwliE5F/gNjwKhsNGwlfIJ6PBW7B+A7uhc3B6e98caetreOYgKJZPYa?= =?us-ascii?Q?PAYv25/GKMIgCabCPCf34lVnP9RZExkjpXXvOGjcIE5/bLRSx/75z1VSR5tn?= =?us-ascii?Q?mMQnv9ytN6lNTR++P+089s2nfG1Gp9NwcmAijWeuHD5NUQtoUrfTxIBVptaV?= =?us-ascii?Q?RSj10+9uWCoJUWppX8gp6w=3D?= X-Microsoft-Antispam-Message-Info: oMEgINHpy7SVgw3R7niRAxNxnojKgQxS3hn8B/BRUQlKGkePJc2K4eCG0J429yUiOq4csWkc8DDlEgvjssCnGX8IipssdbIr9MTVoAIAuc7SjZEpWhLtgvziU8Ow3ETyKgi9iyq49l2Be2lKRbFk3oM7W+ZZf0/8AoeGoNSw763iUApzIohLnCLviQYggaac X-Microsoft-Exchange-Diagnostics: 1;BYAPR15MB2392;6:8/Ndv58ynOCZPNNxEz/5qReI5j//1lEh1ByYFbUEGtM74IFsLZwk5Tv4vQEp1bo+mDXEVG1B1uyFvZyz5+BB8lAymlUCNhUmw5YIF07Tgkv7FkXUT8Xlyv87jX4QyXViAP0xMJ3AIno0o962BbxnhohwRi26RnHLDOiEylGa9reOpAU80w5iRp9fBxxIjjLWiFlN0h/jAvzEzI502B2giLGCQDThSsBCUzC39nNlwmJD0xCCf0zc7fOE8HYWl1ObfYGztKeMeDwT5ZPJ8VgNvvh+UQaBmzYZVrSbpwnH81J+69et8fut0mIEIbMgSrWL26WNge47BnTFF+ADoBMTfoq5MiKXnn4405/SOM83KLbBJKj92STqB/Td8FEUR28cFmsm6WcEuz1q5jUwUJni+BFeBq7Qf5PcNPemYe81pIucdKH2ESvWojSaXUje2QUG9oRMvKXGEVZ7gpWceY5jXA==;5:uWxTCwq4YCrgxad7lTCKHaCyGunh5kol0T9y8BvXW2w6gwnCd4vIvRb5h5enCS6IGE6Vik+jC65Dd2R0m0XB2Mp+I/5+znc5+T5nKixGad1p8/QFXd4tokV8u0qv1zjf2IueORI9B439LG831qTykN0/6OsY/zlCjmWsQmDoB0E=;24:FWIqs9bf4ppRWw88RF5fiixPdj5nhYPptihHQTg6oSxDdGLSH9Mj62Po4adQWwK1m1XB2wP5oFbTl537OwOcxJxe4Wt5zsm59SGPuXZSNB8= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;BYAPR15MB2392;7:e2nr0Uc2OCymWZF39PYtfkZDOBvhegjBZuWY040wiCykoLpYaOxVKqEI35j6cMLL2d9yY2TIDu54AONTdfTG/QLUt/I1cDaUxVurp8daTSf6RqJtUVc80hpGwLy3hFAUNe3BJeMYDPDKTUZpwuiPdK/S6mZuZXTgUdsy3RO2fwSEr/u8Tyk+M3moX4dFyBJMVYZ1uOuJay5+NeP62RYHkLPzTE0B80fYXs35yqEPUuCpsawqC8avsED7A7K07jHY X-MS-Office365-Filtering-Correlation-Id: 263a0caf-74c7-4971-1c13-08d5bbfba350 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 May 2018 13:39:39.0164 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 263a0caf-74c7-4971-1c13-08d5bbfba350 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 92e84ceb-fbfd-47ab-be52-080c6b87953f X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR15MB2392 X-OriginatorOrg: ericsson.com X-IsSubscribed: yes X-SW-Source: 2018-05/txt/msg00379.txt.bz2 I noticed that the printf command did not recognize the \e escape sequence, used amongst other things to use colors: (gdb) printf "This is \e[32mgreen\e[m!\n" Unrecognized escape character \e in format string. This patch makes format_pieces recognize it, which makes that command print the expected result in glorious color. I wrote a really simple unit test for format_pieces. format_pieces::operator[] is unused so I removed it. I added format_piece::operator==, which is needed to compare vectors of format_piece. gdb/ChangeLog: * Makefile.in (SUBDIR_UNITTESTS_SRCS): Add unittests/format_pieces-selftests.c. * common/format.h (format_piece) : New. (format_pieces) : Remove. * common/format.c (format_pieces::format_pieces): Handle \e. * unittests/format_pieces-selftests.c: New. --- gdb/Makefile.in | 1 + gdb/common/format.c | 3 ++ gdb/common/format.h | 13 +++--- gdb/unittests/format_pieces-selftests.c | 76 +++++++++++++++++++++++++++++++++ 4 files changed, 88 insertions(+), 5 deletions(-) create mode 100644 gdb/unittests/format_pieces-selftests.c diff --git a/gdb/Makefile.in b/gdb/Makefile.in index 87d74a7..09a2ad2 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -418,6 +418,7 @@ SUBDIR_UNITTESTS_SRCS = \ unittests/array-view-selftests.c \ unittests/common-utils-selftests.c \ unittests/environ-selftests.c \ + unittests/format_pieces-selftests.c \ unittests/function-view-selftests.c \ unittests/lookup_name_info-selftests.c \ unittests/memory-map-selftests.c \ diff --git a/gdb/common/format.c b/gdb/common/format.c index e162ac9..2fa3593 100644 --- a/gdb/common/format.c +++ b/gdb/common/format.c @@ -56,6 +56,9 @@ format_pieces::format_pieces (const char **arg) case 'b': *f++ = '\b'; break; + case 'e': + *f++ = '\e'; + break; case 'f': *f++ = '\f'; break; diff --git a/gdb/common/format.h b/gdb/common/format.h index 1745517..7b053f1 100644 --- a/gdb/common/format.h +++ b/gdb/common/format.h @@ -20,6 +20,8 @@ #ifndef COMMON_FORMAT_H #define COMMON_FORMAT_H +#include "common/gdb_string_view.h" + #if defined(__MINGW32__) && !defined(PRINTF_HAS_LONG_LONG) # define USE_PRINTF_I64 1 # define PRINTF_HAS_LONG_LONG @@ -54,6 +56,12 @@ struct format_piece { } + bool operator== (const format_piece &other) const + { + return (this->argclass == other.argclass + && gdb::string_view (this->string) == other.string); + } + const char *string; enum argclass argclass; }; @@ -67,11 +75,6 @@ public: DISABLE_COPY_AND_ASSIGN (format_pieces); - format_piece &operator[] (size_t index) - { - return m_pieces[index]; - } - typedef std::vector::iterator iterator; iterator begin () diff --git a/gdb/unittests/format_pieces-selftests.c b/gdb/unittests/format_pieces-selftests.c new file mode 100644 index 0000000..6d11a9c --- /dev/null +++ b/gdb/unittests/format_pieces-selftests.c @@ -0,0 +1,76 @@ +/* Self tests for format_pieces for GDB, the GNU debugger. + + Copyright (C) 2018 Free Software Foundation, Inc. + + This file is part of GDB. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +#include "defs.h" +#include "common/format.h" +#include "common/selftest.h" + +namespace selftests { +namespace format_pieces { + +/* Verify that parsing STR gives pieces equal to EXPECTED_PIECES. */ + +static void +check (const char *str, const std::vector &expected_pieces) +{ + ::format_pieces pieces (&str); + + SELF_CHECK ((pieces.end () - pieces.begin ()) == expected_pieces.size ()); + SELF_CHECK (std::equal (pieces.begin (), pieces.end (), + expected_pieces.begin ())); +} + +static void +test_escape_sequences () +{ + check ("This is an escape sequence: \\e", + { + format_piece ("This is an escape sequence: \e", literal_piece), + }); +} + +static void +test_format_specifier () +{ + check ("Hello %d%llx%%d", + { + format_piece ("Hello ", literal_piece), + format_piece ("%d", int_arg), + format_piece ("", literal_piece), + format_piece ("%llx", long_long_arg), + format_piece ("%%d", literal_piece), + }); +} + +static void +run_tests () +{ + test_escape_sequences (); + test_format_specifier (); +} + +} /* namespace format_pieces */ +} /* namespace selftests */ + +void +_initialize_format_pieces_selftests () +{ + selftests::register_test ("format_pieces", + selftests::format_pieces::run_tests); +} -- 2.7.4