Implement 'reverse' and 'sum'

flexferrum · flexferrum · commit 647b340098f5 · 2018-05-18T01:08:38.000+03:00
diff --git a/src/filters.cpp b/src/filters.cpp
@@ -3,6 +3,7 @@
 #include "value_helpers.h"
 
 #include <algorithm>
+#include <numeric>
 
 namespace jinja2
 {
@@ -188,6 +189,7 @@ SequenceAccessor::SequenceAccessor(FilterParams params, SequenceAccessor::Mode m
     case ReverseMode:
         break;
     case SumItemsMode:
+        ParseParams({{"attribute", false}, {"start", false}}, params);
         break;
     case UniqueItemsMode:
         break;
@@ -247,12 +249,40 @@ InternalValue SequenceAccessor::Filter(const InternalValue& baseVal, RenderConte
         auto p = std::min_element(b, e, lessComparator);
         result = p != e ? *p : InternalValue();
         break;
-        break;
     }
     case ReverseMode:
+    {
+        InternalValueList resultList(list.GetSize());
+        for (int n = 0; n < list.GetSize(); ++ n)
+            resultList[list.GetSize() - n - 1] = list.GetValueByIndex(n);
+
+        result = ListAdapter::CreateAdapter(std::move(resultList));
         break;
+    }
     case SumItemsMode:
+    {
+        ListAdapter l1;
+        ListAdapter* actualList;
+        if (IsEmpty(attrName))
+        {
+            actualList = &list;
+        }
+        else
+        {
+            l1 = list.ToSubscriptedList(attrName, true);
+            actualList = &l1;
+        }
+        InternalValue start = GetArgumentValue("start", context);
+        InternalValue resultVal = std::accumulate(actualList->begin(), actualList->end(), start, [](const InternalValue& cur, const InternalValue& val) {
+            if (IsEmpty(cur))
+                return val;
+
+            return Apply2<visitors::BinaryMathOperation>(cur, val, BinaryExpression::Plus);
+        });
+
+        result = std::move(resultVal);
         break;
+    }
     case UniqueItemsMode:
         break;
     }
diff --git a/test/filters_test.cpp b/test/filters_test.cpp
@@ -118,3 +118,20 @@ INSTANTIATE_TEST_CASE_P(Max, FilterGenericTest, ::testing::Values(
                             InputOutputPair{"('str1', 'str2', 'str3', 'str4', 'str5', 'Str6') | max(true)", "str5"},
                             InputOutputPair{"('str1', 'str2', 'str3', 'str4', 'str5', 'Str6') | max(case_sensitive=true)", "str5"}
                             ));
+
+INSTANTIATE_TEST_CASE_P(Reverse, ListIteratorTest, ::testing::Values(
+                            InputOutputPair{"['str1', 'str2', 'str3'] | reverse", "str3, str2, str1"},
+                            InputOutputPair{"[3, 1, 2] | reverse",                "2, 1, 3"},
+                            InputOutputPair{"reflectedIntVector | reverse",       "4, 5, 3, 6, 2, 7, 1, 8, 0, 9"}
+                            ));
+
+INSTANTIATE_TEST_CASE_P(Sum, FilterGenericTest, ::testing::Values(
+                            InputOutputPair{"[1, 2, 3, 4, 5] | sum", "15"},
+                            InputOutputPair{"[] | sum(start=15)", "15"},
+                            InputOutputPair{"intValue | sum", ""},
+                            InputOutputPair{"intList | sum(start=10)", "55"},
+                            InputOutputPair{"stringValue | sum", "rain"},
+                            InputOutputPair{"('str1', 'str2', 'str3', 'str4', 'str5', 'Str6') | sum", "str1str2str3str4str5Str6"},
+                            InputOutputPair{"('str1', 'str2', 'str3', 'str4', 'str5', 'Str6') | sum(start='Hello')", "Hellostr1str2str3str4str5Str6"},
+                            InputOutputPair{"reflectedList | sum(attribute='strValue')", "test string 0test string 1test string 2test string 3test string 4test string 5test string 6test string 7test string 8test string 9"}
+                            ));
