ShellManager: init from a static list of env vars

No need to go through a static list and then copy them one by
one in a vector.

3 files changed, 134 insertions, 146 deletions

diff --git a/src/main.cc b/src/main.cc
index 088f9c0f..40ef716d 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -77,135 +77,124 @@ String config_directory()
     return format("{}/kak", config_home);
 }
 
-void register_env_vars()
-{
-    static const struct {
-        const char* name;
-        bool prefix;
-        String (*func)(StringView, const Context&);
-    } env_vars[] = { {
-            "bufname", false,
-            [](StringView name, const Context& context) -> String
-            { return context.buffer().display_name(); }
-        }, {
-            "buffile", false,
-            [](StringView name, const Context& context) -> String
-            { return context.buffer().name(); }
-        }, {
-            "buflist", false,
-            [](StringView name, const Context& context)
-            { return join(BufferManager::instance() |
-                          transform(std::mem_fn(&Buffer::display_name)), ':'); }
-        }, {
-            "buf_line_count", false,
-            [](StringView name, const Context& context) -> String
-            { return to_string(context.buffer().line_count()); }
-        }, {
-            "timestamp", false,
-            [](StringView name, const Context& context) -> String
-            { return to_string(context.buffer().timestamp()); }
-        }, {
-            "history_id", false,
-            [](StringView name, const Context& context) -> String
-            { return to_string(context.buffer().current_history_id()); }
-        }, {
-            "selection", false,
-            [](StringView name, const Context& context)
-            { const Selection& sel = context.selections().main();
-              return content(context.buffer(), sel); }
-        }, {
-            "selections", false,
-            [](StringView name, const Context& context)
-            { return join(context.selections_content(), ':'); }
-        }, {
-            "runtime", false,
-            [](StringView name, const Context& context)
-            { return runtime_directory(); }
-        }, {
-            "config", false,
-            [](StringView name, const Context& context)
-            { return config_directory(); }
-        }, {
-            "opt_", true,
-            [](StringView name, const Context& context)
-            { return context.options()[name.substr(4_byte)].get_as_string(); }
-        }, {
-            "reg_", true,
-            [](StringView name, const Context& context)
-            { return context.main_sel_register_value(name.substr(4_byte)).str(); }
-        }, {
-            "client_env_", true,
-            [](StringView name, const Context& context)
-            { return context.client().get_env_var(name.substr(11_byte)).str(); }
-        }, {
-            "session", false,
-            [](StringView name, const Context& context) -> String
-            { return Server::instance().session(); }
-        }, {
-            "client", false,
-            [](StringView name, const Context& context) -> String
-            { return context.name(); }
-        }, {
-            "client_pid", false,
-            [](StringView name, const Context& context) -> String
-            { return to_string(context.client().pid()); }
-        }, {
-            "client_list", false,
-            [](StringView name, const Context& context) -> String
-            { return join(ClientManager::instance() |
-                          transform([](const std::unique_ptr<Client>& c) -> const String&
-                                   { return c->context().name(); }), ':'); }
-        }, {
-            "modified", false,
-            [](StringView name, const Context& context) -> String
-            { return context.buffer().is_modified() ? "true" : "false"; }
-        }, {
-            "cursor_line", false,
-            [](StringView name, const Context& context) -> String
-            { return to_string(context.selections().main().cursor().line + 1); }
-        }, {
-            "cursor_column", false,
-            [](StringView name, const Context& context) -> String
-            { return to_string(context.selections().main().cursor().column + 1); }
-        }, {
-            "cursor_char_value", false,
-            [](StringView name, const Context& context) -> String
-            { auto coord = context.selections().main().cursor();
-              auto& buffer = context.buffer();
-              return to_string((size_t)utf8::codepoint(buffer.iterator_at(coord), buffer.end())); }
-        }, {
-            "cursor_char_column", false,
-            [](StringView name, const Context& context) -> String
-            { auto coord = context.selections().main().cursor();
-              return to_string(context.buffer()[coord.line].char_count_to(coord.column) + 1); }
-        }, {
-            "cursor_byte_offset", false,
-            [](StringView name, const Context& context) -> String
-            { auto cursor = context.selections().main().cursor();
-              return to_string(context.buffer().distance({0,0}, cursor)); }
-        }, {
-            "selection_desc", false,
-            [](StringView name, const Context& context)
-            { return selection_to_string(context.selections().main()); }
-        }, {
-            "selections_desc", false,
-            [](StringView name, const Context& context)
-            { return selection_list_to_string(context.selections()); }
-        }, {
-            "window_width", false,
-            [](StringView name, const Context& context) -> String
-            { return to_string(context.window().dimensions().column); }
-        }, {
-            "window_height", false,
-            [](StringView name, const Context& context) -> String
-            { return to_string(context.window().dimensions().line); }
-        }
-    };
-
-    ShellManager& shell_manager = ShellManager::instance();
-    for (auto& env_var : env_vars)
-        shell_manager.register_env_var(env_var.name, env_var.prefix, env_var.func);
-}
+static const EnvVarDesc builtin_env_vars[] = { {
+        "bufname", false,
+        [](StringView name, const Context& context) -> String
+        { return context.buffer().display_name(); }
+    }, {
+        "buffile", false,
+        [](StringView name, const Context& context) -> String
+        { return context.buffer().name(); }
+    }, {
+        "buflist", false,
+        [](StringView name, const Context& context)
+        { return join(BufferManager::instance() |
+                      transform(std::mem_fn(&Buffer::display_name)), ':'); }
+    }, {
+        "buf_line_count", false,
+        [](StringView name, const Context& context) -> String
+        { return to_string(context.buffer().line_count()); }
+    }, {
+        "timestamp", false,
+        [](StringView name, const Context& context) -> String
+        { return to_string(context.buffer().timestamp()); }
+    }, {
+        "history_id", false,
+        [](StringView name, const Context& context) -> String
+        { return to_string(context.buffer().current_history_id()); }
+    }, {
+        "selection", false,
+        [](StringView name, const Context& context)
+        { const Selection& sel = context.selections().main();
+          return content(context.buffer(), sel); }
+    }, {
+        "selections", false,
+        [](StringView name, const Context& context)
+        { return join(context.selections_content(), ':'); }
+    }, {
+        "runtime", false,
+        [](StringView name, const Context& context)
+        { return runtime_directory(); }
+    }, {
+        "config", false,
+        [](StringView name, const Context& context)
+        { return config_directory(); }
+    }, {
+        "opt_", true,
+        [](StringView name, const Context& context)
+        { return context.options()[name.substr(4_byte)].get_as_string(); }
+    }, {
+        "reg_", true,
+        [](StringView name, const Context& context)
+        { return context.main_sel_register_value(name.substr(4_byte)).str(); }
+    }, {
+        "client_env_", true,
+        [](StringView name, const Context& context)
+        { return context.client().get_env_var(name.substr(11_byte)).str(); }
+    }, {
+        "session", false,
+        [](StringView name, const Context& context) -> String
+        { return Server::instance().session(); }
+    }, {
+        "client", false,
+        [](StringView name, const Context& context) -> String
+        { return context.name(); }
+    }, {
+        "client_pid", false,
+        [](StringView name, const Context& context) -> String
+        { return to_string(context.client().pid()); }
+    }, {
+        "client_list", false,
+        [](StringView name, const Context& context) -> String
+        { return join(ClientManager::instance() |
+                      transform([](const std::unique_ptr<Client>& c) -> const String&
+                               { return c->context().name(); }), ':'); }
+    }, {
+        "modified", false,
+        [](StringView name, const Context& context) -> String
+        { return context.buffer().is_modified() ? "true" : "false"; }
+    }, {
+        "cursor_line", false,
+        [](StringView name, const Context& context) -> String
+        { return to_string(context.selections().main().cursor().line + 1); }
+    }, {
+        "cursor_column", false,
+        [](StringView name, const Context& context) -> String
+        { return to_string(context.selections().main().cursor().column + 1); }
+    }, {
+        "cursor_char_value", false,
+        [](StringView name, const Context& context) -> String
+        { auto coord = context.selections().main().cursor();
+          auto& buffer = context.buffer();
+          return to_string((size_t)utf8::codepoint(buffer.iterator_at(coord), buffer.end())); }
+    }, {
+        "cursor_char_column", false,
+        [](StringView name, const Context& context) -> String
+        { auto coord = context.selections().main().cursor();
+          return to_string(context.buffer()[coord.line].char_count_to(coord.column) + 1); }
+    }, {
+        "cursor_byte_offset", false,
+        [](StringView name, const Context& context) -> String
+        { auto cursor = context.selections().main().cursor();
+          return to_string(context.buffer().distance({0,0}, cursor)); }
+    }, {
+        "selection_desc", false,
+        [](StringView name, const Context& context)
+        { return selection_to_string(context.selections().main()); }
+    }, {
+        "selections_desc", false,
+        [](StringView name, const Context& context)
+        { return selection_list_to_string(context.selections()); }
+    }, {
+        "window_width", false,
+        [](StringView name, const Context& context) -> String
+        { return to_string(context.window().dimensions().column); }
+    }, {
+        "window_height", false,
+        [](StringView name, const Context& context) -> String
+        { return to_string(context.window().dimensions().line); }
+    }
+};
 
 void register_registers()
 {
@@ -584,7 +573,7 @@ int run_server(StringView session, StringView server_init,
 
     StringRegistry      string_registry;
     GlobalScope         global_scope;
-    ShellManager        shell_manager;
+    ShellManager        shell_manager{builtin_env_vars};
     CommandManager      command_manager;
     RegisterManager     register_manager;
     HighlighterRegistry highlighter_registry;
@@ -594,7 +583,6 @@ int run_server(StringView session, StringView server_init,
     BufferManager       buffer_manager;
 
     register_options();
-    register_env_vars();
     register_registers();
     register_commands();
     register_highlighters();
@@ -731,14 +719,13 @@ int run_filter(StringView keystr, StringView commands, ConstArrayView<StringView
     StringRegistry  string_registry;
     GlobalScope     global_scope;
     EventManager    event_manager;
-    ShellManager    shell_manager;
+    ShellManager    shell_manager{builtin_env_vars};
     CommandManager  command_manager;
     RegisterManager register_manager;
     ClientManager   client_manager;
     BufferManager   buffer_manager;
 
     register_options();
-    register_env_vars();
     register_registers();
     register_commands();
 
diff --git a/src/shell_manager.cc b/src/shell_manager.cc
index e2253334..97103fc1 100644
--- a/src/shell_manager.cc
+++ b/src/shell_manager.cc
@@ -23,7 +23,8 @@ extern char **environ;
 namespace Kakoune
 {
 
-ShellManager::ShellManager()
+ShellManager::ShellManager(ConstArrayView<EnvVarDesc> builtin_env_vars)
+    : m_env_vars{builtin_env_vars}
 {
     // Get a guaranteed to be POSIX shell binary
     {
@@ -293,12 +294,6 @@ std::pair<String, int> ShellManager::eval(
     return { std::move(stdout_contents), WIFEXITED(status) ? WEXITSTATUS(status) : -1 };
 }
 
-void ShellManager::register_env_var(StringView str, bool prefix,
-                                    EnvVarRetriever retriever)
-{
-    m_env_vars.push_back({ str.str(), prefix, std::move(retriever) });
-}
-
 String ShellManager::get_val(StringView name, const Context& context) const
 {
     auto env_var = find_if(m_env_vars, [name](const EnvVarDesc& desc) {
diff --git a/src/shell_manager.hh b/src/shell_manager.hh
index df2429d6..f97935d1 100644
--- a/src/shell_manager.hh
+++ b/src/shell_manager.hh
@@ -12,18 +12,26 @@ namespace Kakoune
 
 class Context;
 
-using EnvVarRetriever = std::function<String (StringView name, const Context&)>;
-
 struct ShellContext
 {
     ConstArrayView<String> params;
     EnvVarMap env_vars;
 };
 
+
+struct EnvVarDesc
+{
+    using Retriever = String (*)(StringView name, const Context&);
+
+    StringView str;
+    bool prefix;
+    Retriever func;
+};
+
 class ShellManager : public Singleton<ShellManager>
 {
 public:
-    ShellManager();
+    ShellManager(ConstArrayView<EnvVarDesc> builtin_env_vars);
 
     enum class Flags
     {
@@ -37,7 +45,6 @@ public:
                                 Flags flags = Flags::WaitForStdout,
                                 const ShellContext& shell_context = {});
 
-    void register_env_var(StringView str, bool prefix, EnvVarRetriever retriever);
     String get_val(StringView name, const Context& context) const;
 
     CandidateList complete_env_var(StringView prefix, ByteCount cursor_pos) const;
@@ -45,8 +52,7 @@ public:
 private:
     String m_shell;
 
-    struct EnvVarDesc { String str; bool prefix; EnvVarRetriever func; };
-    Vector<EnvVarDesc, MemoryDomain::EnvVars> m_env_vars;
+    ConstArrayView<EnvVarDesc> m_env_vars;
 };
 
 }