From 859d43ae7012da10a58de5926d096dc817596fce Mon Sep 17 00:00:00 2001 From: John Hodge Date: Sun, 6 Mar 2016 17:41:46 +0800 Subject: HUGE REFACTOR - Move named module items into a tagged union - Item attributes now "owned" by the parent --- src/parse/expr.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/parse/expr.cpp') diff --git a/src/parse/expr.cpp b/src/parse/expr.cpp index a57cf487..e082dfa3 100644 --- a/src/parse/expr.cpp +++ b/src/parse/expr.cpp @@ -43,7 +43,7 @@ AST::Expr Parse_ExprBlock(TokenStream& lex) ExprNodeP Parse_ExprBlockNode(TokenStream& lex); ExprNodeP Parse_ExprBlockLine(TokenStream& lex, bool *expect_end); -void Parse_ExternBlock(TokenStream& lex, AST::MetaItems attrs, ::std::vector< AST::Item >& imports); +void Parse_ExternBlock(TokenStream& lex, AST::MetaItems attrs, ::std::vector< AST::Named >& imports); ExprNodeP Parse_ExprBlockNode(TokenStream& lex) { @@ -52,7 +52,7 @@ ExprNodeP Parse_ExprBlockNode(TokenStream& lex) ::std::vector nodes; - ::std::unique_ptr local_mod( new AST::Module(AST::MetaItems(),"") ); + ::std::unique_ptr local_mod( new AST::Module("") ); bool keep_mod = false; const LList* prev_modstack = Macro_GetModule(); @@ -240,7 +240,7 @@ ExprNodeP Parse_ExprBlockLine(TokenStream& lex, bool *expect_end) } } /// Extern block within a block -void Parse_ExternBlock(TokenStream& lex, AST::MetaItems attrs, ::std::vector< AST::Item >& imports) +void Parse_ExternBlock(TokenStream& lex, AST::MetaItems attrs, ::std::vector< AST::Named >& imports) { Token tok; @@ -281,7 +281,7 @@ void Parse_ExternBlock(TokenStream& lex, AST::MetaItems attrs, ::std::vector< AS case TOK_RWORD_FN: GET_CHECK_TOK(tok, lex, TOK_IDENT); name = tok.str(); - imports.push_back( AST::Item( + imports.push_back( AST::Named( ::std::move(name), Parse_FunctionDef(lex, abi, AST::MetaItems(), false, true), false -- cgit v1.2.3