xenia/kakoune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CommandManager: support %reg{<reg>} and %opt{<option>} syntax

Browse Source
This commit is contained in:
Maxime Coste 2012-08-11 12:13:48 +02:00
parent 808e79a53e
commit 0a976cd309
1 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/command_manager.cc
View File

@ -4,6 +4,7 @@
#include "assert.hh"
#include "context.hh"
#include "shell_manager.hh"
#include "register_manager.hh"
#include <algorithm>
@ -39,6 +40,8 @@ struct Token
{
Raw,
ShellExpand,
RegisterExpand,
OptionExpand,
CommandSeparator
};
Token() : m_type(Type::Raw) {}
@ -111,6 +114,10 @@ TokenList parse(const String& line,
if (type_name == "sh")
type = Token::Type::ShellExpand;
if (type_name == "reg")
type = Token::Type::RegisterExpand;
if (type_name == "opt")
type = Token::Type::OptionExpand;
static const std::unordered_map<Character, Character> matching_delimiters = {
{ '(', ')' }, { '[', ']' }, { '{', '}' }, { '<', '>' }
@ -218,6 +225,18 @@ void CommandManager::execute(const String& command_line,
if (it == tokens.end())
break;
}
if (it->type() == Token::Type::RegisterExpand)
{
if (it->content().length() != 1)
throw runtime_error("wrong register name: " + it->content());
Register& reg = RegisterManager::instance()[it->content()[0]];
params.push_back(reg.values(context)[0]);
}
if (it->type() == Token::Type::OptionExpand)
{
const Option& option = context.option_manager()[it->content()];
params.push_back(option.as_string());
}
if (it->type() == Token::Type::CommandSeparator)
{
execute_single_command(params, context);