diff options
author | Philip Herron <philip.herron@embecosm.com> | 2022-07-05 16:56:14 +0100 |
---|---|---|
committer | Philip Herron <philip.herron@embecosm.com> | 2022-07-07 12:28:58 +0100 |
commit | ec5da37dbfbcc55183f7ea4658c8856b9335ad61 (patch) | |
tree | c1ae133b17d14f2c96f8d5b56774b6e09c9b79bb /gcc/rust/expand/rust-macro-expand.cc | |
parent | 29d594e263f0ccbcbd2babf43ff453c5188f4f2c (diff) | |
download | gcc-ec5da37dbfbcc55183f7ea4658c8856b9335ad61.zip gcc-ec5da37dbfbcc55183f7ea4658c8856b9335ad61.tar.gz gcc-ec5da37dbfbcc55183f7ea4658c8856b9335ad61.tar.bz2 |
Refactor Lexer to support an abstract InputSource class
This patch allows us to remove the fmemopen lex_string hack to support
parsing buffers. This will allow us to support mutliple sources such as
metadata imports etc. The patch here updates the parser to hold onto a
reference to the lexer rather than 'owning' the lexer which allows us to
decouple the move semantics here.
Fixes #1203 #1000
Diffstat (limited to 'gcc/rust/expand/rust-macro-expand.cc')
-rw-r--r-- | gcc/rust/expand/rust-macro-expand.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gcc/rust/expand/rust-macro-expand.cc b/gcc/rust/expand/rust-macro-expand.cc index 1219e11..d8684c8 100644 --- a/gcc/rust/expand/rust-macro-expand.cc +++ b/gcc/rust/expand/rust-macro-expand.cc @@ -375,7 +375,7 @@ MacroExpander::try_match_rule (AST::MacroRule &match_rule, AST::DelimTokenTree &invoc_token_tree) { MacroInvocLexer lex (invoc_token_tree.to_token_stream ()); - Parser<MacroInvocLexer> parser (std::move (lex)); + Parser<MacroInvocLexer> parser (lex); AST::MacroMatcher &matcher = match_rule.get_matcher (); @@ -975,7 +975,7 @@ MacroExpander::transcribe_rule ( // parse it to an ASTFragment MacroInvocLexer lex (std::move (substituted_tokens)); - Parser<MacroInvocLexer> parser (std::move (lex)); + Parser<MacroInvocLexer> parser (lex); auto last_token_id = TokenId::RIGHT_CURLY; |