From patchwork Mon Apr 18 15:47:21 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Evans X-Patchwork-Id: 11788 Received: (qmail 43196 invoked by alias); 18 Apr 2016 15:47:27 -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 40787 invoked by uid 89); 18 Apr 2016 15:47:26 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-3.3 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_LOW, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 spammy=H*M:sk:047d7bd, H*MI:sk:047d7bd, H*r:209.85.213, Files X-HELO: mail-ig0-f201.google.com Received: from mail-ig0-f201.google.com (HELO mail-ig0-f201.google.com) (209.85.213.201) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-GCM-SHA256 encrypted) ESMTPS; Mon, 18 Apr 2016 15:47:23 +0000 Received: by mail-ig0-f201.google.com with SMTP id f1so7262305igr.1 for ; Mon, 18 Apr 2016 08:47:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:message-id:date:subject:from:to; bh=3XumHfunKE5trxiK5OxK8X5rSF1Fjk44dgeXHVqYFG0=; b=hYfXY/Zp2nICXPBMxGWodJqNSNJ9B1LnNUlQmpj82FytKzVRCuEZH5j5MeH0X8x3M1 GOElsC/02lhpMQlnMyjs2BlMJI1G6fENt5Wnzuk9YPZ9Mx324KKprYsHALz5fADPymo6 v9aFoGTKa3GKSc/j2UXAMqo18QX9eRR/8NTXh8047llQGzqxiM+fr90LZC2Ki5mQOk+I FfiMuq5c18EM9A07QSusNX58nivPwDAhbuEEyAtwcbRJU20LHP93A/cK3btf9pFTqvxo Zv3Vsr27YpkuKafxJ5SK9mFYaOzZTQFuxGTBqXO8mZhfs4wmQQiYOxXe1vMwEBE6l8gr K2XA== X-Gm-Message-State: AOPr4FXYFsU/nIdp6qLRlpl4ai87kQLCcOdsOQEGvMX1CmACXVq5wToyb2fI5eGFdXH8Z/TAAu2onEE0xVOgShl15l/HS8gZ1TjSCKDV0Wa2kg9ml4iuivPbb4RPypzfWy0bx6jBt2cB+jP/Fer/lSP2R8YMwU9lz5VPyUptcuDtS8Qbu6s81g== MIME-Version: 1.0 X-Received: by 10.50.62.42 with SMTP id v10mr13005777igr.11.1460994441032; Mon, 18 Apr 2016 08:47:21 -0700 (PDT) Message-ID: <047d7bdc05e2ada5ef0530c446d1@google.com> Date: Mon, 18 Apr 2016 15:47:21 +0000 Subject: [PATCH 2/3] deprecate "skip enable/etc.", doc string cleanup From: Doug Evans To: gdb-patches@sourceware.org, eliz@gnu.org X-IsSubscribed: yes This patch deprecates "skip enable", "skip disable", "skip delete" in favor of "enable skip", "disable skip", "delete skip". And it uses the doc string macros of 1/3. 2016-04-17 Doug Evans * NEWS: Announce new skip commands, and deprecated ones. * skip.c (_initialize_step_skip): Deprecate "skip enable", "skip disable", "skip delete" in favor of "enable skip", "disable skip", "delete skip". Simplify doc strings. doc/ * gdb.texinfo (Skipping Over Functions and Files): Add docs for "enable skip", "disable skip", "delete skip". Mark "skip enable", "skip disable", "skip delete" as deprecated. @item skip delete @r{[}@var{range}@r{]} Delete the specified skip(s). If @var{range} is not specified, delete all diff --git a/gdb/NEWS b/gdb/NEWS index 39d99b7..2042027 100644 --- a/gdb/NEWS +++ b/gdb/NEWS @@ -34,6 +34,17 @@ skip -rfunction regular-expression glob-style file names and regular expressions for function names. Additionally, a file spec and a function spec may now be combined. +enable skip [NUMBERS AND/OR RANGES] +disable skip [NUMBERS AND/OR RANGES] +delete skip [NUMBERS AND/OR RANGES] + These commands replace the now deprecated "skip enable", "skip disable", + and "skip delete" commands. + +skip enable [NUMBERS AND/OR RANGES] +skip disable [NUMBERS AND/OR RANGES] +skip delete [NUMBERS AND/OR RANGES] + These commands are now deprecated. + maint info line-table REGEXP Display the contents of GDB's internal line table data struture. diff --git a/gdb/skip.c b/gdb/skip.c index 15681cc..12725d6 100644 --- a/gdb/skip.c +++ b/gdb/skip.c @@ -713,33 +713,31 @@ If no function name is given, skip the current function."), &skiplist); set_cmd_completer (c, location_completer); - add_cmd ("enable", class_breakpoint, skip_enable_command, _("\ -Enable skip entries. You can specify numbers (e.g. \"skip enable 1 3\"), \ -ranges (e.g. \"skip enable 4-8\"), or both (e.g. \"skip enable 1 3 4-8\").\n\n\ -If you don't specify any numbers or ranges, we'll enable all skip entries.\n\n\ -Usage: skip enable [NUMBERS AND/OR RANGES]"), - &skiplist); - - add_cmd ("disable", class_breakpoint, skip_disable_command, _("\ -Disable skip entries. You can specify numbers (e.g. \"skip disable 1 3\"), \ -ranges (e.g. \"skip disable 4-8\"), or both (e.g. \"skip disable 1 3 4-8\").\n\n\ -If you don't specify any numbers or ranges, we'll disable all skip entries.\n\n\ -Usage: skip disable [NUMBERS AND/OR RANGES]"), - &skiplist); - - add_cmd ("delete", class_breakpoint, skip_delete_command, _("\ -Delete skip entries. You can specify numbers (e.g. \"skip delete 1 3\"), \ -ranges (e.g. \"skip delete 4-8\"), or both (e.g. \"skip delete 1 3 4-8\").\n\n\ -If you don't specify any numbers or ranges, we'll delete all skip entries.\n\n\ -Usage: skip delete [NUMBERS AND/OR RANGES]"), - &skiplist); + add_cmd ("skip", class_breakpoint, skip_enable_command, + _(ENABLE_DOC_STRING ("skip", "enable skip")), + &enablelist); + add_cmd ("skip", class_breakpoint, skip_disable_command, + _(DISABLE_DOC_STRING ("skip", "disable skip")), + &disablelist); + add_cmd ("skip", class_breakpoint, skip_delete_command, + _(DELETE_DOC_STRING ("skip", "delete skip")), + &deletelist); + + /* "skip enable|disable|delete" are deprecated. */ + c = add_cmd ("enable", class_breakpoint, skip_enable_command, + _(ENABLE_DOC_STRING ("skip", "skip enable")), + &skiplist); + deprecate_cmd (c, "enable skip"); + c = add_cmd ("disable", class_breakpoint, skip_disable_command, + _(DISABLE_DOC_STRING ("skip", "skip disable")), + &skiplist); + deprecate_cmd (c, "disable skip"); + c = add_cmd ("delete", class_breakpoint, skip_delete_command, + _(DELETE_DOC_STRING ("skip", "skip delete")), + &skiplist); + deprecate_cmd (c, "delete skip"); add_info ("skip", skip_info, _("\ -Display the status of skips. You can specify numbers (e.g. \"skip info 1 3\"), \ -ranges (e.g. \"skip info 4-8\"), or both (e.g. \"skip info 1 3 4-8\").\n\n\ -If you don't specify any numbers or ranges, we'll show all skips.\n\n\ -Usage: skip info [NUMBERS AND/OR RANGES]\n\ -The \"Type\" column indicates one of:\n\ -\tfile - ignored file\n\ -\tfunction - ignored function")); +Display the status of skips.\n" +EDDI_USAGE_DOC_STRING_WITH_ALL ("skip", "info skip", "displayed"))); } diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo index 7abd55e..a4b14c9 100644 --- a/gdb/doc/gdb.texinfo +++ b/gdb/doc/gdb.texinfo @@ -5679,6 +5679,27 @@ The name or regular expression of the function to skip. If no function is specified this is @samp{}. @end table +@kindex delete skip +@item delete skip @r{[}@var{range}@r{]} +Delete the specified skip(s). If @var{range} is not specified, delete all +skips. + +@kindex enable skip +@item enable skip @r{[}@var{range}@r{]} +Enable the specified skip(s). If @var{range} is not specified, enable all +skips. + +@kindex disable skip +@item disable skip @r{[}@var{range}@r{]} +Disable the specified skip(s). If @var{range} is not specified, disable all +skips. + +@end table + +The following commands are deprecated. + +@table @code + @kindex skip delete