Rewrite OpenQASM 3 exporter symbol table

crates/circuit/src/operations.rs

@@ -359,6 +359,16 @@ impl StandardGate {
     pub fn get_name(&self) -> &str {
         self.name()
     }
+
+    pub fn __eq__(&self, other: &Bound<PyAny>) -> Py<PyAny> {
+        let py = other.py();
+        let Ok(other) = other.extract::<Self>() else { return py.NotImplemented() };
+        (*self == other).into_py(py)
+    }
+
+    pub fn __hash__(&self) -> isize {
+        *self as isize
+    }
 }
 
 // This must be kept up-to-date with `StandardGate` when adding or removing

qiskit/qasm3/ast.py

@@ -456,39 +456,23 @@ class SubroutineBlock(ProgramBlock):
     pass
 
 
-class QuantumArgument(QuantumDeclaration):
-    """
-    quantumArgument
-        : 'qreg' Identifier designator? | 'qubit' designator? Identifier
-    """
-
-
-class QuantumGateSignature(ASTNode):
+class QuantumGateDefinition(Statement):
     """
-    quantumGateSignature
-        : quantumGateName ( LPAREN identifierList? RPAREN )? identifierList
+    quantumGateDefinition
+        : 'gate' quantumGateSignature quantumBlock
     """
 
     def __init__(
         self,
         name: Identifier,
-        qargList: List[Identifier],
-        params: Optional[List[Expression]] = None,
+        params: Tuple[Identifier, ...],
+        qubits: Tuple[Identifier, ...],
+        body: QuantumBlock,
     ):
         self.name = name
-        self.qargList = qargList
         self.params = params
-
-
-class QuantumGateDefinition(Statement):
-    """
-    quantumGateDefinition
-        : 'gate' quantumGateSignature quantumBlock
-    """
-
-    def __init__(self, quantumGateSignature: QuantumGateSignature, quantumBlock: QuantumBlock):
-        self.quantumGateSignature = quantumGateSignature
-        self.quantumBlock = quantumBlock
+        self.qubits = qubits
+        self.body = body
 
 
 class SubroutineDefinition(Statement):