Merge commit '895c045fd104ced72132160245edcd6a86e50ba0' into concedo_experimental

# Conflicts:
#	common/CMakeLists.txt
#	common/chat.cpp

common/chat-auto-parser-generator.cpp

@@ -12,6 +12,8 @@
 
 using json = common_json;
 
+namespace autoparser {
+
 // Helper to iterate over tools/functions
 static void foreach_function(const json & tools, const std::function<void(const json &)> & fn) {
     for (const auto & tool : tools) {
@@ -22,8 +24,6 @@ static void foreach_function(const json & tools, const std::function<void(const
     }
 }
 
-namespace autoparser {
-
 parser_build_context::parser_build_context(common_chat_peg_builder & p, const generation_params & inputs) :
     p(p),
     inputs(inputs),