From patchwork Sat Jan 26 16:09:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luc Van Oostenryck X-Patchwork-Id: 10782503 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 08E18139A for ; Sat, 26 Jan 2019 16:10:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E73A82DF69 for ; Sat, 26 Jan 2019 16:10:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D55092DF6E; Sat, 26 Jan 2019 16:10:01 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7A1642DF69 for ; Sat, 26 Jan 2019 16:10:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726075AbfAZQKB (ORCPT ); Sat, 26 Jan 2019 11:10:01 -0500 Received: from mail-ed1-f67.google.com ([209.85.208.67]:38129 "EHLO mail-ed1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726038AbfAZQKB (ORCPT ); Sat, 26 Jan 2019 11:10:01 -0500 Received: by mail-ed1-f67.google.com with SMTP id h50so9707708ede.5 for ; Sat, 26 Jan 2019 08:09:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=VCGeenN5gU6A3hFOtzWEcuNypdpLpQOAW3xebXsDMe8=; b=KdTFFpZZcyr7eO2B0qYIVpeOhPfaUaYJBaduMlwUuTY+VhNXyJ3cJBBkxleCBI3Ip6 PzYp5b2x7pujNSRt3ijkcXGievPW4yklCC/Xkefm3gOs+8KAfR1INmHL64wUhYJDwWFt 7qpq9Xa7PbqHJdDO7Whii/uf30ZKjbrWugNPPciQNXTs5gZjIsdXLs9s6PguK72cXGrw BBB038Ke8eAbwsSnaYm844RyVrQP9v+uRjwaj4zuFz0VD/Em+HTrqW+8xof+vD2enKay w50MZoLu9cjPyYdRHAJgFDAgsPBl16+mt4luqIbRNqOL6GWXCtsS9bTZJvMaMiWAdHMA BYmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=VCGeenN5gU6A3hFOtzWEcuNypdpLpQOAW3xebXsDMe8=; b=ZwLx58u2g3qE7qVcEt8/DKRRNU9ppOZaPyh2Buj/iG6JlTCTxyxL4zMDExRM/2KCrX lkaTyZWTTGz4pPTU4gD3RtL33d3Z4THvH3joKZjOic+axdG3pm6WPgFPtP87OsffcqQ/ cJ2Kk7SDGs65mNCvvnyCaPQKT9UkIO84AMx0gR3Jw/M1wmfj7TF070JDazzUOox47xCZ EvXfQeJqNzfSmjWaMnQAERQU0Betk5isi+QXuTw18bqFaNGA+Y6Hqv1jKYoYPxVL+bCJ q6NgYh+NkMv0QTNDV8NB0dqKT7gDlUsey9F8LACIPw1YZOJRwpJ+w7t1RAPN2RSXjBlr HZrw== X-Gm-Message-State: AJcUukdUjuEyn146rqpKfR85UFSYHJr1agINN2/YIX54CyCSSLBTXFJU sS5V4SArMBwxOePanI+b9/YNvcZE X-Google-Smtp-Source: ALg8bN43QrzgxmrXwunWAhgEp1tMARuMMYV39Wzx57OIXalJWPjIEL2DY3QrSVEjo4f2Zj3xVPJapw== X-Received: by 2002:a17:906:791:: with SMTP id l17mr13005332ejc.76.1548518998979; Sat, 26 Jan 2019 08:09:58 -0800 (PST) Received: from localhost.localdomain ([2a02:a03f:40eb:400:288e:c567:deda:96dc]) by smtp.gmail.com with ESMTPSA id l41sm12954765eda.83.2019.01.26.08.09.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 26 Jan 2019 08:09:58 -0800 (PST) From: Luc Van Oostenryck To: linux-sparse@vger.kernel.org Cc: Luc Van Oostenryck Subject: [PATCH 1/2] string: add helper string_expression() Date: Sat, 26 Jan 2019 17:09:47 +0100 Message-Id: <20190126160948.54590-2-luc.vanoostenryck@gmail.com> X-Mailer: git-send-email 2.20.0 In-Reply-To: <20190126160948.54590-1-luc.vanoostenryck@gmail.com> References: <20190126160948.54590-1-luc.vanoostenryck@gmail.com> MIME-Version: 1.0 Sender: linux-sparse-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sparse@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This will help to detect earlier syntax errors concerning string constants. Signed-off-by: Luc Van Oostenryck --- expression.c | 11 +++++++++++ expression.h | 1 + 2 files changed, 12 insertions(+) diff --git a/expression.c b/expression.c index f955fb159..ffb6cb9dc 100644 --- a/expression.c +++ b/expression.c @@ -83,6 +83,17 @@ struct token *parens_expression(struct token *token, struct expression **expr, c return expect(token, ')', where); } +struct token *string_expression(struct token *token, struct expression **expr, const char *where) +{ + struct token *next = primary_expression(token, expr); + + if (!*expr || (*expr)->type != EXPR_STRING) { + sparse_error(token->pos, "string literal expected for %s", where); + *expr = NULL; + } + return next; +} + /* * Handle __func__, __FUNCTION__ and __PRETTY_FUNCTION__ token * conversion diff --git a/expression.h b/expression.h index ed6f4d65d..13f35e64b 100644 --- a/expression.h +++ b/expression.h @@ -270,6 +270,7 @@ struct token *parse_expression(struct token *token, struct expression **tree); struct token *conditional_expression(struct token *token, struct expression **tree); struct token *primary_expression(struct token *token, struct expression **tree); struct token *parens_expression(struct token *token, struct expression **expr, const char *where); +struct token *string_expression(struct token *token, struct expression **expr, const char *where); struct token *assignment_expression(struct token *token, struct expression **tree); extern int expand_symbol(struct symbol *); From patchwork Sat Jan 26 16:09:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luc Van Oostenryck X-Patchwork-Id: 10782505 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2C6031399 for ; Sat, 26 Jan 2019 16:10:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1AA0B2DF69 for ; Sat, 26 Jan 2019 16:10:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0D8962DF6E; Sat, 26 Jan 2019 16:10:04 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9FB792DF69 for ; Sat, 26 Jan 2019 16:10:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726076AbfAZQKD (ORCPT ); Sat, 26 Jan 2019 11:10:03 -0500 Received: from mail-ed1-f68.google.com ([209.85.208.68]:38134 "EHLO mail-ed1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726038AbfAZQKD (ORCPT ); Sat, 26 Jan 2019 11:10:03 -0500 Received: by mail-ed1-f68.google.com with SMTP id h50so9707757ede.5 for ; Sat, 26 Jan 2019 08:10:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=oCZZboOVVm8WI+v94EPbUtBpR9iMWTI+05WRt9epeMg=; b=IdCI+5nj8pVyyAvfjAafy/C5rh5tZTQ/AHhhZ5n8d5QCJekOoI3H/6P1fi0VJdzdDJ NiI2JXf1kAEeJQYqSLs35YtxBxZOE42NYrrGqVrLID+RTIE8S1UYpRjDw93Kvukv/3gq D3yDx8iQS2OXGvONX1ZOTI83A8kxk49kuBeaPSQaT+3H+9JPB86ZccJh/DyiVOTBXQTO r4uXFv8xDodxxZ6luFtz5XJJMofwmO/jNxoRhZIi5vayoBLNwmeMHZm/p/Rfo5S+Q/Wf tqYZKF5P66TLZHpyk9JovDTfpoLx9tdO67JrhSojfpdcDxXq1hwbLCiLmDol+slN73KX 5FfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=oCZZboOVVm8WI+v94EPbUtBpR9iMWTI+05WRt9epeMg=; b=os0vL8hL1HTsVogGDC4fwu3tDULxtox7npn9xyKaVS4xTAsF4/HqyR3xXki5BtqQcE JnF/BRTvMEZwgiECQuqScypNjuEh1i9aIGdw5hwluG1ZvNnZtFBk9OTcePUZYR04Gmrm UNtPZEaVwmRwvzUwQw1VIhCxu4agqztC0lFrzuqD+fRXoXCDfvqnleiT8+pzeYbtzOHc 0lYooqLx2O9iUrGrYX/d4kyr6PKznoR8FWqZ7Z8LU7a/y/EiB+z+KzavaPXQQIQF8cD0 mGEvlwHlxFQJd93Z9lHELlxCimGNHtRchuS/zNGSSBqqvHrEJZOVY+omy4JH4BvpqlX6 qTMA== X-Gm-Message-State: AJcUukcL3cBQJkQL3hjoJEdP3BviMgvzxdv0oH0QErftzlbF7ux8ynMH bAWTtFHl5VeCEmn1UD4+tMutUH73 X-Google-Smtp-Source: ALg8bN7PJ49bQPAx/Dbc33oNp0wvJ6paFMViGCouI0AKQB49UzR/Nog1P+HzoRyaw32B9NnktqICGQ== X-Received: by 2002:a50:ec19:: with SMTP id g25mr14704631edr.38.1548519001042; Sat, 26 Jan 2019 08:10:01 -0800 (PST) Received: from localhost.localdomain ([2a02:a03f:40eb:400:288e:c567:deda:96dc]) by smtp.gmail.com with ESMTPSA id l41sm12954765eda.83.2019.01.26.08.10.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 26 Jan 2019 08:10:00 -0800 (PST) From: Luc Van Oostenryck To: linux-sparse@vger.kernel.org Cc: Luc Van Oostenryck Subject: [PATCH 2/2] string: use string_expression() in parse_static_assert() Date: Sat, 26 Jan 2019 17:09:48 +0100 Message-Id: <20190126160948.54590-3-luc.vanoostenryck@gmail.com> X-Mailer: git-send-email 2.20.0 In-Reply-To: <20190126160948.54590-1-luc.vanoostenryck@gmail.com> References: <20190126160948.54590-1-luc.vanoostenryck@gmail.com> MIME-Version: 1.0 Sender: linux-sparse-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sparse@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The error handling during the parsing of _Static_assert()'s message string is relatively complex. Simplify this by using the new helper string_expression(). Signed-off-by: Luc Van Oostenryck --- parse.c | 9 ++------- validation/static_assert.c | 6 +++--- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/parse.c b/parse.c index 795434322..401f91a1f 100644 --- a/parse.c +++ b/parse.c @@ -2132,14 +2132,9 @@ static struct token *parse_static_assert(struct token *token, struct symbol_list if (!cond) sparse_error(token->pos, "Expected constant expression"); token = expect(token, ',', "after conditional expression in _Static_assert"); - token = parse_expression(token, &message); - if (!message || message->type != EXPR_STRING) { - struct position pos; - - pos = message ? message->pos : token->pos; - sparse_error(pos, "bad or missing string literal"); + token = string_expression(token, &message, "_Static_assert()"); + if (!message) cond = NULL; - } token = expect(token, ')', "after diagnostic message in _Static_assert"); token = expect(token, ';', "after _Static_assert()"); diff --git a/validation/static_assert.c b/validation/static_assert.c index d9e96294f..dd5e0c08c 100644 --- a/validation/static_assert.c +++ b/validation/static_assert.c @@ -61,11 +61,11 @@ static_assert.c:19:16: error: static assertion failed: "expected assertion failu static_assert.c:22:16: error: bad constant expression static_assert.c:25:16: error: bad constant expression static_assert.c:27:16: error: bad constant expression -static_assert.c:35:19: error: bad or missing string literal +static_assert.c:35:19: error: string literal expected for _Static_assert() static_assert.c:37:18: error: bad constant expression -static_assert.c:52:19: error: bad or missing string literal +static_assert.c:52:19: error: string literal expected for _Static_assert() static_assert.c:53:16: error: Expected constant expression static_assert.c:54:16: error: Expected constant expression -static_assert.c:54:17: error: bad or missing string literal +static_assert.c:54:17: error: string literal expected for _Static_assert() * check-error-end */