Fix crash when all None in any

osm-fr · Jul 1, 2023 · ad9a55f · ad9a55f
1 parent 4fc59bd
commit ad9a55f
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 2 deletions.
diff --git a/mapcss/mapcss_lib.py b/mapcss/mapcss_lib.py
@@ -393,8 +393,12 @@ def count(lst):
 #any(obj1, obj2, ...)
 #    returns the first object which is not null (formerly coalesce, [since 7164])
 def any_(*args):
-    if args is not None:
-        return next(item for item in args if item is not None and (not isinstance(item, str_value_) or not item.none))
+    try:
+        if args is not None:
+            return next(item for item in args if item is not None and (not isinstance(item, str_value_) or not item.none))
+    except StopIteration:
+        # All arguments are None
+        return None_value
 
 #concat(str1, str2, ...)
 #    assemble the strings to one

diff --git a/plugins/tests/test_mapcss_parsing_evalutation.py b/plugins/tests/test_mapcss_parsing_evalutation.py
@@ -408,6 +408,20 @@ def node(self, data, tags):
                 # assertNoMatch:"node y=world"
                 err.append({'class': 11, 'subclass': 1778220616, 'text': mapcss.tr('test any {0} {1}', mapcss.any_(mapcss.tag(tags, 'b'), ''), mapcss.any_(mapcss.tag(tags, 'c'), mapcss.tag(tags, 'd'), ''))})
 
+        # node[any(tag("x"),tag("y"))]
+        if True:
+            match = False
+            if not match:
+                capture_tags = {}
+                try: match = ((mapcss.any_(mapcss.tag(tags, 'x'), mapcss.tag(tags, 'y'))))
+                except mapcss.RuleAbort: pass
+            if match:
+                # throwWarning:"test"
+                # assertMatch:"node x=yes"
+                # assertMatch:"node y=yes"
+                # assertNoMatch:"node z=yes"
+                err.append({'class': 6, 'subclass': 519126950, 'text': {'en': 'test'}})
+
         return err
 
     def way(self, data, tags, nds):
@@ -1099,6 +1113,9 @@ class father:
         self.check_not_err(n.node(data, {'x': 'hello', 'y': 'world'}), expected={'class': 11, 'subclass': 1778220616})
         self.check_err(n.node(data, {'x': 'hello'}), expected={'class': 11, 'subclass': 1778220616})
         self.check_not_err(n.node(data, {'y': 'world'}), expected={'class': 11, 'subclass': 1778220616})
+        self.check_err(n.node(data, {'x': 'yes'}), expected={'class': 6, 'subclass': 519126950})
+        self.check_err(n.node(data, {'y': 'yes'}), expected={'class': 6, 'subclass': 519126950})
+        self.check_not_err(n.node(data, {'z': 'yes'}), expected={'class': 6, 'subclass': 519126950})
         self.check_err(n.way(data, {'x': 'C00;C1;C22'}, [0]), expected={'class': 12, 'subclass': 1785050832})
         self.check_err(n.way(data, {'x': 'C1'}, [0]), expected={'class': 12, 'subclass': 1785050832})
         self.check_not_err(n.way(data, {'x': 'C12'}, [0]), expected={'class': 12, 'subclass': 1785050832})

diff --git a/plugins/tests/test_mapcss_parsing_evalutation.validator.mapcss b/plugins/tests/test_mapcss_parsing_evalutation.validator.mapcss
@@ -403,3 +403,10 @@ node[a] {
   assertNoMatch: "node y=world";
   assertNoMatch: "node unknownkey=yes";
 }
+
+node[any(tag("x"), tag("y"))] {
+  throwWarning: "test";
+  assertMatch: "node x=yes";
+  assertMatch: "node y=yes";
+  assertNoMatch: "node z=yes";
+}