#include "Parse.ih"
// Custom includes
+#include <cerrno>
#include <boost/iterator/transform_iterator.hpp>
+#include <boost/spirit/iterator/file_iterator.hpp>
+#include "../Utils/String.hh"
+#include "../Utils/Exception.hh"
//#include "Parse.mpp"
#define prefix_
static void init(ParseCommandInfo & info)
{ info.init(); }
- static void setCommand(ParseCommandInfo & info, std::string const & commandPath)
+ static void setBuiltin(ParseCommandInfo & info, ParseCommandInfo::BuiltinCommand builtin)
+ { info.setBuiltin(builtin); }
+
+ static void setCommand(ParseCommandInfo & info, std::vector<std::string> & commandPath)
{ info.setCommand(commandPath); }
static void startArgument(ParseCommandInfo & info)
struct ParseDispatcher
{
- ParseDispatcher()
- : info_ (0) {}
-
- ParseCommandInfo * info_;
-
- ParseCommandInfo & info() {
- SENF_ASSERT( info_ );
- return *info_;
- }
+ ParseCommandInfo info_;
+ CommandParser::Callback cb_;
struct BindInfo {
- BindInfo( ParseDispatcher & d, ParseCommandInfo & i)
- : dispatcher (d) { dispatcher.info_ = &i; }
-
- ~BindInfo() { dispatcher.info_ = 0; }
+ BindInfo( ParseDispatcher & d, CommandParser::Callback cb)
+ : dispatcher (d) { dispatcher.cb_ = cb; }
+ ~BindInfo() { dispatcher.cb_ = 0; }
ParseDispatcher & dispatcher;
};
- void beginCommand(std::string const & command)
- { ParserAccess::init(info());
- ParserAccess::setCommand(info(), command); }
+ void beginCommand(std::vector<std::string> & command)
+ { ParserAccess::init(info_);
+ ParserAccess::setCommand(info_, command); }
void endCommand()
- { ParserAccess::finalize(info()); }
+ { ParserAccess::finalize(info_); cb_(info_); }
void pushArgument(std::string const & argument)
- { ParserAccess::startArgument(info());
- ParserAccess::addToken(info(), ParserAccess::makeToken(argument));
- ParserAccess::endArgument(info()); }
+ { ParserAccess::startArgument(info_);
+ ParserAccess::addToken(info_, ParserAccess::makeToken(argument));
+ ParserAccess::endArgument(info_); }
void openGroup()
- { ParserAccess::startArgument(info()); }
+ { ParserAccess::startArgument(info_); }
void closeGroup()
- { ParserAccess::endArgument(info()); }
+ { ParserAccess::endArgument(info_); }
void pushPunctuation(std::string const & token)
- { ParserAccess::addToken(info(), ParserAccess::makeToken(token)); }
+ { ParserAccess::addToken(info_, ParserAccess::makeToken(token)); }
void pushWord(std::string const & token)
- { ParserAccess::addToken(info(), ParserAccess::makeToken(token)); }
+ { ParserAccess::addToken(info_, ParserAccess::makeToken(token)); }
+
+ void builtin_cd(std::vector<std::string> & path)
+ { ParserAccess::init(info_);
+ ParserAccess::setBuiltin(info_, ParseCommandInfo::BuiltinCD);
+ setBuiltinPathArg(path);
+ ParserAccess::finalize(info_); cb_(info_); }
+
+ void builtin_ls(std::vector<std::string> & path)
+ { ParserAccess::init(info_);
+ ParserAccess::setBuiltin(info_, ParseCommandInfo::BuiltinLS);
+ setBuiltinPathArg(path);
+ ParserAccess::finalize(info_); cb_(info_); }
+
+ void pushDirectory(std::vector<std::string> & path)
+ { ParserAccess::init(info_);
+ ParserAccess::setBuiltin(info_, ParseCommandInfo::BuiltinPUSHD);
+ setBuiltinPathArg(path);
+ ParserAccess::finalize(info_); cb_(info_); }
+
+ void popDirectory()
+ { ParserAccess::init(info_);
+ ParserAccess::setBuiltin(info_, ParseCommandInfo::BuiltinPOPD);
+ ParserAccess::finalize(info_); cb_(info_); }
+
+ void builtin_exit()
+ { ParserAccess::init(info_);
+ ParserAccess::setBuiltin(info_, ParseCommandInfo::BuiltinEXIT);
+ ParserAccess::finalize(info_); cb_(info_); }
+
+ void setBuiltinPathArg(std::vector<std::string> & path)
+ {
+ ParserAccess::startArgument(info_);
+ for (std::vector<std::string>::const_iterator i (path.begin());
+ i != path.end(); ++i)
+ ParserAccess::addToken(info_, ParserAccess::makeToken(*i));
+ ParserAccess::endArgument(info_);
+ }
};
}}}
struct senf::console::ParseCommandInfo::MakeRange
{
+ typedef ParseCommandInfo::argument_value_type result_type;
+
MakeRange() {}
MakeRange(ParseCommandInfo::token_iterator b) : b_ (b) {}
-
+
senf::console::ParseCommandInfo::token_iterator b_;
-
- typedef ParseCommandInfo::argument_value_type result_type;
-
+
result_type operator()(TempArguments::iterator::value_type const & v) const {
return result_type( b_ + v.first, b_ + v.second );
}
tempArguments_.clear();
}
+prefix_ std::ostream & senf::console::operator<<(std::ostream & stream,
+ ParseCommandInfo const & info)
+{
+ if (info.builtin() == ParseCommandInfo::NoBuiltin)
+ stream << senf::stringJoin(info.commandPath(), "/");
+ else {
+ char const * builtins[] = { "", "cd", "ls", "pushd", "popd", "exit" };
+ stream << "builtin-" << builtins[info.builtin()];
+ }
+
+ ParseCommandInfo::ArgumentsRange args (info.arguments());
+ for (ParseCommandInfo::argument_iterator i (args.begin()); i != args.end(); ++i) {
+ ParseCommandInfo::token_iterator j (i->begin());
+ stream << " [";
+ if ( j != i->end() ) {
+ for (;;) {
+ stream << "'" << j->value() << "'";
+ if ( ++j != i->end() ) stream << ' ';
+ else break;
+ }
+ }
+ stream << "]";
+ }
+
+ return stream;
+}
+
///////////////////////////////////////////////////////////////////////////
-// senf::console::SingleCommandParser
+// senf::console::CommandParser
-struct senf::console::SingleCommandParser::Impl
+struct senf::console::CommandParser::Impl
{
+ typedef detail::CommandGrammar<detail::ParseDispatcher> Grammar;
+
detail::ParseDispatcher dispatcher;
- detail::CommandGrammar<detail::ParseDispatcher>::Context context;
- detail::CommandGrammar<detail::ParseDispatcher> grammar;
- detail::SkipGrammar skipGrammar;
+ Grammar::Context context;
+ Grammar grammar;
Impl() : dispatcher(), context(), grammar(dispatcher, context) {}
};
-prefix_ senf::console::SingleCommandParser::SingleCommandParser()
+prefix_ senf::console::CommandParser::CommandParser()
: impl_ (new Impl())
{}
-prefix_ senf::console::SingleCommandParser::~SingleCommandParser()
+prefix_ senf::console::CommandParser::~CommandParser()
{}
-prefix_ bool senf::console::SingleCommandParser::parseCommand(std::string command,
- ParseCommandInfo & info)
+prefix_ bool senf::console::CommandParser::parse(std::string command, Callback cb)
+{
+ detail::ParseDispatcher::BindInfo bind (impl().dispatcher, cb);
+ return boost::spirit::parse( command.begin(), command.end(),
+ impl().grammar.use_parser<Impl::Grammar::CommandParser>(),
+ impl().grammar.use_parser<Impl::Grammar::SkipParser>()
+ ).full;
+}
+
+prefix_ bool senf::console::CommandParser::parseFile(std::string filename, Callback cb)
{
- detail::ParseDispatcher::BindInfo bind (impl().dispatcher, info);
- return boost::spirit::parse( command.c_str(), impl().grammar, impl().skipGrammar ).full;
+ detail::ParseDispatcher::BindInfo bind (impl().dispatcher, cb);
+ boost::spirit::file_iterator<> i (filename);
+ if (!i) throw SystemException(ENOENT SENF_EXC_DEBUGINFO);
+ boost::spirit::file_iterator<> const i_end (i.make_end());
+
+ return boost::spirit::parse( i, i_end,
+ impl().grammar.use_parser<Impl::Grammar::CommandParser>(),
+ impl().grammar.use_parser<Impl::Grammar::SkipParser>()
+ ).full;
}
///////////////////////////////cc.e////////////////////////////////////////