From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-x434.google.com (mail-wr1-x434.google.com [IPv6:2a00:1450:4864:20::434]) by sourceware.org (Postfix) with ESMTPS id 0B122383E289 for ; Tue, 21 Feb 2023 12:04:29 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 0B122383E289 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-x434.google.com with SMTP id l25so3760014wrb.3 for ; Tue, 21 Feb 2023 04:04:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; h=content-transfer-encoding:mime-version:reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=/oYp8jF2uc87zQ4BIwzSVGsJWwZZH6ku80iNX1kdNpQ=; b=giQwnrqfvzvXr4kxMaVNHGwFuqrZpaIn5aVPiv+VRsnPmfmtnSA5Y5JEFmif+/QUzA 0JKt880IWcs41jfHFvZCcPhfI1IYUZ23K/qN/bDSouSuyICmHrtFYBPFZSopK2xQatar w9PKvPERDzIf+T4wEPob2yE9YlL2/FCWoj7lLULbHkCi3ap3qtb/iLeyhKSHCnFCAPrV 02xlX6QQKcyen0GXoe+NH0GJR7dJfd1vliyL012SYMKX7W3t4hKlb3k/1TKH6LQzI9Mo rip9Zin04y8G6915u+KIkW5RaTbwXoC+5vGldXeLYFjuXhbiXTNr2aBsF/UcMIJKWjPw hVfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=/oYp8jF2uc87zQ4BIwzSVGsJWwZZH6ku80iNX1kdNpQ=; b=U8w7ag+pgTiJNZjkID90VE7W3P3ufgei7w/jztBmgGC4wzFpQaPC/cjkLDzXD5Hg92 dOhyCRES+QY/7M7t25TRBxLRn9ChIssENhEetjjaq9gmun9DI1Ask5P/zxYzTlNB5vSX YDvZRJ4qseFi0SS8CSh6c4WDrO3CP2bm/G7MOaVaBoQtOvfdH38gWcYFHa6z/17RNH4/ GnLxgQe9a5qRaBEQMMI0kkbjHwDApJiq1uwwyTVPiy5C7+V0+nCWxosPtYhgdKEcOfjQ H9zrO437e4XTKnpcbcM39JjU2UJWZZGqbikLdU3Z2AiIByobMVYdfEYF9B1aq7S1QCQE TDzA== X-Gm-Message-State: AO0yUKW53c1Cd8TwILzrS8OXbUIu816xZ7LcbSdjCDHWa73ShUFit2SC /V2eNRBtk370jnFJJNIFPg92ZOlqwK/U7RiyWQ== X-Google-Smtp-Source: AK7set/VzhVM2pqXCTO0Qs+k2IyoWtcHJS3Q1Nl9R9yjogjIZfwOByEJJyrvuLRhR6EZPGlaXXhxjA== X-Received: by 2002:a05:6000:1205:b0:2c7:454:cee3 with SMTP id e5-20020a056000120500b002c70454cee3mr1692700wrx.7.1676981068653; Tue, 21 Feb 2023 04:04:28 -0800 (PST) Received: from platypus.localdomain ([62.23.166.218]) by smtp.gmail.com with ESMTPSA id c15-20020adffb4f000000b002c55b0e6ef1sm5013811wrs.4.2023.02.21.04.04.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Feb 2023 04:04:28 -0800 (PST) From: arthur.cohen@embecosm.com To: gcc-patches@gcc.gnu.org Cc: gcc-rust@gcc.gnu.org, Jakub Dupak Subject: [committed 080/103] gccrs: ast: Dump bare function type Date: Tue, 21 Feb 2023 13:02:10 +0100 Message-Id: <20230221120230.596966-81-arthur.cohen@embecosm.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230221120230.596966-1-arthur.cohen@embecosm.com> References: <20230221120230.596966-1-arthur.cohen@embecosm.com> Reply-To: arthur.cohen@embecosm.com MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-14.7 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: From: Jakub Dupak + Return FunctionQualifiers as ref to work in ast dump gcc/rust/ChangeLog: * ast/rust-ast-dump.cc (Dump::visit): Add missing visitor. * ast/rust-ast-dump.h: Add missing getter declaration. * ast/rust-ast-full-test.cc (BareFunctionType::as_string): Fix bare function string representation. * ast/rust-type.h (class BareFunctionType): Declare said getter. Signed-off-by: Jakub Dupak --- gcc/rust/ast/rust-ast-dump.cc | 94 +++++++++++++++++++++++++++++- gcc/rust/ast/rust-ast-dump.h | 2 + gcc/rust/ast/rust-ast-full-test.cc | 2 +- gcc/rust/ast/rust-type.h | 22 +++++-- 4 files changed, 111 insertions(+), 9 deletions(-) diff --git a/gcc/rust/ast/rust-ast-dump.cc b/gcc/rust/ast/rust-ast-dump.cc index a37d5addbc4..5dae38ccef9 100644 --- a/gcc/rust/ast/rust-ast-dump.cc +++ b/gcc/rust/ast/rust-ast-dump.cc @@ -249,6 +249,56 @@ Dump::visit (std::vector &for_lifetimes) stream << "> "; } +void +Dump::visit (FunctionQualifiers &qualifiers) +{ + // Syntax: + // `const`? `async`? `unsafe`? (`extern` Abi?)? + // unsafe? (extern Abi?)? + + switch (qualifiers.get_const_status ()) + { + case NONE: + break; + case CONST_FN: + stream << "const "; + break; + case ASYNC_FN: + stream << "async "; + break; + } + + if (qualifiers.is_unsafe ()) + stream << "unsafe "; + if (qualifiers.is_extern ()) + { + stream << "extern "; + if (qualifiers.has_abi ()) + stream << "\"" << qualifiers.get_extern_abi () << "\" "; + } +} // namespace AST + +void +Dump::visit (MaybeNamedParam ¶m) +{ + // Syntax: + // OuterAttribute* ( ( IDENTIFIER | _ ) : )? Type + + visit_items_joined_by_separator (param.get_outer_attrs (), " "); + switch (param.get_param_kind ()) + { + case MaybeNamedParam::UNNAMED: + break; + case MaybeNamedParam::IDENTIFIER: + stream << " " << param.get_name () << ": "; + break; + case MaybeNamedParam::WILDCARD: + stream << " _: "; + break; + } + visit (param.get_type ()); +} + void Dump::visit (Token &tok) { @@ -1668,8 +1718,48 @@ Dump::visit (InferredType &) } void -Dump::visit (BareFunctionType &) -{} +Dump::visit (BareFunctionType &type) +{ + // Syntax: + // ForLifetimes? FunctionTypeQualifiers fn + // ( FunctionParametersMaybeNamedVariadic? ) BareFunctionReturnType? + // + // BareFunctionReturnType: + // -> TypeNoBounds + // + // FunctionParametersMaybeNamedVariadic : + // MaybeNamedFunctionParameters | MaybeNamedFunctionParametersVariadic + // + // MaybeNamedFunctionParameters : + // MaybeNamedParam ( , MaybeNamedParam )* ,? + // + // MaybeNamedFunctionParametersVariadic : + // ( MaybeNamedParam , )* MaybeNamedParam , OuterAttribute* ... + + if (type.has_for_lifetimes ()) + visit (type.get_for_lifetimes ()); + + visit (type.get_function_qualifiers ()); + + stream << "fn ("; + + visit_items_joined_by_separator (type.get_function_params (), ", "); + + if (type.is_variadic ()) + { + stream << ", "; + visit_items_joined_by_separator (type.get_variadic_attr (), " "); + stream << "..."; + } + + stream << ')'; + + if (type.has_return_type ()) + { + stream << " -> "; + visit (type.get_return_type ()); + } +} } // namespace AST } // namespace Rust diff --git a/gcc/rust/ast/rust-ast-dump.h b/gcc/rust/ast/rust-ast-dump.h index 2bd3b31d09a..6c2f13c8c01 100644 --- a/gcc/rust/ast/rust-ast-dump.h +++ b/gcc/rust/ast/rust-ast-dump.h @@ -137,6 +137,8 @@ private: void visit (MacroRule &rule); void visit (WhereClause &rule); void visit (std::vector &for_lifetimes); + void visit (FunctionQualifiers &qualifiers); + void visit (MaybeNamedParam ¶m); // rust-ast.h void visit (Token &tok); diff --git a/gcc/rust/ast/rust-ast-full-test.cc b/gcc/rust/ast/rust-ast-full-test.cc index a4e059f1c0c..4f593dcbd49 100644 --- a/gcc/rust/ast/rust-ast-full-test.cc +++ b/gcc/rust/ast/rust-ast-full-test.cc @@ -3071,7 +3071,7 @@ BareFunctionType::as_string () const } str += "\n Is variadic: "; - if (is_variadic) + if (_is_variadic) str += "true"; else str += "false"; diff --git a/gcc/rust/ast/rust-type.h b/gcc/rust/ast/rust-type.h index 05a78956b57..efe59bd6f79 100644 --- a/gcc/rust/ast/rust-type.h +++ b/gcc/rust/ast/rust-type.h @@ -835,7 +835,7 @@ public: }; /* A function pointer type - can be created via coercion from function items and - * non- capturing closures. */ + * non-capturing closures. */ class BareFunctionType : public TypeNoBounds { // bool has_for_lifetimes; @@ -844,7 +844,7 @@ class BareFunctionType : public TypeNoBounds FunctionQualifiers function_qualifiers; std::vector params; - bool is_variadic; + bool _is_variadic; std::vector variadic_attrs; // bool has_return_type; @@ -860,6 +860,16 @@ public: // Whether the function has ForLifetimes. bool has_for_lifetimes () const { return !for_lifetimes.empty (); } + std::vector &get_for_lifetimes () { return for_lifetimes; } + + bool is_variadic () const { return _is_variadic; } + + std::vector &get_variadic_attr () { return variadic_attrs; }; + const std::vector &get_variadic_attr () const + { + return variadic_attrs; + }; + BareFunctionType (std::vector lifetime_params, FunctionQualifiers qualifiers, std::vector named_params, bool is_variadic, @@ -867,7 +877,7 @@ public: std::unique_ptr type, Location locus) : for_lifetimes (std::move (lifetime_params)), function_qualifiers (std::move (qualifiers)), - params (std::move (named_params)), is_variadic (is_variadic), + params (std::move (named_params)), _is_variadic (is_variadic), variadic_attrs (std::move (variadic_attrs)), return_type (std::move (type)), locus (locus) { @@ -879,7 +889,7 @@ public: BareFunctionType (BareFunctionType const &other) : for_lifetimes (other.for_lifetimes), function_qualifiers (other.function_qualifiers), params (other.params), - is_variadic (other.is_variadic), variadic_attrs (other.variadic_attrs), + _is_variadic (other._is_variadic), variadic_attrs (other.variadic_attrs), locus (other.locus) { // guard to prevent null dereference @@ -893,7 +903,7 @@ public: for_lifetimes = other.for_lifetimes; function_qualifiers = other.function_qualifiers; params = other.params; - is_variadic = other.is_variadic; + _is_variadic = other._is_variadic; variadic_attrs = other.variadic_attrs; locus = other.locus; @@ -930,7 +940,7 @@ public: return return_type; } - FunctionQualifiers get_function_qualifiers () { return function_qualifiers; } + FunctionQualifiers &get_function_qualifiers () { return function_qualifiers; } protected: /* Use covariance to implement clone function as returning this object rather -- 2.39.1