extra checks when arg is range

CPMpy · Jun 5, 2024 · ba6585f · ba6585f
1 parent 6eed364
commit ba6585f
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/xcsp3/executable/callbacks.py b/xcsp3/executable/callbacks.py
@@ -752,15 +752,19 @@ def get_cpm_vars(self, lst):
         if isinstance(lst[0], (XVar, int)):
             return [self.get_cpm_var(x) for x in lst]
         if isinstance(lst[0], range):
-            return list(eval(str(lst[0])))
+            assert len(lst) == 1, "Expected range here, but got list with multiple elements, what's the semantics???
+            return list(lst[0]) # this should work without converting to str first
+            # return list(eval(str(lst[0])))
         else:
             return self.vars_from_node(lst)
 
     def get_cpm_exprs(self, lst):
         if isinstance(lst[0], XVar):
             return [self.get_cpm_var(x) for x in lst]
         if isinstance(lst[0], range):
-            return list(eval(str(lst[0])))
+            assert len(lst) == 1, "Expected range here, but got list with multiple elements, what's the semantics???
+            return list(lst[0]) # this should work without converting to str first
+            # return list(eval(str(lst[0])))
         else:
             return self.exprs_from_node(lst)