Merge branch 'master' of gitlab.control.lth.se:anders_blomdell/pluto

robotlab_safety/pluto_auto.py

@@ -24,6 +24,13 @@ class PlutoVariables:
             rh = [ m.group(3).format(v, pluto=self.by_name[v][0])
                    for v in self.by_name if re.match(regexp, v)]
             return("%s=%s" % (lh, '*'.join(rh)))
+        m = re.match('([^=]+)=OR\{(.*),(.*)\}', expr)
+        if m:
+            lh = m.group(1)
+            regexp = m.group(2).replace('*', '.*')
+            rh = [ m.group(3).format(v, pluto=self.by_name[v][0])
+                   for v in self.by_name if re.match(regexp, v)]
+            return("%s=%s" % (lh, '+'.join(rh)))
         raise Exception('Invalid expression', expr)