Merge branch 'main' of github.com:quantumlib/Stim into circuitpop

# Conflicts: # src/stim/circuit/circuit_pybind_test.py
quantumlib · Sep 21, 2024 · 1ed2dcc · 1ed2dcc
2 parents 0bbd469 + 3ee5bf8
commit 1ed2dcc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/stim/circuit/circuit_instruction.cc b/src/stim/circuit/circuit_instruction.cc
@@ -138,7 +138,7 @@ void CircuitInstruction::validate() const {
                     "Two qubit gate " + std::string(gate.name) +
                     " requires an even number of targets but was given "
                     "(" +
-                    comma_sep(args).str() + ").");
+                    comma_sep(targets).str() + ").");
             }
             for (size_t k = 0; k < targets.size(); k += 2) {
                 if (targets[k] == targets[k + 1]) {

diff --git a/src/stim/circuit/circuit_pybind_test.py b/src/stim/circuit/circuit_pybind_test.py
@@ -1897,3 +1897,8 @@ def test_pop():
     c = stim.Circuit("H 0\n X 1")
     assert c.pop() == stim.CircuitInstruction("X", [1])
     assert c.pop() == stim.CircuitInstruction("H", [0])
+
+
+def test_circuit_create_with_odd_cx():
+    with pytest.raises(ValueError, match="0, 1, 2"):
+        stim.Circuit("CX 0 1 2")