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

Code Cleanup

Browse Source 
- Made code more compact and consistent while reviewing sorting for UDAs.
This commit is contained in:
Paul Beckingham
2013-01-13 16:52:57 -05:00
parent 8271e973d8
commit 26dbd8e790
1 changed files with 22 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
src/sort.cpp
View File

@@ -72,9 +72,7 @@ static bool sort_compare (int left, int right)
{ {
std::string field; std::string field;
bool ascending; bool ascending;
Column* column; Column* column;
int left_number; int left_number;
int right_number; int right_number;
float left_real; float left_real;
@@ -96,10 +94,8 @@ static bool sort_compare (int left, int right)
if (left_real == right_real) if (left_real == right_real)
continue; continue;
if (ascending) return ascending ? (left_real < right_real)
return left_real < right_real; : (left_real > right_real);
return left_real > right_real;
} }
// Number. // Number.
@@ -111,10 +107,8 @@ static bool sort_compare (int left, int right)
if (left_number == right_number) if (left_number == right_number)
continue; continue;
if (ascending) return ascending ? (left_number < right_number)
return left_number < right_number; : (left_number > right_number);
return left_number > right_number;
} }
// Depends string. // Depends string.
@@ -140,10 +134,8 @@ static bool sort_compare (int left, int right)
if (left_number == right_number) if (left_number == right_number)
continue; continue;
if (ascending) return ascending ? (left_number < right_number)
return left_number < right_number; : (left_number > right_number);
return left_number > right_number;
} }
// String. // String.
@@ -159,10 +151,8 @@ static bool sort_compare (int left, int right)
if (left_string == right_string) if (left_string == right_string)
continue; continue;
if (ascending) return ascending ? (left_string < right_string)
return left_string < right_string; : (left_string > right_string);
return left_string > right_string;
} }
// Priority. // Priority.
@@ -199,10 +189,8 @@ static bool sort_compare (int left, int right)
if (left_string == right_string) if (left_string == right_string)
continue; continue;
if (ascending) return ascending ? (left_string < right_string)
return left_string < right_string; : (left_string > right_string);
return left_string > right_string;
} }
// Date. // Date.
@@ -218,10 +206,8 @@ static bool sort_compare (int left, int right)
if (left_string == right_string) if (left_string == right_string)
continue; continue;
if (ascending) return ascending ? (left_string < right_string)
return left_string < right_string; : (left_string > right_string);
return left_string > right_string;
} }
// Duration. // Duration.
@@ -235,10 +221,8 @@ static bool sort_compare (int left, int right)
Duration left_duration (left_string); Duration left_duration (left_string);
Duration right_duration (right_string); Duration right_duration (right_string);
if (ascending) return ascending ? (left_duration < right_duration)
return left_duration < right_duration; : (left_duration > right_duration);
return left_duration > right_duration;
} }
// UDAs. // UDAs.
@@ -253,10 +237,8 @@ static bool sort_compare (int left, int right)
if (left_real == right_real) if (left_real == right_real)
continue; continue;
if (ascending) return ascending ? (left_real < right_real)
return left_real < right_real; : (left_real > right_real);
return left_real > right_real;
} }
else if (type == "string") else if (type == "string")
{ {
@@ -266,10 +248,8 @@ static bool sort_compare (int left, int right)
if (left_string == right_string) if (left_string == right_string)
continue; continue;
if (ascending) return ascending ? (left_string < right_string)
return left_string < right_string; : (left_string > right_string);
return left_string > right_string;
} }
else if (type == "date") else if (type == "date")
{ {
@@ -279,10 +259,8 @@ static bool sort_compare (int left, int right)
if (left_string == right_string) if (left_string == right_string)
continue; continue;
if (ascending) return ascending ? (left_string < right_string)
return left_string < right_string; : (left_string > right_string);
return left_string > right_string;
} }
else if (type == "duration") else if (type == "duration")
{ {
@@ -294,10 +272,8 @@ static bool sort_compare (int left, int right)
Duration left_duration (left_string); Duration left_duration (left_string);
Duration right_duration (right_string); Duration right_duration (right_string);
if (ascending) return ascending ? (left_duration < right_duration)
return left_duration < right_duration; : (left_duration > right_duration);
return left_duration > right_duration;
} }
} }
else else