GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-06-26 10:54:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

A3t::findBinary

Browse source 
- Locates it's own binary, and adds a 'basename' attribute.
This commit is contained in:
Paul Beckingham 2013-08-30 13:55:24 -07:00
parent 8429df3b5c
commit 46cd57b4aa
2 changed files with 36 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

52
src/parser/A3t.cpp
View file

@ -55,6 +55,7 @@ A3t::~A3t ()
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
Tree* A3t::parse () Tree* A3t::parse ()
{ {
findBinary ();
findCommand (); findCommand ();
return _tree; return _tree;
@ -94,10 +95,27 @@ bool A3t::canonicalize (
return true; return true;
} }
return false; return false;
} }
////////////////////////////////////////////////////////////////////////////////
// Walk the top-level tree branches, looking for the first raw value that
// autoCompletes to a valid command/report.
void A3t::findBinary ()
{
if (_tree->branches () >= 1)
{
_tree->operator[](0)->tag ("BINARY");
std::string binary = _tree->operator[](0)->attribute ("raw");
std::string::size_type slash = binary.rfind ('/');
if (slash != std::string::npos)
binary = binary.substr (slash + 1);
_tree->operator[](0)->attribute ("basename", binary);
}
}
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// Walk the top-level tree branches, looking for the first raw value that // Walk the top-level tree branches, looking for the first raw value that
// autoCompletes to a valid command/report. // autoCompletes to a valid command/report.
@ -106,32 +124,32 @@ void A3t::findCommand ()
std::string command; std::string command;
for (int i = 0; i < _tree->branches (); ++i) for (int i = 0; i < _tree->branches (); ++i)
{ {
if (canonicalize (command, "report", (*_tree)[i]->attribute ("raw"))) if (canonicalize (command, "report", _tree->operator[](i)->attribute ("raw")))
{ {
(*_tree)[i]->attribute ("canonical", command); _tree->operator[](i)->attribute ("canonical", command);
(*_tree)[i]->tag ("REPORT"); _tree->operator[](i)->tag ("REPORT");
(*_tree)[i]->tag ("CMD"); _tree->operator[](i)->tag ("CMD");
} }
else if (canonicalize (command, "readcmd", (*_tree)[i]->attribute ("raw"))) else if (canonicalize (command, "readcmd", _tree->operator[](i)->attribute ("raw")))
{ {
(*_tree)[i]->attribute ("canonical", command); _tree->operator[](i)->attribute ("canonical", command);
(*_tree)[i]->tag ("READCMD"); _tree->operator[](i)->tag ("READCMD");
(*_tree)[i]->tag ("CMD"); _tree->operator[](i)->tag ("CMD");
} }
else if (canonicalize (command, "writecmd", (*_tree)[i]->attribute ("raw"))) else if (canonicalize (command, "writecmd", _tree->operator[](i)->attribute ("raw")))
{ {
(*_tree)[i]->attribute ("canonical", command); _tree->operator[](i)->attribute ("canonical", command);
(*_tree)[i]->tag ("WRITECMD"); _tree->operator[](i)->tag ("WRITECMD");
(*_tree)[i]->tag ("CMD"); _tree->operator[](i)->tag ("CMD");
} }
else if (canonicalize (command, "specialcmd", (*_tree)[i]->attribute ("raw"))) else if (canonicalize (command, "specialcmd", _tree->operator[](i)->attribute ("raw")))
{ {
(*_tree)[i]->attribute ("canonical", command); _tree->operator[](i)->attribute ("canonical", command);
(*_tree)[i]->tag ("SPECIALCMD"); _tree->operator[](i)->tag ("SPECIALCMD");
(*_tree)[i]->tag ("CMD"); _tree->operator[](i)->tag ("CMD");
} }
} }
} }

1
src/parser/A3t.h
View file

@ -41,6 +41,7 @@ public:
bool canonicalize (std::string&, const std::string&, const std::string&) const; bool canonicalize (std::string&, const std::string&, const std::string&) const;
private: private:
void findBinary ();
void findCommand (); void findCommand ();
private: private: