gergely/taskwarrior-2.x
1
0
Fork 0
Code Issues Actions Packages Projects Releases 1 Wiki Activity

Plumbing: Use variadic templates for format()

Browse Source 
- Use variadic templates, with a slight twist for properly supporting
  Taskwarrior's l10n strings.
- Adjust code that relied on implicit type conversion which led to
  problems with template instantiation.
- Move some functionality out of format() in order to keep it generic.
This commit is contained in:
Wilhelm Schuermann
2015-06-07 20:36:21 +02:00
parent f0fbdaf2c9
commit e95167a984
6 changed files with 73 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

237
src/text.cpp
View File

@@ -45,8 +45,6 @@ extern Context context;
static const char* newline = "\n";
static const char* noline = "";
static void replace_positional (std::string&, const std::string&, const std::string&);
///////////////////////////////////////////////////////////////////////////////
void wrapText (
std::vector <std::string>& lines,
@@ -675,6 +673,19 @@ const std::string obfuscateText (const std::string& input)
return output.str ();
}
////////////////////////////////////////////////////////////////////////////////
const std::string format (std::string& value)
{
return value;
}
////////////////////////////////////////////////////////////////////////////////
const std::string format (const char* value)
{
std::string s (value);
return s;
}
////////////////////////////////////////////////////////////////////////////////
const std::string format (char value)
{
@@ -691,6 +702,30 @@ const std::string format (int value)
return s.str ();
}
////////////////////////////////////////////////////////////////////////////////
const std::string format (unsigned int value)
{
std::stringstream s;
s << value;
return s.str ();
}
////////////////////////////////////////////////////////////////////////////////
const std::string format (unsigned long value)
{
std::stringstream s;
s << value;
return s.str ();
}
////////////////////////////////////////////////////////////////////////////////
const std::string format (long value)
{
std::stringstream s;
s << value;
return s.str ();
}
////////////////////////////////////////////////////////////////////////////////
const std::string formatHex (int value)
{
@@ -747,7 +782,7 @@ const std::string format (double value)
}
////////////////////////////////////////////////////////////////////////////////
static void replace_positional (
void replace_positional (
std::string& fmt,
const std::string& from,
const std::string& to)
@@ -760,202 +795,6 @@ static void replace_positional (
}
}
////////////////////////////////////////////////////////////////////////////////
const std::string format (
const std::string& fmt,
const std::string& arg1)
{
std::string output = fmt;
replace_positional (output, "{1}", arg1);
return output;
}
////////////////////////////////////////////////////////////////////////////////
const std::string format (
const std::string& fmt,
int arg1)
{
std::string output = fmt;
replace_positional (output, "{1}", format (arg1));
return output;
}
////////////////////////////////////////////////////////////////////////////////
const std::string format (
const std::string& fmt,
const std::string& arg1,
const std::string& arg2)
{
std::string output = fmt;
replace_positional (output, "{1}", arg1);
replace_positional (output, "{2}", arg2);
return output;
}
////////////////////////////////////////////////////////////////////////////////
const std::string format (
const std::string& fmt,
const std::string& arg1,
int arg2)
{
std::string output = fmt;
replace_positional (output, "{1}", arg1);
replace_positional (output, "{2}", format (arg2));
return output;
}
////////////////////////////////////////////////////////////////////////////////
const std::string format (
const std::string& fmt,
const std::string& arg1,
double arg2)
{
std::string output = fmt;
replace_positional (output, "{1}", arg1);
replace_positional (output, "{2}", trim (format (arg2, 6, 3)));
return output;
}
////////////////////////////////////////////////////////////////////////////////
const std::string format (
const std::string& fmt,
int arg1,
int arg2,
const std::string& arg3)
{
std::string output = fmt;
replace_positional (output, "{1}", format (arg1));
replace_positional (output, "{2}", format (arg2));
replace_positional (output, "{3}", arg3);
return output;
}
////////////////////////////////////////////////////////////////////////////////
const std::string format (
const std::string& fmt,
int arg1,
const std::string& arg2)
{
std::string output = fmt;
replace_positional (output, "{1}", format (arg1));
replace_positional (output, "{2}", arg2);
return output;
}
////////////////////////////////////////////////////////////////////////////////
const std::string format (
const std::string& fmt,
int arg1,
const std::string& arg2,
const std::string& arg3)
{
std::string output = fmt;
replace_positional (output, "{1}", format (arg1));
replace_positional (output, "{2}", arg2);
replace_positional (output, "{3}", arg3);
return output;
}
////////////////////////////////////////////////////////////////////////////////
const std::string format (
const std::string& fmt,
int arg1,
const std::string& arg2,
const std::string& arg3,
const std::string& arg4)
{
std::string output = fmt;
replace_positional (output, "{1}", format (arg1));
replace_positional (output, "{2}", arg2);
replace_positional (output, "{3}", arg3);
replace_positional (output, "{4}", arg4);
return output;
}
////////////////////////////////////////////////////////////////////////////////
const std::string format (
const std::string& fmt,
int arg1,
int arg2)
{
std::string output = fmt;
replace_positional (output, "{1}", format (arg1));
replace_positional (output, "{2}", format (arg2));
return output;
}
////////////////////////////////////////////////////////////////////////////////
const std::string format (
const std::string& fmt,
int arg1,
int arg2,
int arg3)
{
std::string output = fmt;
replace_positional (output, "{1}", format (arg1));
replace_positional (output, "{2}", format (arg2));
replace_positional (output, "{3}", format (arg3));
return output;
}
////////////////////////////////////////////////////////////////////////////////
const std::string format (
const std::string& fmt,
int arg1,
int arg2,
int arg3,
int arg4)
{
std::string output = fmt;
replace_positional (output, "{1}", format (arg1));
replace_positional (output, "{2}", format (arg2));
replace_positional (output, "{3}", format (arg3));
replace_positional (output, "{4}", format (arg4));
return output;
}
////////////////////////////////////////////////////////////////////////////////
const std::string format (
const std::string& fmt,
int arg1,
double arg2)
{
std::string output = fmt;
replace_positional (output, "{1}", format (arg1));
replace_positional (output, "{2}", trim (format (arg2, 6, 3)));
return output;
}
////////////////////////////////////////////////////////////////////////////////
const std::string format (
const std::string& fmt,
const std::string& arg1,
const std::string& arg2,
const std::string& arg3)
{
std::string output = fmt;
replace_positional (output, "{1}", arg1);
replace_positional (output, "{2}", arg2);
replace_positional (output, "{3}", arg3);
return output;
}
////////////////////////////////////////////////////////////////////////////////
const std::string format (
const std::string& fmt,
const std::string& arg1,
const std::string& arg2,
const std::string& arg3,
const std::string& arg4)
{
std::string output = fmt;
replace_positional (output, "{1}", arg1);
replace_positional (output, "{2}", arg2);
replace_positional (output, "{3}", arg3);
replace_positional (output, "{4}", arg4);
return output;
}
////////////////////////////////////////////////////////////////////////////////
std::string leftJustify (const int input, const int width)
{