diff options
| author | John Hodge <tpg@ucc.asn.au> | 2018-06-03 14:57:05 +0800 |
|---|---|---|
| committer | John Hodge <tpg@ucc.asn.au> | 2018-06-03 14:57:05 +0800 |
| commit | bf8f8b4b4a9fe273451be59f68acafbe61968b83 (patch) | |
| tree | 82993550cb3c88de0edbd55d79e4ea8e8cefffac /src/parse/paths.cpp | |
| parent | 39b3cf53798683e496804f8322da2254b10850f4 (diff) | |
| parent | a7fb27789a2b34543851d207120e2c0001ee9c27 (diff) | |
| download | mrust-bf8f8b4b4a9fe273451be59f68acafbe61968b83.tar.gz | |
Merge branch 'master' of https://github.com/thepowersgang/mrustc
Diffstat (limited to 'src/parse/paths.cpp')
| -rw-r--r-- | src/parse/paths.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/parse/paths.cpp b/src/parse/paths.cpp index 59b6b939..d103840e 100644 --- a/src/parse/paths.cpp +++ b/src/parse/paths.cpp @@ -203,7 +203,7 @@ AST::Path Parse_Path(TokenStream& lex, bool is_abs, eParsePathGenericMode generi Token tok; ::std::vector<TypeRef> types; - ::std::vector< ::std::string> lifetimes; + ::std::vector<AST::LifetimeRef> lifetimes; ::std::vector< ::std::pair< ::std::string, TypeRef > > assoc_bounds; do { @@ -214,7 +214,7 @@ AST::Path Parse_Path(TokenStream& lex, bool is_abs, eParsePathGenericMode generi switch(GET_TOK(tok, lex)) { case TOK_LIFETIME: - lifetimes.push_back( tok.str() ); + lifetimes.push_back(AST::LifetimeRef(/*lex.point_span(),*/ lex.get_ident(mv$(tok)) )); break; case TOK_IDENT: if( LOOK_AHEAD(lex) == TOK_EQUAL ) |