github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2024-11-23 10:00:43 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move inputter_t private bits to the bottom of the class

Browse Source 
Just a reorganization to clarify what parts are the interface.
This commit is contained in:
ridiculousfish 2020-11-15 11:29:10 -08:00
parent 050a211838
commit 994f95b845
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/input.h
View File

@ -23,21 +23,6 @@ void init_input();
struct input_mapping_t;
class inputter_t {
input_event_queue_t event_queue_;
std::vector<wchar_t> input_function_args_{};
bool function_status_{false};
// We need a parser to evaluate bindings.
const std::shared_ptr<parser_t> parser_;
void function_push_arg(wchar_t arg);
void function_push_args(readline_cmd_t code);
void mapping_execute(const input_mapping_t &m, bool allow_commands);
void mapping_execute_matching_or_generic(bool allow_commands);
bool mapping_is_match(const input_mapping_t &m);
maybe_t<input_mapping_t> find_mapping();
char_event_t read_characters_no_readline();
public:
/// Construct from a parser, and the fd from which to read.
explicit inputter_t(parser_t &parser, int in = STDIN_FILENO);
@ -68,6 +53,22 @@ class inputter_t {
/// Pop an argument from the function argument stack.
wchar_t function_pop_arg();
private:
input_event_queue_t event_queue_;
std::vector<wchar_t> input_function_args_{};
bool function_status_{false};
// We need a parser to evaluate bindings.
const std::shared_ptr<parser_t> parser_;
void function_push_arg(wchar_t arg);
void function_push_args(readline_cmd_t code);
void mapping_execute(const input_mapping_t &m, bool allow_commands);
void mapping_execute_matching_or_generic(bool allow_commands);
bool mapping_is_match(const input_mapping_t &m);
maybe_t<input_mapping_t> find_mapping();
char_event_t read_characters_no_readline();
};
struct input_mapping_name_t {