From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id GFsYJJqKO2FgMgAAWB0awg (envelope-from ) for ; Fri, 10 Sep 2021 12:40:58 -0400 Received: by simark.ca (Postfix, from userid 112) id 812571EE23; Fri, 10 Sep 2021 12:40:58 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,MAILING_LIST_MULTI,RDNS_DYNAMIC,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from sourceware.org (ip-8-43-85-97.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id A0FDA1ECEB for ; Fri, 10 Sep 2021 12:40:57 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 15D033851C34 for ; Fri, 10 Sep 2021 16:40:57 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 15D033851C34 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1631292057; bh=08n3M83rnMCkB2uzJaBBOrtdEEC8Oht3liCTdpo3cTk=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=jAam4qeO5bMvMz8o38iRJP7lREBIGkONylphsac8VESRb2SujWJHeZ4YvvU2foAjY KEaeBM5XZAEY1V4kUJvl5cVo5fx10/1G95XlTLZm2hBvpjFMIy0i/pcPQPo/z5AEsE XfLJpDSRmjMVMmGswgv3cCIn2VxOS2Dm0M/G64l0= Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by sourceware.org (Postfix) with ESMTPS id 4B80E3861812 for ; Fri, 10 Sep 2021 16:39:43 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 4B80E3861812 Received: from imap1.suse-dmz.suse.de (imap1.suse-dmz.suse.de [192.168.254.73]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 71A5422469 for ; Fri, 10 Sep 2021 16:39:42 +0000 (UTC) Received: from imap1.suse-dmz.suse.de (imap1.suse-dmz.suse.de [192.168.254.73]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap1.suse-dmz.suse.de (Postfix) with ESMTPS id 5D5791365E for ; Fri, 10 Sep 2021 16:39:42 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap1.suse-dmz.suse.de with ESMTPSA id oXPEFU6KO2EYIgAAGKfGzw (envelope-from ) for ; Fri, 10 Sep 2021 16:39:42 +0000 Date: Fri, 10 Sep 2021 18:39:40 +0200 To: gdb-patches@sourceware.org Subject: [committed][gdb/testsuite] Add string_list_to_regexp Message-ID: <20210910163933.GA15593@delia.home> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.10.1 (2018-07-13) 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: , From: Tom de Vries via Gdb-patches Reply-To: Tom de Vries Errors-To: gdb-patches-bounces+public-inbox=simark.ca@sourceware.org Sender: "Gdb-patches" Hi, A regexp pattern with escapes like this is hard to read: ... set re "~\"\[$\]$decimal = 1\\\\n\"\r\n\\^done" ... We can make it more readable by spacing out parts (which allows us to also use the curly braces where that's convenient): ... set re [list "~" {"} {[$]} $decimal " = 1" "\\\\" "n" {"} "\r\n" "\\^" "done"] set re [join $re ""] ... or by using string_to_regexp: ... set re [list \ [string_to_regexp {~"$}] \ $decimal \ [string_to_regexp " = 1\\n\"\r\n^done"]] set re [join $re ""] ... Note: we have to avoid applying string_to_list to decimal, which is already a regexp. Add a proc string_list_to_regexp to make it easy to do both: ... set re [list \ [string_list_to_regexp ~ {"} $] \ $decimal \ [string_list_to_regexp " = 1" \\ n {"} \r\n ^ done]] ... Also add a test-case gdb.testsuite/string_to_regexp.exp. Committed to trunk. Thanks, - Tom [gdb/testsuite] Add string_list_to_regexp --- gdb/testsuite/gdb.testsuite/string_to_regexp.exp | 66 ++++++++++++++++++++++++ gdb/testsuite/lib/gdb-utils.exp | 12 +++++ 2 files changed, 78 insertions(+) diff --git a/gdb/testsuite/gdb.testsuite/string_to_regexp.exp b/gdb/testsuite/gdb.testsuite/string_to_regexp.exp new file mode 100644 index 00000000000..2dfd2db5868 --- /dev/null +++ b/gdb/testsuite/gdb.testsuite/string_to_regexp.exp @@ -0,0 +1,66 @@ +# Copyright 2021 Free Software Foundation, Inc. +# 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 . + +# Testsuite self-tests for string_to_regexp/string_list_to_regexp. +# The former is not explicitly tested, assuming string_list_to_regexp uses +# string_to_regexp. + +set test_nr 0 + +proc test_regexp { args } { + global test_nr + incr test_nr + + set fargs {} + set farg 1 + foreach arg $args { + if { $farg } { + if { $arg == "--" } { + set farg 0 + continue + } + lappend fargs $arg + } else { + set re $arg + break + } + } + set res [string_list_to_regexp {*}$fargs] + + set test "#$test_nr: got expected re" + if { $res eq $re } { + pass $test + } else { + verbose -log "Expecting '$re'" + verbose -log "Got '$res'" + fail $test + } + + set test "#$test_nr: re matches string" + set str [join $fargs ""] + if { [regexp $re $str] } { + pass $test + } else { + verbose -log "Matching '$str'" + verbose -log "Failed against '$re'" + fail $test + } +} + +test_regexp abc -- abc +test_regexp abc def -- abcdef +test_regexp {\\} -- {\\\\} +test_regexp "\n" -- "\n" +test_regexp {\n} -- {\\n} +test_regexp {\\} n -- {\\\\n} diff --git a/gdb/testsuite/lib/gdb-utils.exp b/gdb/testsuite/lib/gdb-utils.exp index cec157196b3..42452d93b56 100644 --- a/gdb/testsuite/lib/gdb-utils.exp +++ b/gdb/testsuite/lib/gdb-utils.exp @@ -38,6 +38,18 @@ proc string_to_regexp {str} { return $result } +# Given a list of strings, adds backslashes as needed to each string to +# create a regexp that will match the string, and join the result. + +proc string_list_to_regexp { args } { + set result "" + foreach arg $args { + set arg [string_to_regexp $arg] + append result $arg + } + return $result +} + # Wrap STR in an ANSI terminal escape sequences -- one to set the # style to STYLE, and one to reset the style to the default. The # return value is suitable for use as a regular expression.