QuLab 2.7.14__cp312-cp312-macosx_10_13_universal2.whl → 2.7.15__cp312-cp312-macosx_10_13_universal2.whl

qulab/executor/template.py

@@ -121,7 +121,10 @@ def inject_mapping(source: str, mapping: dict[str, Any],
     hash_str, mapping_code = encode_mapping(mapping)
 
     tree = ast.parse(source)
+
     lines = source.splitlines()
+    lines_offset = [0 for _ in range(len(lines))]
+
     extractor = TemplateVarExtractor(fname, mapping)
     extractor.visit(tree)
 
@@ -134,8 +137,10 @@ def inject_mapping(source: str, mapping: dict[str, Any],
     for (lineno, end_lineno, col_offset,
          end_col_offset), (kind, name, old_source,
                            new_source) in extractor.replacements.items():
-        head = lines[lineno - 1][:col_offset]
-        tail = lines[end_lineno - 1][end_col_offset:]
+        head = lines[lineno - 1][:col_offset + lines_offset[lineno - 1]]
+        tail = lines[end_lineno - 1][end_col_offset +
+                                     lines_offset[end_lineno - 1]:]
+        length_of_last_line = len(lines[end_lineno - 1])
         content = lines[lineno - 1:end_lineno]
         content[0] = content[0].removeprefix(head)
         content[-1] = content[-1].removesuffix(tail)
@@ -148,8 +153,12 @@ def inject_mapping(source: str, mapping: dict[str, Any],
             formated_lines[-1] = formated_lines[-1] + tail
             if len(formated_lines) == 1:
                 lines[lineno - 1] = formated_lines[0]
+                lines_offset[lineno -
+                             1] += len(lines[lineno - 1]) - length_of_last_line
             else:
                 lines[lineno - 1:end_lineno] = formated_lines
+                lines_offset[end_lineno - 1] += len(
+                    lines[end_lineno - 1]) - length_of_last_line
         else:
             pattern = re.compile(r'VAR\s*\(\s*(["\'])(\w+)\1\s*\)')
             replacement = f'__VAR_{hash_str}' + r'[\1\2\1]'
@@ -157,11 +166,15 @@ def inject_mapping(source: str, mapping: dict[str, Any],
 
             if lineno == end_lineno:
                 lines[lineno - 1] = head + new_content + tail
+                lines_offset[lineno -
+                             1] += len(lines[lineno - 1]) - length_of_last_line
             else:
                 lines[lineno - 1] = head + new_content[:-1]
                 for i in range(lineno, end_lineno - 1):
                     lines[i] = ''
                 lines[end_lineno - 1] = ']' + tail
+                lines_offset[end_lineno - 1] += len(
+                    lines[end_lineno - 1]) - length_of_last_line
 
     injected_code = '\n'.join([
         f"__QULAB_TEMPLATE__ = \"{fname}\"",

qulab/version.py

@@ -1 +1 @@
-__version__ = "2.7.14"
+__version__ = "2.7.15"

{qulab-2.7.14.dist-info → qulab-2.7.15.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: QuLab
-Version: 2.7.14
+Version: 2.7.15
 Summary: contral instruments and manage data
 Author-email: feihoo87 <feihoo87@gmail.com>
 Maintainer-email: feihoo87 <feihoo87@gmail.com>

{qulab-2.7.14.dist-info → qulab-2.7.15.dist-info}/RECORD

@@ -1,10 +1,10 @@
 qulab/__init__.py,sha256=KJcUcZ5qXY6wlAoirzK_B-dgtDjsLmOE671v3gcXO_c,286
 qulab/__main__.py,sha256=fjaRSL_uUjNIzBGNgjlGswb9TJ2VD5qnkZHW3hItrD4,68
 qulab/dicttree.py,sha256=tRRMpGZYVOLw0TEByE3_2Ss8FdOmzuGL9e1DWbs8qoY,13684
-qulab/fun.cpython-312-darwin.so,sha256=A1IiKe0LamQnI-xxWbOYLa-_dLfrFDxt7Mj-5frjNdg,126864
+qulab/fun.cpython-312-darwin.so,sha256=bailttV5K7OqtKNYvd4z1px1ky3nzYQ2c8WFDJseDZw,126864
 qulab/typing.py,sha256=vg62sGqxuD9CI5677ejlzAmf2fVdAESZCQjAE_xSxPg,69
 qulab/utils.py,sha256=JIXMSmZU0uYfKG_tzawpK7vRNPRir_hJE8JlqkVLX2o,1260
-qulab/version.py,sha256=EOaPKhakr_sGt3kyeAuC9YO4wdeUpBRH8qGbweYomv8,22
+qulab/version.py,sha256=-hKvJfKSrJwPY8gXyRBQzkjU0b1wKGMX2qCqb_6ZsJU,22
 qulab/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 qulab/cli/commands.py,sha256=tgDIkkeIoasQXAifJZ6NU8jDgpNgb2a-B0C4nF0evrE,559
 qulab/cli/config.py,sha256=Ei7eSYnbwPPlluDnm8YmWONYiI4g7WtvlZGQdr1Z6vo,3688
@@ -13,7 +13,7 @@ qulab/executor/cli.py,sha256=z8W1RivKdABQSOGy2viNUvG73QvOBpE9gSKjw45vSVA,9794
 qulab/executor/load.py,sha256=_Zn4wtGGD8pBZwOfbJaaFVAr8riY2Bkhi67lX9Jy-hA,17427
 qulab/executor/schedule.py,sha256=9pTOVWzKiDc7ip8iuB_47poJcYOvoBI9eQwTrDTA3p0,19044
 qulab/executor/storage.py,sha256=gI6g28BmKKEZ_Pl-hFwvpiOj3mF8Su-yjj3hfMXs1VY,11630
-qulab/executor/template.py,sha256=goHwfPJsR_Zbc-YopRwDaBXBL_7myLmwwXmjQ-ykPbk,6864
+qulab/executor/template.py,sha256=1c7xd0U82fLaqb8O0NQIVVd7aRLuCZNT11-heFw2n9Q,7540
 qulab/executor/transform.py,sha256=BDx0c4nqTHMAOLVqju0Ydd91uxNm6EpVIfssjZse0bI,2284
 qulab/executor/utils.py,sha256=l_b0y2kMwYKyyXeFtoblPYwKNU-wiFQ9PMo9QlWl9wE,6213
 qulab/monitor/__init__.py,sha256=nTHelnDpxRS_fl_B38TsN0njgq8eVTEz9IAnN3NbDlM,42
@@ -97,9 +97,9 @@ qulab/visualization/plot_seq.py,sha256=UWTS6p9nfX_7B8ehcYo6UnSTUCjkBsNU9jiOeW2ca
 qulab/visualization/qdat.py,sha256=ZeevBYWkzbww4xZnsjHhw7wRorJCBzbG0iEu-XQB4EA,5735
 qulab/visualization/rot3d.py,sha256=lMrEJlRLwYe6NMBlGkKYpp_V9CTipOAuDy6QW_cQK00,734
 qulab/visualization/widgets.py,sha256=6KkiTyQ8J-ei70LbPQZAK35wjktY47w2IveOa682ftA,3180
-qulab-2.7.14.dist-info/LICENSE,sha256=PRzIKxZtpQcH7whTG6Egvzl1A0BvnSf30tmR2X2KrpA,1065
-qulab-2.7.14.dist-info/METADATA,sha256=qN3n03Tq9bUJtk_nzhM9umjz8F5--J4DjegOIZgiNd0,3699
-qulab-2.7.14.dist-info/WHEEL,sha256=fFOVbjuXq1Laa94sCGPI7Uf9zA1mmgTMmAoKgZIw_cY,115
-qulab-2.7.14.dist-info/entry_points.txt,sha256=b0v1GXOwmxY-nCCsPN_rHZZvY9CtTbWqrGj8u1m8yHo,45
-qulab-2.7.14.dist-info/top_level.txt,sha256=3T886LbAsbvjonu_TDdmgxKYUn939BVTRPxPl9r4cEg,6
-qulab-2.7.14.dist-info/RECORD,,
+qulab-2.7.15.dist-info/LICENSE,sha256=PRzIKxZtpQcH7whTG6Egvzl1A0BvnSf30tmR2X2KrpA,1065
+qulab-2.7.15.dist-info/METADATA,sha256=qV-NFza6lghhNhFqpPouQzNyYQLlVm-8VPdc5oxZHAw,3699
+qulab-2.7.15.dist-info/WHEEL,sha256=fFOVbjuXq1Laa94sCGPI7Uf9zA1mmgTMmAoKgZIw_cY,115
+qulab-2.7.15.dist-info/entry_points.txt,sha256=b0v1GXOwmxY-nCCsPN_rHZZvY9CtTbWqrGj8u1m8yHo,45
+qulab-2.7.15.dist-info/top_level.txt,sha256=3T886LbAsbvjonu_TDdmgxKYUn939BVTRPxPl9r4cEg,6
+qulab-2.7.15.dist-info/RECORD,,