From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id ESONNR2Smmr7/ScAWB0awg (envelope-from ) for ; Fri, 04 Sep 2026 05:40:45 -0400 Authentication-Results: simark.ca; dkim=pass (1024-bit key; unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=u4le2Kq9; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=Fwz2o94e; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=m9dem+mn; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=2mQ5QowH; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id CF8E51E166; Fri, 04 Sep 2026 05:40:45 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-25) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-2.4 required=5.0 tests=ARC_SIGNED,ARC_VALID,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED,RCVD_IN_VALIDITY_CERTIFIED_BLOCKED, RCVD_IN_VALIDITY_RPBL_BLOCKED,RCVD_IN_VALIDITY_SAFE_BLOCKED autolearn=ham autolearn_force=no version=4.0.1 Received: from vm01.sourceware.org (vm01.sourceware.org [38.145.34.32]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id EF5CB1E09B for ; Fri, 04 Sep 2026 05:40:44 -0400 (EDT) Received: from vm01.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 875974901425 for ; Fri, 4 Sep 2026 09:40:44 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 875974901425 Authentication-Results: sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=u4le2Kq9; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=Fwz2o94e; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=m9dem+mn; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=2mQ5QowH Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) by sourceware.org (Postfix) with ESMTPS id EAA7A4C31896 for ; Fri, 4 Sep 2026 09:39:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org EAA7A4C31896 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org EAA7A4C31896 Authentication-Results: sourceware.org; arc=none smtp.remote-ip=195.135.223.130 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1788514749; cv=none; b=YdjMmBHOREr2omgV1k1A4zg30J2EFWnn4Nx/il8RIFgDB35ZLNY7sNl1V15XWgvwgN1oO9R0QwoBw0oIx+QPHYE8UlF5E5Yt+LKu3zJ9TU1ZNY9Zt+tjYE4FNsedJYQr0RrIzydF37Y1vQSyXmfBGgcZvtBlo2L1T8/ZYJohXnU= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1788514749; c=relaxed/simple; bh=RYZT2lg18eyPlhUVwrA5rGl2nhJpilatoZUZvJtWixw=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-ID:MIME-Version; b=ixNQRgD8YK0aVdsF9nKOR0XKpw706NzKGgajWNTkcEOFvPeLqvDSgiJW6YJRBniOfEEOlvm43mBGBBu4d47wtwcP2zrUPsa70HI1Ht01rfU1kAtNbOiLqhPcIIo37z4SsTmXwsF57+ixYxQbJE7q0kGuLmN6sigTrjjfCRg5Fwk= ARC-Authentication-Results: i=1; sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=u4le2Kq9; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=Fwz2o94e; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=m9dem+mn; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=2mQ5QowH DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org EAA7A4C31896 Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id D4F6722C8E for ; Fri, 4 Sep 2026 09:38:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1788514744; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=LqvYaEnWSP4BlXm6s9rvGVeO/gN5xXool1TWSERWZI4=; b=u4le2Kq9XwPCij4mf8mU3Zb0H+aMPuq0sLbeDp+mLsKhE13I0DyZa9rI9P+AJNSIzuBLLp 5pBpGHl3lNeEGIAeVkwtTml59Zk2ADc7oPrGEggdW94ockmNNDCFUY1kFQxW0mHltBAjc2 urb4UTr6fmTM8lPBZ3aB12OMd809QDA= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1788514744; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=LqvYaEnWSP4BlXm6s9rvGVeO/gN5xXool1TWSERWZI4=; b=Fwz2o94ejmIDXOq83uEmeaTbXOVfAszG/i/wZck10ydduPj5G7rkN9RWX7sjxso7/i9Dgd lOLlE/liviy5kHAw== Authentication-Results: smtp-out1.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=m9dem+mn; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=2mQ5QowH DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1788514739; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=LqvYaEnWSP4BlXm6s9rvGVeO/gN5xXool1TWSERWZI4=; b=m9dem+mngt1cTmo48Z4cKFpTIP21WPj1CXTdETs9bpMdcZArxdPPduKHhvWzHPZnhs4wJs +afNQSLdNP7Coue0lCx3U+YcVOgTLI6HO1UGs0RudIuLkXs5NkFZFIVceJ8cJlGXOh68kY mOPwue0b+HfXUTt8XIJf693Qv+oji5M= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1788514739; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=LqvYaEnWSP4BlXm6s9rvGVeO/gN5xXool1TWSERWZI4=; b=2mQ5QowHnPNjk77zFtxXBeyp5+fIb4SS7T3pb0oJm8LJLsg0DwYddDFxaQtJ7Tn3V4yzWO /2/XSAlfUAniqqDA== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 75DF513736 for ; Fri, 4 Sep 2026 09:38:59 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id EPxzG7ORmmqyFQAAD6G6ig (envelope-from ) for ; Fri, 04 Sep 2026 09:38:59 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [RFC 3/5] [gdb/testsuite] Update regexp in string_to_regexp Date: Fri, 4 Sep 2026 11:38:53 +0200 Message-ID: <20260904093858.359604-3-tdevries@suse.de> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260904093858.359604-1-tdevries@suse.de> References: <20260904093858.359604-1-tdevries@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Action: no action X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Rspamd-Queue-Id: D4F6722C8E X-Spamd-Result: default: False [-3.01 / 50.00]; BAYES_HAM(-3.00)[99.99%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.20)[-0.999]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; MIME_TRACE(0.00)[0:+]; FROM_HAS_DN(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; RCVD_TLS_ALL(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:dkim,suse.de:mid]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; RCVD_COUNT_TWO(0.00)[2]; TO_DN_NONE(0.00)[]; DWL_DNSWL_BLOCKED(0.00)[suse.de:dkim]; DNSWL_BLOCKED(0.00)[2a07:de40:b281:104:10:150:64:97:from]; DKIM_TRACE(0.00)[suse.de:+] X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces~public-inbox=simark.ca@sourceware.org There are two similar regexps, in string_to_regexp and with_gdb_prompt: ... regsub -all {[]?*+.|(){}^$\[\\]} $str {\\&} result regsub -all {[]*+.|()^$\[\\]} $prompt {\\&} prompt ... In both cases, emacs tcl-mode has problems with it: auto indent doesn't continue at column 4, but is reset to column 0. The first regexp is basically one big bracket expression containing the chars: ... ] ? * + . | ( ) { } ^ $ \[ \\ ... There are a couple of ways that a ']' can be enclosed in a bracket expression [1]: - make it the first char - escape using backslash - make it a collating element The first solution was chosen, but confuses tcl-mode. Fix this by adding a backslash. [1] https://www.tcl-lang.org/man/tcl8.6/TclCmd/re_syntax.htm#M30 --- gdb/testsuite/lib/gdb-utils.exp | 4 +++- gdb/testsuite/lib/gdb.exp | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/gdb/testsuite/lib/gdb-utils.exp b/gdb/testsuite/lib/gdb-utils.exp index cabeb7aa1ed..874de79e6d8 100644 --- a/gdb/testsuite/lib/gdb-utils.exp +++ b/gdb/testsuite/lib/gdb-utils.exp @@ -36,7 +36,9 @@ proc gdb_init_commands {} { proc string_to_regexp {str} { set result $str - regsub -all {[]?*+.|(){}^$\[\\]} $str {\\&} result + # We use a backslash to escape the closing square bracket, even if it's + # the first character, to unconfuse emacs tcl-mode. + regsub -all {[\]?*+.|(){}^$\[\\]} $str {\\&} result return $result } diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index d4a471ff7c4..b0a4cc1b39f 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -3650,7 +3650,9 @@ proc with_gdb_prompt { prompt body } { # we start recording both forms separately instead of just $gdb_prompt. # The testsuite is pretty-much hardwired to interpret $gdb_prompt as the # regexp form. - regsub -all {[]*+.|()^$\[\\]} $prompt {\\&} prompt + # We use a backslash to escape the closing square bracket, even if it's + # the first character, to unconfuse emacs tcl-mode. + regsub -all {[\]*+.|()^$\[\\]} $prompt {\\&} prompt set saved $gdb_prompt -- 2.51.0