From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from outbound-ss-761.bluehost.com (outbound-ss-761.bluehost.com [74.220.211.250]) by sourceware.org (Postfix) with ESMTPS id 198DA388451F for ; Fri, 18 Mar 2022 04:44:54 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 198DA388451F Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=tromey.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=tromey.com Received: from cmgw13.mail.unifiedlayer.com (unknown [10.0.90.128]) by progateway8.mail.pro1.eigbox.com (Postfix) with ESMTP id 45C57100421A4 for ; Fri, 18 Mar 2022 04:44:53 +0000 (UTC) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTP id V4TsnZVyBY8ycV4TsnBSAI; Fri, 18 Mar 2022 04:44:53 +0000 X-Authority-Reason: nr=8 X-Authority-Analysis: v=2.4 cv=ff9od2cF c=1 sm=1 tr=0 ts=62340e45 a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=dLZJa+xiwSxG16/P+YVxDGlgEgI=:19 a=o8Y5sQTvuykA:10:nop_rcvd_month_year a=Qbun_eYptAEA:10:endurance_base64_authed_username_1 a=BzU9XKeN5WEV6zfRhbYA:9 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=Content-Transfer-Encoding:MIME-Version:Message-Id:Date:Subject: Cc:To:From:Sender:Reply-To:Content-Type:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=pAxYmtla+0tS7lyaDIfv4m8ajDYwFZ/nmEqOVU3vmw8=; b=BMpEsa9ASeRFpcc44DGgLwgBWh L9x5nX0HSLFYJgPUYu26gUW4wcropMDiLuyJgLvdB8dMCPef9Aw65GKxX1P3VUvmeuSGVhhxqV3p1 hOlJQesfgX5vqtrY0ZBjZXwv4; Received: from 71-211-175-224.hlrn.qwest.net ([71.211.175.224]:53814 helo=prentzel.Home) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1nV4Ts-002WFG-6V; Thu, 17 Mar 2022 22:44:52 -0600 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH] Add Rust parser check for end of expression Date: Thu, 17 Mar 2022 22:44:50 -0600 Message-Id: <20220318044450.221851-1-tom@tromey.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - box5379.bluehost.com X-AntiAbuse: Original Domain - sourceware.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - tromey.com X-BWhitelist: no X-Source-IP: 71.211.175.224 X-Source-L: No X-Exim-ID: 1nV4Ts-002WFG-6V X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 71-211-175-224.hlrn.qwest.net (prentzel.Home) [71.211.175.224]:53814 X-Source-Auth: tom+tromey.com X-Email-Count: 1 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3030.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham 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: Fri, 18 Mar 2022 04:44:55 -0000 I noticed that "print 5," passed in Rust -- the parser wasn't checking that the entire input was used. This patch fixes the problem. This in turn pointed out another bug in the parser, namely that it didn't lex the next token after handling a string token. This is also fixed here. --- gdb/rust-parse.c | 6 +++++- gdb/testsuite/gdb.rust/expr.exp | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/gdb/rust-parse.c b/gdb/rust-parse.c index 4006df7086b..7d7d882872c 100644 --- a/gdb/rust-parse.c +++ b/gdb/rust-parse.c @@ -271,7 +271,10 @@ struct rust_parser operation_up parse_entry_point () { lex (); - return parse_expr (); + operation_up result = parse_expr (); + if (current_token != 0) + error (_("Syntax error near '%s'"), pstate->prev_lexptr); + return result; } operation_up parse_tuple (); @@ -2020,6 +2023,7 @@ rust_parser::parse_atom (bool required) case STRING: result = parse_string (); + lex (); break; case BYTESTRING: diff --git a/gdb/testsuite/gdb.rust/expr.exp b/gdb/testsuite/gdb.rust/expr.exp index 0c445897338..bb0222bed4b 100644 --- a/gdb/testsuite/gdb.rust/expr.exp +++ b/gdb/testsuite/gdb.rust/expr.exp @@ -145,3 +145,5 @@ gdb_test "print 0x0 as fn(i64) -> ()" " = \\\(\\*mut fn \\\(i64\\\) -> \\\(\\\)\ gdb_test "print r#" "No symbol 'r' in current context" gdb_test "printf \"%d %d\\n\", 23+1, 23-1" "24 22" + +gdb_test "print 5," "Syntax error near ','" -- 2.34.1