From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-x433.google.com (mail-wr1-x433.google.com [IPv6:2a00:1450:4864:20::433]) by sourceware.org (Postfix) with ESMTPS id C02013886C4A for ; Wed, 30 Mar 2022 10:24:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org C02013886C4A Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=embecosm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=embecosm.com Received: by mail-wr1-x433.google.com with SMTP id h23so28567050wrb.8 for ; Wed, 30 Mar 2022 03:24:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; h=date:from:to:cc:subject:in-reply-to:message-id:references :user-agent:mime-version; bh=6AWfc1O7628HKNgQp7ByTKTjL7k69vfXDi9lDiSIExo=; b=buB8yR5lTzxdp50uEXuCYjXGvRAlsmckCSA7ihYu+8PsMn24RCS9ehv6z+eJTqCDQ3 +KNmFuB5cp8Z/cC9uR+hqedT1qiCBguT4I4LVmAC1P0q0XHwo50XuQt3fs9yaNd9gWXB PZQanrWbPSv2jD4w+KWNRKErOD8LNA3EMPBEVYKve+YdK0eqJsc65id0Qm28x9IcT9Ic lbz2z/Wi11rSxrSivGtRJj/o9be2QRKnjNB1HZoPQUthcXUZKGC75yGvWUZgQwD2K0U0 EhTW/evvO/Css8W7mVs7jq3oc/9p6RhUV5M8oo2cP+KVvPmqPozx7BfzgVwxJOI+em5Z DTRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:in-reply-to:message-id :references:user-agent:mime-version; bh=6AWfc1O7628HKNgQp7ByTKTjL7k69vfXDi9lDiSIExo=; b=u80TBshEi5tdOxDJvW74BnxMJ9oayU3Eoqx/3Y3zmYOc6Epch6ywzdgKiVAw+DIU4S pGELo2KcDbl7ML+OGPvoPM6tXaj+JeT1ZiYXbDVisSaLdk+yMbZ62nyTLfrvGppPBTw4 2dnKcvymBobCeoGn+JHLsMZHYFU14XcFNf1HQTW6V80t4hlUKOz7L085+XPnt03VDcmL cbX6UNCIYqcB+A99Fo1jWEnHfI+FubNGlH86ye6s1/MSS7kyJlCWPGgYxc6sJvOByQOM ID7RdGxJSQR5q0rej3eIe+4deBeaGjleFnXpoE2Q7kuCw5rcAxwX2wS2AyKgpJQe6nDi sRvg== X-Gm-Message-State: AOAM533UCXyheowCqkGKhjYjn1Mir5MR+Q6BAFhPdfCX6LXo1oEgRK1o 68jIEFeJ/0y56wlnoj5P9akDM8DuAUo8DA== X-Google-Smtp-Source: ABdhPJxnDYB3UZ7TwfsJBCjAfjyNz95LfQc9I9Fx7qRm4xtR7KAzXbe740XsQaHjdEbR8+WdcmOKlg== X-Received: by 2002:a5d:594b:0:b0:205:ddb5:84d4 with SMTP id e11-20020a5d594b000000b00205ddb584d4mr1330523wri.200.1648635847649; Wed, 30 Mar 2022 03:24:07 -0700 (PDT) Received: from [192.168.0.201] ([212.69.42.53]) by smtp.gmail.com with ESMTPSA id q16-20020adfea10000000b00203e0735791sm17011080wrm.39.2022.03.30.03.24.07 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 30 Mar 2022 03:24:07 -0700 (PDT) Date: Wed, 30 Mar 2022 11:24:06 +0100 (BST) From: "Maciej W. Rozycki" To: gdb-patches@sourceware.org cc: Andrew Burgess , Simon Marchi , Tom Tromey , Simon Sobisch Subject: [PATCH v5 3/8] GDB: Add `NUMBER' completion to `set' integer commands In-Reply-To: Message-ID: References: User-Agent: Alpine 2.20 (DEB 67 2015-01-07) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, KAM_ASCII_DIVIDERS, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Mar 2022 10:24:10 -0000 Fix a completion consistency issue with `set' commands accepting integer values and the special `unlimited' keyword: (gdb) complete print -elements print -elements NUMBER print -elements unlimited (gdb) vs: (gdb) complete set print elements set print elements unlimited (gdb) (there is a space entered at the end of both commands, not shown here) which also means if you strike with `set print elements ' input, it will, annoyingly, complete to `set print elements unlimited' right away rather than showing a choice between `NUMBER' and `unlimited'. Add `NUMBER' then as an available completion for such `set' commands: (gdb) complete set print elements set print elements NUMBER set print elements unlimited (gdb) Adjust the testsuite accordingly. --- No change from v4. New change in v4. --- gdb/cli/cli-decode.c | 2 ++ gdb/testsuite/gdb.base/settings.exp | 8 +++++++- 2 files changed, 9 insertions(+), 1 deletion(-) gdb-integer-complete-number.diff Index: src/gdb/cli/cli-decode.c =================================================================== --- src.orig/gdb/cli/cli-decode.c +++ src/gdb/cli/cli-decode.c @@ -989,6 +989,8 @@ integer_unlimited_completer (struct cmd_ NULL, }; + if (*text == '\0') + tracker.add_completion (make_unique_xstrdup ("NUMBER")); complete_on_enum (tracker, keywords, text, word); } Index: src/gdb/testsuite/gdb.base/settings.exp =================================================================== --- src.orig/gdb/testsuite/gdb.base/settings.exp +++ src/gdb/testsuite/gdb.base/settings.exp @@ -215,8 +215,14 @@ proc test-integer {variant} { test_gdb_complete_none \ "$set_cmd " } else { + test_gdb_complete_multiple "$set_cmd " "" "" { + "NUMBER" + "unlimited" + } + test_gdb_complete_none \ + "$set_cmd 1" test_gdb_complete_unique \ - "$set_cmd " \ + "$set_cmd u" \ "$set_cmd unlimited" }