Generalize AUTO generation somewhat

robotlab_safety/pluto_auto.py

@@ -17,11 +17,11 @@ class PlutoVariables:
         pass
 
     def codegen(self, expr):
-        m = re.match('([^=]+)=ALL\((.*)\)', expr)
+        m = re.match('([^=]+)=AND\{(.*),(.*)\}', expr)
         if m:
             lh = m.group(1)
             regexp = m.group(2).replace('*', '.*')
-            rh = [ "(%s+/SM_Pluto%d_Present)" % (v, self.by_name[v][0])
+            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)