try {
switch(command.builtin()) {
- case ParseCommandInfo::NoBuiltin :
- traverseCommand(command.commandPath())(output, command);
+ case ParseCommandInfo::NoBuiltin : {
+ GenericNode & node ( traverseCommand(command.commandPath()) );
+ DirectoryNode * dir ( dynamic_cast<DirectoryNode*>(&node) );
+ if ( dir ) {
+ if (autocd_) {
+ oldCwd_ = cwd_;
+ cwd_ = dir->thisptr();
+ } else
+ throw InvalidCommandException();
+ } else {
+ dynamic_cast<CommandNode &>(node)(output, command);
+ }
break;
+ }
case ParseCommandInfo::BuiltinCD :
if ( command.arguments() ) {
return cwd().traverse(
boost::make_iterator_range(
boost::make_transform_iterator(path.begin(), TraverseTokens()),
- boost::make_transform_iterator(path.end(), TraverseTokens())));
+ boost::make_transform_iterator(path.end(), TraverseTokens())),
+ autocomplete_);
}
catch (std::bad_cast &) {
throw InvalidPathException();
}
}
-prefix_ senf::console::DirectoryNode &
-senf::console::Executor::traverseDirectory(ParseCommandInfo::argument_value_type const & path)
+prefix_ senf::console::GenericNode &
+senf::console::Executor::traverseCommand(ParseCommandInfo::CommandPathRange const & path)
{
try {
- return dynamic_cast<DirectoryNode&>( traverseNode(path) );
+ return cwd().traverse(path, autocomplete_);
}
catch (std::bad_cast &) {
- throw InvalidDirectoryException();
+ throw InvalidPathException();
}
- catch (InvalidPathException &) {
- throw InvalidDirectoryException();
+ catch (UnknownNodeNameException &) {
+ throw InvalidPathException();
}
}
-prefix_ senf::console::CommandNode &
-senf::console::Executor::traverseCommand(ParseCommandInfo::CommandPathRange const & path)
+prefix_ senf::console::DirectoryNode &
+senf::console::Executor::traverseDirectory(ParseCommandInfo::argument_value_type const & path)
{
try {
- return dynamic_cast<CommandNode &>( cwd().traverse(path) );
+ return dynamic_cast<DirectoryNode&>( traverseNode(path) );
}
catch (std::bad_cast &) {
- throw InvalidCommandException();
+ throw InvalidDirectoryException();
+ }
+ catch (InvalidPathException &) {
+ throw InvalidDirectoryException();
}
- catch (UnknownNodeNameException &) {
- throw InvalidCommandException();
- }
}
-
+
///////////////////////////////cc.e////////////////////////////////////////
#undef prefix_
//#include "Executor.mpp"