GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-08-28 22:47:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Bug Fix - Cmd

Browse source 
- The two load* methods were conflicting - if loadCustomReports was
  called first, it stomped on the commands list and prevented
  loadCommands from running.  Now there is only one method.
- Rewrote util.cpp/autoComplete to use STL over libc.  Might reduce
  code size.
This commit is contained in:
Paul Beckingham 2009-06-15 12:18:04 -04:00
parent 9f1880e050
commit b742712bb1
3 changed files with 18 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/Cmd.cpp
View file

@ -25,6 +25,7 @@
//
////////////////////////////////////////////////////////////////////////////////
#include <iostream> // TODO Remove
#include "Cmd.h"
#include "Context.h"
#include "util.h"
@ -55,8 +56,7 @@ Cmd::~Cmd ()
// report name.
bool Cmd::valid (const std::string& input)
{
loadCommands ();
loadCustomReports ();
load ();
std::vector <std::string> matches;
autoComplete (lowerCase (input), commands, matches);
@ -67,7 +67,7 @@ bool Cmd::valid (const std::string& input)
// Determines whether the string represents a valid custom report name.
bool Cmd::validCustom (const std::string& input)
{
loadCustomReports ();
load ();
std::vector <std::string> matches;
autoComplete (lowerCase (input), customReports, matches);
@ -77,8 +77,7 @@ bool Cmd::validCustom (const std::string& input)
////////////////////////////////////////////////////////////////////////////////
void Cmd::parse (const std::string& input)
{
loadCommands ();
loadCustomReports ();
load ();
std::string candidate = lowerCase (input);
@ -103,7 +102,7 @@ void Cmd::parse (const std::string& input)
}
////////////////////////////////////////////////////////////////////////////////
void Cmd::loadCommands ()
void Cmd::load ()
{
if (commands.size () == 0)
{
@ -133,14 +132,8 @@ void Cmd::loadCommands ()
commands.push_back (context.stringtable.get (CMD_UNDELETE, "undelete"));
commands.push_back (context.stringtable.get (CMD_UNDO, "undo"));
commands.push_back (context.stringtable.get (CMD_VERSION, "version"));
}
}
////////////////////////////////////////////////////////////////////////////////
void Cmd::loadCustomReports ()
{
if (customReports.size () == 0)
{
// Now load the custom reports.
std::vector <std::string> all;
context.config.all (all);
@ -155,6 +148,8 @@ void Cmd::loadCustomReports ()
report = report.substr (0, columns);
// A custom report is also a command.
// TODO Make sure a custom report does not clash with a built-in
// command.
customReports.push_back (report);
commands.push_back (report);
}