Merge branch 'main' into good-bad-controls

Author: cthoyt

src/y0/dsl.py

@@ -48,10 +48,17 @@
     "R",
     "S",
     "T",
+    "U",
     "W",
     "X",
     "Y",
     "Z",
+    "U1",
+    "U2",
+    "U3",
+    "U4",
+    "U5",
+    "U6",
     "V1",
     "V2",
     "V3",
@@ -1320,11 +1327,12 @@ def _iter_variables(self) -> Iterable[Variable]:
 Q = QFactor
 
 AA = Variable("AA")
-A, B, C, D, E, F, G, M, R, S, T, W, X, Y, Z = map(Variable, "ABCDEFGMRSTWXYZ")  # type: ignore
+A, B, C, D, E, F, G, M, R, S, T, U, W, X, Y, Z = map(Variable, "ABCDEFGMRSTUWXYZ")  # type: ignore
+U1, U2, U3, U4, U5, U6 = [Variable(f"U{i}") for i in range(1, 7)]
 V1, V2, V3, V4, V5, V6 = [Variable(f"V{i}") for i in range(1, 7)]
 W0, W1, W2, W3, W4, W5, W6 = [Variable(f"W{i}") for i in range(7)]
 Y1, Y2, Y3, Y4, Y5, Y6 = [Variable(f"Y{i}") for i in range(1, 7)]
-Z1, Z2, Z3, Z4, Z5, Z6 = [Variable(f"Z{i}") for i in range(1, 7)]
+Z1, Z2, Z3, Z4, Z5, Z6 = [Z[i] for i in range(1, 7)]
 
 
 def _sorted_variables(variables: Iterable[Variable]) -> Tuple[Variable, ...]: