From: Pierre-Emmanuel Patry <pierre-emmanuel.pa...@embecosm.com>
Raw values cannot be understood easily by most tools. This commit replace
some raw values with their variable counterpart.
gcc/rust/ChangeLog:
* ast/rust-ast-collector.cc (TokenCollector::visit): Replace raw value
with keyword call.
* ast/rust-ast.h: Likewise.
* parse/rust-parse-impl.h (Parser::parse_path_ident_segment): Likewise.
(Parser::parse_macro_match_fragment): Likewise.
(Parser::parse_extern_crate): Likewise.
(Parser::parse_use_tree): Likewise.
(Parser::parse_const_item): Likewise.
(Parser::parse_literal_expr): Likewise.
(Parser::parse_maybe_named_param): Likewise.
(Parser::parse_pattern_no_alt): Likewise.
(Parser::left_denotation): Likewise.
(Parser::parse_path_in_expression_pratt): Likewise.
Signed-off-by: Pierre-Emmanuel Patry <pierre-emmanuel.pa...@embecosm.com>
---
gcc/rust/ast/rust-ast-collector.cc | 13 ++++----
gcc/rust/ast/rust-ast.h | 24 ++++++++++----
gcc/rust/parse/rust-parse-impl.h | 52 +++++++++++++++++-------------
3 files changed, 53 insertions(+), 36 deletions(-)
diff --git a/gcc/rust/ast/rust-ast-collector.cc
b/gcc/rust/ast/rust-ast-collector.cc
index 8f394e595ed..5b12875c349 100644
--- a/gcc/rust/ast/rust-ast-collector.cc
+++ b/gcc/rust/ast/rust-ast-collector.cc
@@ -17,6 +17,7 @@
// <http://www.gnu.org/licenses/>.
#include "rust-ast-collector.h"
#include "rust-item.h"
+#include "rust-keyword-values.h"
namespace Rust {
namespace AST {
@@ -461,11 +462,11 @@ TokenCollector::visit (Lifetime &lifetime)
break;
case Lifetime::LifetimeType::STATIC:
push (Rust::Token::make_lifetime (lifetime.get_locus (),
- std::move ("static")));
+ Values::Keywords::STATIC_KW));
break;
case Lifetime::LifetimeType::WILDCARD:
- push (
- Rust::Token::make_lifetime (lifetime.get_locus (), std::move ("_")));
+ push (Rust::Token::make_lifetime (lifetime.get_locus (),
+ Values::Keywords::UNDERSCORE));
break;
}
}
@@ -787,9 +788,9 @@ TokenCollector::visit (Literal &lit, location_t locus)
lit.get_type_hint ()));
break;
case Literal::LitType::BOOL: {
- if (value == "false")
+ if (value == Values::Keywords::FALSE_LITERAL)
push (Rust::Token::make (FALSE_LITERAL, locus));
- else if (value == "true")
+ else if (value == Values::Keywords::TRUE_LITERAL)
push (Rust::Token::make (TRUE_LITERAL, locus));
else
rust_unreachable (); // Not a boolean
@@ -1484,7 +1485,7 @@ TokenCollector::visit (AwaitExpr &expr)
visit (expr.get_awaited_expr ());
push (Rust::Token::make (DOT, expr.get_locus ()));
// TODO: Check status of await keyword (Context dependant ?)
- push (Rust::Token::make_identifier (UNDEF_LOCATION, "await"));
+ push (Rust::Token::make_identifier (UNDEF_LOCATION,
Values::Keywords::AWAIT));
}
void
diff --git a/gcc/rust/ast/rust-ast.h b/gcc/rust/ast/rust-ast.h
index 47c02d6ac8b..4049e4d2607 100644
--- a/gcc/rust/ast/rust-ast.h
+++ b/gcc/rust/ast/rust-ast.h
@@ -25,6 +25,7 @@
#include "rust-token.h"
#include "rust-location.h"
#include "rust-diagnostics.h"
+#include "rust-keyword-values.h"
namespace Rust {
// TODO: remove typedefs and make actual types for these
@@ -393,14 +394,20 @@ public:
const std::string &get_segment_name () const { return segment_name; }
bool is_super_path_seg () const
{
- return as_string ().compare ("super") == 0;
+ return as_string ().compare (Values::Keywords::SUPER) == 0;
}
bool is_crate_path_seg () const
{
- return as_string ().compare ("crate") == 0;
+ return as_string ().compare (Values::Keywords::CRATE) == 0;
+ }
+ bool is_lower_self_seg () const
+ {
+ return as_string ().compare (Values::Keywords::SELF) == 0;
+ }
+ bool is_big_self () const
+ {
+ return as_string ().compare (Values::Keywords::SELF_ALIAS) == 0;
}
- bool is_lower_self_seg () const { return as_string ().compare ("self") == 0;
}
- bool is_big_self () const { return as_string ().compare ("Self") == 0; }
};
// A simple path without generic or type arguments
@@ -562,7 +569,8 @@ public:
location_t crate_vis_location)
{
return Visibility (PUB_CRATE,
- SimplePath::from_str ("crate", crate_tok_location),
+ SimplePath::from_str (Values::Keywords::CRATE,
+ crate_tok_location),
crate_vis_location);
}
@@ -571,7 +579,8 @@ public:
location_t self_vis_location)
{
return Visibility (PUB_SELF,
- SimplePath::from_str ("self", self_tok_location),
+ SimplePath::from_str (Values::Keywords::SELF,
+ self_tok_location),
self_vis_location);
}
@@ -580,7 +589,8 @@ public:
location_t super_vis_location)
{
return Visibility (PUB_SUPER,
- SimplePath::from_str ("super", super_tok_location),
+ SimplePath::from_str (Values::Keywords::SUPER,
+ super_tok_location),
super_vis_location);
}
diff --git a/gcc/rust/parse/rust-parse-impl.h b/gcc/rust/parse/rust-parse-impl.h
index 8b006142b16..28659060568 100644
--- a/gcc/rust/parse/rust-parse-impl.h
+++ b/gcc/rust/parse/rust-parse-impl.h
@@ -743,19 +743,20 @@ Parser<ManagedTokenSource>::parse_path_ident_segment ()
case SUPER:
lexer.skip_token ();
- return AST::PathIdentSegment ("super", t->get_locus ());
+ return AST::PathIdentSegment (Values::Keywords::SUPER, t->get_locus ());
case SELF:
lexer.skip_token ();
- return AST::PathIdentSegment ("self", t->get_locus ());
+ return AST::PathIdentSegment (Values::Keywords::SELF, t->get_locus ());
case SELF_ALIAS:
lexer.skip_token ();
- return AST::PathIdentSegment ("Self", t->get_locus ());
+ return AST::PathIdentSegment (Values::Keywords::SELF_ALIAS,
+ t->get_locus ());
case CRATE:
lexer.skip_token ();
- return AST::PathIdentSegment ("crate", t->get_locus ());
+ return AST::PathIdentSegment (Values::Keywords::CRATE, t->get_locus ());
case DOLLAR_SIGN:
if (lexer.peek_token (1)->get_id () == CRATE)
{
@@ -2141,7 +2142,7 @@ Parser<ManagedTokenSource>::parse_macro_match_fragment ()
Identifier ident;
auto identifier = lexer.peek_token ();
if (identifier->get_id () == UNDERSCORE)
- ident = {"_", identifier->get_locus ()};
+ ident = {Values::Keywords::UNDERSCORE, identifier->get_locus ()};
else
ident = {identifier};
@@ -2506,7 +2507,7 @@ Parser<ManagedTokenSource>::parse_extern_crate
(AST::Visibility vis,
lexer.skip_token ();
break;
case SELF:
- crate_name = "self";
+ crate_name = Values::Keywords::SELF;
lexer.skip_token ();
break;
default:
@@ -2547,7 +2548,7 @@ Parser<ManagedTokenSource>::parse_extern_crate
(AST::Visibility vis,
lexer.skip_token ();
break;
case UNDERSCORE:
- as_name = "_";
+ as_name = Values::Keywords::UNDERSCORE;
lexer.skip_token ();
break;
default:
@@ -2806,7 +2807,8 @@ Parser<ManagedTokenSource>::parse_use_tree ()
return std::unique_ptr<AST::UseTreeRebind> (
new AST::UseTreeRebind (AST::UseTreeRebind::WILDCARD,
std::move (path), locus,
- {"_", t->get_locus ()}));
+ {Values::Keywords::UNDERSCORE,
+ t->get_locus ()}));
default:
add_error (Error (
t->get_locus (),
@@ -4788,7 +4790,7 @@ Parser<ManagedTokenSource>::parse_const_item
(AST::Visibility vis,
* wildcard */
const_TokenPtr ident_tok = lexer.peek_token ();
// make default identifier the underscore wildcard one
- std::string ident ("_");
+ std::string ident (Values::Keywords::UNDERSCORE);
switch (ident_tok->get_id ())
{
case IDENTIFIER:
@@ -7640,12 +7642,12 @@ Parser<ManagedTokenSource>::parse_literal_expr
(AST::AttrVec outer_attrs)
// use true and false keywords rather than "bool literal" Rust terminology
case TRUE_LITERAL:
type = AST::Literal::BOOL;
- literal_value = "true";
+ literal_value = Values::Keywords::TRUE_LITERAL;
lexer.skip_token ();
break;
case FALSE_LITERAL:
type = AST::Literal::BOOL;
- literal_value = "false";
+ literal_value = Values::Keywords::FALSE_LITERAL;
lexer.skip_token ();
break;
default:
@@ -9654,7 +9656,7 @@ Parser<ManagedTokenSource>::parse_maybe_named_param
(AST::AttrVec outer_attrs)
else if (current->get_id () == UNDERSCORE && next->get_id () == COLON)
{
// wildcard param
- name = {"_", current->get_locus ()};
+ name = {Values::Keywords::UNDERSCORE, current->get_locus ()};
kind = AST::MaybeNamedParam::WILDCARD;
lexer.skip_token (1);
}
@@ -10548,12 +10550,14 @@ Parser<ManagedTokenSource>::parse_pattern_no_alt ()
case TRUE_LITERAL:
lexer.skip_token ();
return std::unique_ptr<AST::LiteralPattern> (
- new AST::LiteralPattern ("true", AST::Literal::BOOL, t->get_locus (),
+ new AST::LiteralPattern (Values::Keywords::TRUE_LITERAL,
+ AST::Literal::BOOL, t->get_locus (),
t->get_type_hint ()));
case FALSE_LITERAL:
lexer.skip_token ();
return std::unique_ptr<AST::LiteralPattern> (
- new AST::LiteralPattern ("false", AST::Literal::BOOL, t->get_locus (),
+ new AST::LiteralPattern (Values::Keywords::FALSE_LITERAL,
+ AST::Literal::BOOL, t->get_locus (),
t->get_type_hint ()));
case CHAR_LITERAL:
case BYTE_CHAR_LITERAL:
@@ -12383,12 +12387,14 @@ Parser<ManagedTokenSource>::null_denotation_not_path (
tok->get_type_hint (), {}, tok->get_locus ()));
case TRUE_LITERAL:
return std::unique_ptr<AST::LiteralExpr> (
- new AST::LiteralExpr ("true", AST::Literal::BOOL, tok->get_type_hint (),
- {}, tok->get_locus ()));
+ new AST::LiteralExpr (Values::Keywords::TRUE_LITERAL,
+ AST::Literal::BOOL, tok->get_type_hint (), {},
+ tok->get_locus ()));
case FALSE_LITERAL:
return std::unique_ptr<AST::LiteralExpr> (
- new AST::LiteralExpr ("false", AST::Literal::BOOL,
- tok->get_type_hint (), {}, tok->get_locus ()));
+ new AST::LiteralExpr (Values::Keywords::FALSE_LITERAL,
+ AST::Literal::BOOL, tok->get_type_hint (), {},
+ tok->get_locus ()));
case LEFT_PAREN:
return parse_grouped_or_tuple_expr (std::move (outer_attrs),
tok->get_locus ());
@@ -12877,7 +12883,7 @@ Parser<ManagedTokenSource>::left_denotation
(const_TokenPtr tok,
const_TokenPtr next_tok = lexer.peek_token ();
if (next_tok->get_id () == IDENTIFIER
- && next_tok->get_str () == "await")
+ && next_tok->get_str () == Values::Keywords::AWAIT)
{
// await expression
return parse_await_expr (tok, std::move (left),
@@ -14367,16 +14373,16 @@
Parser<ManagedTokenSource>::parse_path_in_expression_pratt (const_TokenPtr tok)
initial_str = tok->get_str ();
break;
case SUPER:
- initial_str = "super";
+ initial_str = Values::Keywords::SUPER;
break;
case SELF:
- initial_str = "self";
+ initial_str = Values::Keywords::SELF;
break;
case SELF_ALIAS:
- initial_str = "Self";
+ initial_str = Values::Keywords::SELF_ALIAS;
break;
case CRATE:
- initial_str = "crate";
+ initial_str = Values::Keywords::CRATE;
break;
case DOLLAR_SIGN:
if (lexer.peek_token ()->get_id () == CRATE)
--
2.42.1
