Drops my silly idea of case( range(1,3) ) -> 1, 2, or 3.

mikeckennedy · mikeckennedy · commit 86ef5071008b · 2017-09-14T09:27:49.000-07:00
diff --git a/switchlang.py b/switchlang.py
@@ -12,7 +12,7 @@ def default(self, func: Callable[[], Any]):
 
     def case(self, key, func: Callable[[], Any]):
         if isinstance(key, range):
-            for n in range(key.start, key.stop + 1, key.step):
+            for n in key:
                 self.case(n, func)
             return
 
diff --git a/tests/coretests.py b/tests/coretests.py
@@ -88,26 +88,34 @@ def test_error_duplicate_case(self):
                 s.case(1, lambda: None)
 
     def test_multiple_values_one_case_range(self):
-        value = 7
-
         executed_case = None
 
         def get_set_case(val):
             nonlocal executed_case
             executed_case = val
 
-        # I'm a little unsure what is the right way to handle this
-        # On one hand, reading case(range(1,5)) seems like it should
-        # include 1, 2, 3, 4, 5.
-        # But list(range(1,5)) is [1,2,3,4]. So that would be inconsistent.
-        # Thoughts?
-        # I'm going with 1,2,3,4,5 for range(1,5) for now.
-        with switch(value) as s:
-            s.case(range(1, 5), lambda: get_set_case("1-to-5"))
+        for value in range(1, 5):
+            with switch(value) as s:
+                s.case(range(1, 6), lambda: get_set_case("1-to-5"))
+                s.case(range(6, 7), lambda: get_set_case("6-to-7"))
+                s.default(lambda: get_set_case('default'))
+
+            self.assertEqual(executed_case, "1-to-5")
+
+        for value in range(6, 7):
+            with switch(value) as s:
+                s.case(range(1, 6), lambda: get_set_case("1-to-5"))
+                s.case(range(6, 7), lambda: get_set_case("6-to-7"))
+                s.default(lambda: get_set_case('default'))
+
+            self.assertEqual(executed_case, "6-to-7")
+
+        with switch(7) as s:
+            s.case(range(1, 6), lambda: get_set_case("1-to-5"))
             s.case(range(6, 7), lambda: get_set_case("6-to-7"))
             s.default(lambda: get_set_case('default'))
 
-        self.assertEqual(executed_case, "6-to-7")
+        self.assertEqual(executed_case, "default")
 
     def test_multiple_values_one_case_list(self):
         value = 6
