libqasm 0.6.2__cp311-cp311-macosx_10_10_universal2.whl → 0.6.4__cp311-cp311-macosx_10_10_universal2.whl

cqasm/v3x/ast.py

@@ -5333,19 +5333,19 @@ class GlobalBlock(Block):
     __slots__ = [
         '_attr_qubit_variable_declaration',
         '_attr_gates',
-        '_attr_measure_instruction',
+        '_attr_measure_instructions',
     ]
 
     def __init__(
         self,
         qubit_variable_declaration=None,
         gates=None,
-        measure_instruction=None,
+        measure_instructions=None,
     ):
         super().__init__()
         self.qubit_variable_declaration = qubit_variable_declaration
         self.gates = gates
-        self.measure_instruction = measure_instruction
+        self.measure_instructions = measure_instructions
 
     @property
     def qubit_variable_declaration(self):
@@ -5388,24 +5388,24 @@ class GlobalBlock(Block):
         self._attr_gates = MultiGate()
 
     @property
-    def measure_instruction(self):
-        return self._attr_measure_instruction
+    def measure_instructions(self):
+        return self._attr_measure_instructions
 
-    @measure_instruction.setter
-    def measure_instruction(self, val):
+    @measure_instructions.setter
+    def measure_instructions(self, val):
         if val is None:
-            del self.measure_instruction
+            del self.measure_instructions
             return
-        if not isinstance(val, MeasureInstruction):
+        if not isinstance(val, MultiMeasureInstruction):
             # Try to "typecast" if this isn't an obvious mistake.
             if isinstance(val, Node):
-                raise TypeError('measure_instruction must be of type MeasureInstruction')
-            val = MeasureInstruction(val)
-        self._attr_measure_instruction = val
+                raise TypeError('measure_instructions must be of type MultiMeasureInstruction')
+            val = MultiMeasureInstruction(val)
+        self._attr_measure_instructions = val
 
-    @measure_instruction.deleter
-    def measure_instruction(self):
-        self._attr_measure_instruction = None
+    @measure_instructions.deleter
+    def measure_instructions(self):
+        self._attr_measure_instructions = MultiMeasureInstruction()
 
     def __eq__(self, other):
         """Equality operator. Ignores annotations!"""
@@ -5415,7 +5415,7 @@ class GlobalBlock(Block):
             return False
         if self.gates != other.gates:
             return False
-        if self.measure_instruction != other.measure_instruction:
+        if self.measure_instructions != other.measure_instructions:
             return False
         return True
 
@@ -5452,13 +5452,14 @@ class GlobalBlock(Block):
                 s.append(child.dump(indent + 1, annotations, links) + '\n')
             s.append('  '*indent + ']\n')
         s.append('  '*indent)
-        s.append('measure_instruction: ')
-        if self.measure_instruction is None:
+        s.append('measure_instructions: ')
+        if not self.measure_instructions:
             s.append('-\n')
         else:
-            s.append('<\n')
-            s.append(self.measure_instruction.dump(indent + 1, annotations, links) + '\n')
-            s.append('  '*indent + '>\n')
+            s.append('[\n')
+            for child in self.measure_instructions:
+                s.append(child.dump(indent + 1, annotations, links) + '\n')
+            s.append('  '*indent + ']\n')
         indent -= 1
         s.append('  '*indent)
         s.append(')')
@@ -5480,8 +5481,8 @@ class GlobalBlock(Block):
             self._attr_qubit_variable_declaration.find_reachable(id_map)
         for el in self._attr_gates:
             el.find_reachable(id_map)
-        if self._attr_measure_instruction is not None:
-            self._attr_measure_instruction.find_reachable(id_map)
+        for el in self._attr_measure_instructions:
+            el.find_reachable(id_map)
         return id_map
 
     def check_complete(self, id_map=None):
@@ -5497,15 +5498,15 @@ class GlobalBlock(Block):
             self._attr_qubit_variable_declaration.check_complete(id_map)
         for child in self._attr_gates:
             child.check_complete(id_map)
-        if self._attr_measure_instruction is not None:
-            self._attr_measure_instruction.check_complete(id_map)
+        for child in self._attr_measure_instructions:
+            child.check_complete(id_map)
 
     def copy(self):
         """Returns a shallow copy of this node."""
         return GlobalBlock(
             qubit_variable_declaration=self._attr_qubit_variable_declaration,
             gates=self._attr_gates.copy(),
-            measure_instruction=self._attr_measure_instruction
+            measure_instructions=self._attr_measure_instructions.copy()
         )
 
     def clone(self):
@@ -5517,7 +5518,7 @@ class GlobalBlock(Block):
         return GlobalBlock(
             qubit_variable_declaration=_cloned(self._attr_qubit_variable_declaration),
             gates=_cloned(self._attr_gates),
-            measure_instruction=_cloned(self._attr_measure_instruction)
+            measure_instructions=_cloned(self._attr_measure_instructions)
         )
 
     @staticmethod
@@ -5562,19 +5563,23 @@ class GlobalBlock(Block):
                 raise ValueError('unexpected edge type for Any/Many element')
             f_gates.append(Gate._deserialize(element, seq_to_ob, links))
 
-        # Deserialize the measure_instruction field.
-        field = cbor.get('measure_instruction', None)
+        # Deserialize the measure_instructions field.
+        field = cbor.get('measure_instructions', None)
         if not isinstance(field, dict):
-            raise ValueError('missing or invalid serialization of field measure_instruction')
-        if field.get('@T') != '?':
-            raise ValueError('unexpected edge type for field measure_instruction')
-        if field.get('@t', None) is None:
-            f_measure_instruction = None
-        else:
-            f_measure_instruction = MeasureInstruction._deserialize(field, seq_to_ob, links)
+            raise ValueError('missing or invalid serialization of field measure_instructions')
+        if field.get('@T') != '*':
+            raise ValueError('unexpected edge type for field measure_instructions')
+        data = field.get('@d', None)
+        if not isinstance(data, list):
+            raise ValueError('missing serialization of Any/Many contents')
+        f_measure_instructions = MultiMeasureInstruction()
+        for element in data:
+            if element.get('@T') != '1':
+                raise ValueError('unexpected edge type for Any/Many element')
+            f_measure_instructions.append(MeasureInstruction._deserialize(element, seq_to_ob, links))
 
         # Construct the GlobalBlock node.
-        node = GlobalBlock(f_qubit_variable_declaration, f_gates, f_measure_instruction)
+        node = GlobalBlock(f_qubit_variable_declaration, f_gates, f_measure_instructions)
 
         # Deserialize annotations.
         for key, val in cbor.items():
@@ -5618,13 +5623,15 @@ class GlobalBlock(Block):
         field['@d'] = lst
         cbor['gates'] = field
 
-        # Serialize the measure_instruction field.
-        field = {'@T': '?'}
-        if self._attr_measure_instruction is None:
-            field['@t'] = None
-        else:
-            field.update(self._attr_measure_instruction._serialize(id_map))
-        cbor['measure_instruction'] = field
+        # Serialize the measure_instructions field.
+        field = {'@T': '*'}
+        lst = []
+        for el in self._attr_measure_instructions:
+            el = el._serialize(id_map)
+            el['@T'] = '1'
+            lst.append(el)
+        field['@d'] = lst
+        cbor['measure_instructions'] = field
 
         # Serialize annotations.
         for key, val in self._annot.items():

{libqasm-0.6.2.dist-info → libqasm-0.6.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: libqasm
-Version: 0.6.2
+Version: 0.6.4
 Summary: libQasm Python Package
 Home-page: https://github.com/QuTech-Delft/libqasm
 Author: QuTech, TU Delft

{libqasm-0.6.2.dist-info → libqasm-0.6.4.dist-info}/RECORD

@@ -1,16 +1,16 @@
 cqasm/__init__.py,sha256=MsSFjiLMLJZ7QhUPpVBWKiyDnCzryquRyr329NoCACI,2
 cqasm/v3x/__init__.py,sha256=vZyVREhVeJdxipgSMSHGhKfyg70x1ISKn1v2bFO2734,2785
-cqasm/v3x/ast.py,sha256=bo4yd7N9LMdvo63xNF1kfm_xpdZ74y9B6wQ3URmV0J0,412186
+cqasm/v3x/ast.py,sha256=JyrkdyfyHaxWWzyxlTcYLF1w88D-fjs4Jqqkz3_cUws,412518
 cqasm/v3x/instruction.py,sha256=AEOwKV2riafpyTiJvgq7azwOhyhhZfpKV12uWWJ5M2A,1177
 cqasm/v3x/primitives.py,sha256=ESCsMHP1GeuKh2gHQSP0ha24Abp453U-I7JSGK9dZas,1664
 cqasm/v3x/semantic.py,sha256=8zWB24LKxPymLW4lPgxmURGol2LXh7mqBKtZWo1GNKs,86535
 cqasm/v3x/types.py,sha256=NBp3uh23nnGNzKHtOrJBafDJ2wKqhQJ5eJSJtsr0uMk,51593
 cqasm/v3x/values.py,sha256=YY_41YQ7iU2te7FqtstGnQJd4W3CFH7LmkawSKh5e_A,61680
 libQasm/__init__.py,sha256=qxoyhS4wo8oA5cwO4IIbrLuCHztOJAT2MrpCOR2mSF4,727
-libQasm/_libQasm.cpython-311-darwin.so,sha256=-9-Mtc_AC3sWWKtBKNYauCPzVDwptBLsYh1U7GflAQM,4124320
+libQasm/_libQasm.cpython-311-darwin.so,sha256=Uo6zahuNiykGZ1gYxvL5vUGTro-sVDdtpMSAScoLrCs,4145208
 libQasm/libQasm.py,sha256=hzX-iSOvyoM2FBHbKvvol76Mt1lS2F3FweDm37Y-3RM,30595
-libqasm-0.6.2.dist-info/LICENSE.md,sha256=duRlJgy46W8Cw_IQjOmud5xJUvgJkX6pkBmBJkoKi4I,566
-libqasm-0.6.2.dist-info/METADATA,sha256=-mdg0pdGUNaqaoxpgqnaYDS92fNaFFiW4-F-2c_7umc,5913
-libqasm-0.6.2.dist-info/WHEEL,sha256=4F58ZCesPOUjwzTHMKuwuydHHOQLmBKJtTM5AtvBHqQ,116
-libqasm-0.6.2.dist-info/top_level.txt,sha256=w7QwYbOjqjU8FE8PSUGSKMILn4kqQEJWKNLvab5ehEg,14
-libqasm-0.6.2.dist-info/RECORD,,
+libqasm-0.6.4.dist-info/LICENSE.md,sha256=duRlJgy46W8Cw_IQjOmud5xJUvgJkX6pkBmBJkoKi4I,566
+libqasm-0.6.4.dist-info/METADATA,sha256=5hEL-YRZMbnEQBGjXqwEqjllwy2LvEQjwTvNzVHyxX4,5913
+libqasm-0.6.4.dist-info/WHEEL,sha256=4F58ZCesPOUjwzTHMKuwuydHHOQLmBKJtTM5AtvBHqQ,116
+libqasm-0.6.4.dist-info/top_level.txt,sha256=w7QwYbOjqjU8FE8PSUGSKMILn4kqQEJWKNLvab5ehEg,14
+libqasm-0.6.4.dist-info/RECORD,,