Fix matching of Some in Some

apm/core.py

@@ -706,11 +706,11 @@ def _match_subsequence(it: SeqIterator, pattern, terminators: List,
                             it.rewind()
                             raise StopIteration
                 if _is_a(current_pattern, Some):
+                    it.rewind()
                     r = _match_some(it, current_pattern, terminators=[next_pattern, *terminators], ctx=ctx)
                     if r is None:
                         raise StopIteration
                     r.merge(it, ctx)
-                    subsequence.append(item)
                     subsequence.extend(r.matches)
                     continue
                 if ctx.match(item, current_pattern):

tests/test_some.py

@@ -252,6 +252,8 @@ def test_docstring_examples(self):
         self.assertEqual([1, 2, 3], result['123'])
         self.assertEqual([4, 5, 6, 7, 8, 9], result['xs'])
 
-    # def test_subsequence_not_matching(self):
-    #     self.assertTrue(match([0, 1, 2, 2, 1, 2, 2, 4], [0, Some(1, Some(2, 2, at_least=1), at_least=2), 4]))
-    #     # self.assertFalse(match([0, 1, 2, 2, 1, 2, 3, 4], [0, Some(1, Some(2, 2, at_least=1), at_least=2), 4]))
+    def test_subsequence_not_matching(self):
+        self.assertTrue(match([0, 1, 2, 2, 1, 2, 2, 4], [0, Some(1, Some(2, 2, at_least=1), at_least=2), 4]))
+
+    def test_subsequence_not_matching_unhappy_path(self):
+        self.assertFalse(match([0, 1, 2, 2, 1, 2, 3, 4], [0, Some(1, Some(2, 2, at_least=1), at_least=2), 4]))

tests/test_transform.py

@@ -49,6 +49,7 @@ def test_transform(self):
             Arguments(foo=int, bar=float),
             Returns(str),
             Object(SomeClass, 8, bar='quuz'),
+            {"foo": 1} ** Remainder(...),
             [1, 2, 3],
             "foo",
             1.0,