Metafunctions have now the ability to add declarations after the class.

Author: MaxSagebaum

source/parse.h

@@ -4981,6 +4981,10 @@ class parser
 
     std::unique_ptr<translation_unit_node> parse_tree = {};
 
+    // Store declarations generated in a metafunction. Append them after the declaration for the meta function has been
+    // finished.
+    std::vector<std::unique_ptr<declaration_node>> metafunction_declarations = {};
+
     //  Keep a stack of current capture groups (contracts/decls still being parsed)
     std::vector<capture_group*> current_capture_groups = {};
 
@@ -5152,6 +5156,22 @@ class parser
     }
 
 
+    auto parse_one_prepare(
+        std::vector<token> const& tokens_,
+        std::deque<token>&        generated_tokens_
+        )
+        -> void
+    {
+        parse_kind = "source string during code generation";
+
+        //  Set per-parse state for the duration of this call
+        tokens           = &tokens_;
+        generated_tokens = &generated_tokens_;
+
+        pos = 0;
+    }
+
+
     //-----------------------------------------------------------------------
     //  parse_one_statement
     //
@@ -5160,22 +5180,17 @@ class parser
     //
     //  Each call parses one statement and returns its parse tree.
     //
-    auto parse_one_declaration(
+    auto parse_one_statement(
         std::vector<token> const& tokens_,
         std::deque<token>&        generated_tokens_
     )
         -> std::unique_ptr<statement_node>
     {
-        parse_kind = "source string during code generation";
-
-        //  Set per-parse state for the duration of this call
-        tokens           = &tokens_;
-        generated_tokens = &generated_tokens_;
+        parse_one_prepare(tokens_, generated_tokens_);
 
         //  Parse one declaration - we succeed if the parse succeeded,
         //  and there were no new errors, and all tokens were consumed
         auto errors_size = std::ssize(errors);
-        pos = 0;
         if (auto d = statement();
             d
             && std::ssize(errors) == errors_size
@@ -5188,6 +5203,35 @@ class parser
         return {};
     }
 
+    //-----------------------------------------------------------------------
+    //  parse_one_declaration
+    //
+    //  tokens              input tokens for this section of Cpp2 source code
+    //  generated_tokens    a shared place to store generated tokens
+    //
+    //  Each call parses one declaration and returns its parse tree.
+    //
+    auto parse_one_declaration(
+        std::vector<token> const& tokens_,
+        std::deque<token>&        generated_tokens_
+        )
+        -> std::unique_ptr<declaration_node>
+    {
+        parse_one_prepare(tokens_, generated_tokens_);
+
+        auto errors_size = std::ssize(errors);
+        if (auto d = declaration();
+            d
+            && std::ssize(errors) == errors_size
+            && done()
+            )
+        {
+            return d;
+        }
+
+        return {};
+    }
+
 
     //-----------------------------------------------------------------------
     //  Get a set of pointers to just the declarations in the given token map section
@@ -5210,7 +5254,8 @@ class parser
             if (decl->position().lineno > last_line) {
                 break;
             }
-            if (decl->position().lineno >= first_line) {
+            if (decl->position().lineno >= first_line ||
+                decl->position().lineno < 0) { // Add generated declarations from metafunctions
                 ret.push_back( decl.get() );
             }
         }
@@ -8720,6 +8765,13 @@ class parser
         auto n = std::make_unique<translation_unit_node>();
         for (auto d = declaration(); d; d = declaration()) {
             n->declarations.push_back( std::move(d) );
+
+            // Add declarations generated by metafunctions.
+            for(auto& md : metafunction_declarations) {
+                n->declarations.push_back( std::move(md));
+            }
+
+            metafunction_declarations.clear();
         }
         return n;
     }