aas-core-codegen 0.0.16__py3-none-any.whl → 0.0.17__py3-none-any.whl

{aas_core_codegen-0.0.16.dist-info → aas_core_codegen-0.0.17.dist-info}/RECORD

@@ -1,4 +1,4 @@
-aas_core_codegen/__init__.py,sha256=qFrSlWVqB8x6P4kZVakj7zIpxPwvkTmCF_bBkobXcbA,227
+aas_core_codegen/__init__.py,sha256=IA_tSqN39b6ql7f7Ex4UJpLZ7tVzor-Czia0GnIVICw,227
 aas_core_codegen/__main__.py,sha256=4uNIpl2DOe4vlXUeqzOokQJ6izr84AIHtNKrmxhK3dE,297
 aas_core_codegen/common.py,sha256=kCLtNW39PUt_zY6pPd-BMxAAGXY9F3UUBR150xwsupk,15541
 aas_core_codegen/main.py,sha256=Q-TDcVl04BXu0AbVfBot2CBiXjEPZ_vsUDOWgeNHIFs,7650
@@ -27,9 +27,9 @@ aas_core_codegen/cpp/iteration/_generate.py,sha256=MoXSn0o_POWv9TOjLdHI6mMvLu2lM
 aas_core_codegen/cpp/jsonization/__init__.py,sha256=_nC3KC_SOj_TybUdWzDDRJ_SHbwMcQ153R29waX0wAE,237
 aas_core_codegen/cpp/jsonization/_generate.py,sha256=oWUoJdqtY-P7Nh6ltyNM81v2h77fR4SC_xUrZWKRItI,71432
 aas_core_codegen/cpp/pattern/__init__.py,sha256=YEBCv3ZhtX2wM_DsSJ-4AmzK5GETh9L1dwceZsnt-kg,241
-aas_core_codegen/cpp/pattern/_generate.py,sha256=TLAOs08nJkvCXlNgFohZzVECZ6D6ycEeq9IsjAttvSo,15593
+aas_core_codegen/cpp/pattern/_generate.py,sha256=K0ZsiebFkVMIiVDBCR_Sdal-uB1S_4G4mcnz62lsjZA,15658
 aas_core_codegen/cpp/revm/__init__.py,sha256=J1bAAg-cdWcRhyyK0sCPFQ93o9qZrJZtX67lJWGNn0Q,233
-aas_core_codegen/cpp/revm/_generate.py,sha256=bN-GH1hGYY5kcu-UOsEcTOrptf42OOTBrXure4IF92g,29196
+aas_core_codegen/cpp/revm/_generate.py,sha256=TJWwHPgih4GO6gLY4YdLGuvKAM8zNtl7Dj2PRuMWeZs,29202
 aas_core_codegen/cpp/stringification/__init__.py,sha256=v0n7jL4s17U2izwLsdBKyZOBC_ShrZuiT2kMy4HIm6k,233
 aas_core_codegen/cpp/stringification/_generate.py,sha256=UdpvYY8eRgA6Mhx6sqFcbQQw48fNByHHio6Rx9HvV6o,24810
 aas_core_codegen/cpp/structure/__init__.py,sha256=HIMz3nokGDJesstsS7Nnmhco3qNJoCAhw2xLrZO_XpQ,260
@@ -103,11 +103,11 @@ aas_core_codegen/infer_for_schema/_set.py,sha256=F2ldfUgjdrsicBtI5hDDSJ3hvelBTqm
 aas_core_codegen/infer_for_schema/_stringify.py,sha256=1IQUYb331-Wg3k0mxXk9a57WF6GKIZ1XEmv83Mozbw0,6481
 aas_core_codegen/infer_for_schema/_types.py,sha256=9-50Yn1nhvvFD-7FC8ptc34ANvtRJpql9nDEtDDQUF8,4142
 aas_core_codegen/infer_for_schema/match.py,sha256=fbV6VefFNZcngHFZoAHoXGOxclMI-4N9lmR42N28rI4,3762
-aas_core_codegen/intermediate/__init__.py,sha256=YbIXr5_s97QsBYFQAxZiD8oF1GAZMybNeRzlMUaa0bg,3288
+aas_core_codegen/intermediate/__init__.py,sha256=PDJEIlIPKJXKxNbKf_1wCoQR9OSPMSHgUV-RFlwEg3Y,3426
 aas_core_codegen/intermediate/_hierarchy.py,sha256=eNTHeJ1utc0zmN263TEaMVh6qsc7IdR-LW_03X55Wk8,12825
-aas_core_codegen/intermediate/_stringify.py,sha256=MHcTyAL1GeEIw6d19CKAMYsrZhuEP_uPEPcWai6HCAo,33412
+aas_core_codegen/intermediate/_stringify.py,sha256=ZMRUywQEKgrwkDqsqYQr4eL10VX71cxnD0ISyzJ0r7s,33850
 aas_core_codegen/intermediate/_translate.py,sha256=SOcLdvOC765bNhbeJdI9YxZzuKKpgfIH7Ap0KAPCEJ0,184487
-aas_core_codegen/intermediate/_types.py,sha256=YjtMUb-aVFgAoBAkotMRzHG8QFKFgcBSUmReXt56jic,90645
+aas_core_codegen/intermediate/_types.py,sha256=pg156rdpgHx_a4tcR_K1McG7JMUqd5dx4Xh60e5UeEc,102163
 aas_core_codegen/intermediate/construction.py,sha256=vOMIOYQE5OzguTIKjSPVSVAftUKsGMThdbAIXzX4Gi0,23538
 aas_core_codegen/intermediate/doc.py,sha256=9BbtoMXVZn1UjSmAilDIfPHNg9Y-QruaubpKX3piH6Q,12263
 aas_core_codegen/intermediate/pattern_verification.py,sha256=yriVB_757RImvm5A_P8E-bbx21ZScEldX6cWfnFBgPg,14042
@@ -189,7 +189,7 @@ aas_core_codegen/python/structure/_generate.py,sha256=efXDAPu7Hnu7M3Pxkoh-Rwx7Nr
 aas_core_codegen/python/verification/__init__.py,sha256=mtTscJQu5y9qdyVipCOEQ6mJYeWGhDVQi1UkDvNeG_M,191
 aas_core_codegen/python/verification/_generate.py,sha256=cvoTG2-LUfechtqEsAWNt1MBT9zvt77-rgvuP0yGyh8,46263
 aas_core_codegen/python/xmlization/__init__.py,sha256=DhgYcvdAvybW_BTpOZ1Wx3DnM2nZXsVuO6HmxTlUOeg,168
-aas_core_codegen/python/xmlization/_generate.py,sha256=34viYDtnIbHXve4pMFF7tcrSONiySB4FNvibIhA2sVA,89223
+aas_core_codegen/python/xmlization/_generate.py,sha256=7TApFy2sTo7-w_1ATpcF7U-QFR_3G2fxW8zcdFSksCc,89257
 aas_core_codegen/python_protobuf/__init__.py,sha256=pHVnScI5sBW5NvBHRdeLtakOcQx2DHIZgVUOuKU9MRg,69
 aas_core_codegen/python_protobuf/main.py,sha256=6UrFbCGiSNTJr4Id1EtKoSn-gtcGqkwVWreCT3q33LE,43550
 aas_core_codegen/python_protobuf/naming.py,sha256=xjXYlpXhW3zZKMheSsoPItPi17migVfPCN42Opxv4aQ,2394
@@ -227,8 +227,8 @@ aas_core_codegen/xsd/naming.py,sha256=79tbf5UgmErN4sMSTtFwhiwweCuSO-BzmQ0HaQdwKz
 aas_core_codegen/yielding/__init__.py,sha256=Z4kasROPDU47z3sUMcLXTV8q1rrjfojScsi9Vu3Fxe4,84
 aas_core_codegen/yielding/flow.py,sha256=dSmH_UpXX0lcfej0IikaNTCAaS1Dnu28UkaIshvucL8,4049
 aas_core_codegen/yielding/linear.py,sha256=tSuEqIWFw3LW4ziDz_RYe8MWi_FVoEWVxjUMjK4fhZs,22858
-aas_core_codegen-0.0.16.dist-info/licenses/AUTHORS,sha256=MMMlPKxHrTmheRhXKt2fz5tRE0DOpXMm5Luk2D-IRtM,748
-aas_core_codegen-0.0.16.dist-info/licenses/LICENSE,sha256=WAZY-cEny3dLK_zSgdc6kH2fm7bZz5i3OEWZCcv9cTk,1167
+aas_core_codegen-0.0.17.dist-info/licenses/AUTHORS,sha256=MMMlPKxHrTmheRhXKt2fz5tRE0DOpXMm5Luk2D-IRtM,748
+aas_core_codegen-0.0.17.dist-info/licenses/LICENSE,sha256=WAZY-cEny3dLK_zSgdc6kH2fm7bZz5i3OEWZCcv9cTk,1167
 dev/continuous_integration/__init__.py,sha256=J4SCNyZ0SPSIvRkO-dDZRCg5n_fGc3J9zO9y_P6dVII,54
 dev/continuous_integration/check_help_in_readme.py,sha256=C2ymVvs_ZWrz53WKISMwSordKSKA_QneortyV0vi-PE,6132
 dev/continuous_integration/check_init_and_pyproject_consistent.py,sha256=pNI-637J9K0JbYccY0qQDSi6ysvHSfXKhi4oIaLTQJw,4723
@@ -239,7 +239,7 @@ dev/dev_scripts/copy_to_aas_core3_cpp.py,sha256=AUBHu6iLs6XhzMKmgLbBcyT4GLehg_Aa
 dev/dev_scripts/copy_to_aas_core3_java.py,sha256=-hO2H991SuojrcHLeGVSehMAMhOD5rtbQ1v4iZw2xiE,2398
 dev/dev_scripts/download_latest_aas_core_meta_v3.py,sha256=nqUzlZUCqD8mekRJGSydtu-0U2UwVT8EWhfFFvK-DMA,3093
 dev/dev_scripts/draw_bipartite_graph_based_on_lines.py,sha256=2rrtNRO7v0PxD8R1bwRJNAmhwiU7AJhr-zwQyl7kmi4,1112
-dev/dev_scripts/run_tests_with_rerecord.py,sha256=EeUtRdYXKnO6Ik7gGO_whn8GUx3u_KVPEzqTQ9COlJA,2311
+dev/dev_scripts/run_tests_with_rerecord.py,sha256=XJ0siJxjyVEzDVrmckEabEbUTUdoRaS_t_VOc__eH0U,2458
 dev/dev_scripts/update_to_aas_core_meta.py,sha256=qBBfljXsm_YVcDTwLh8nG40IVicIktzmXtz0GX2cTPk,4903
 dev/integration_tests/main.py,sha256=hfqlQtT5ParBzR8diuCs9Y4kCz7RehKzhs1_ksO7e6U,8304
 dev/integration_tests/input/meta_model.py,sha256=E-dy89WdU6Hxsa4zOB_4mc2ACHnfb2jWmQVlsDTS6Co,817
@@ -283,6 +283,7 @@ dev/test_data/intermediate/expected/constant/constant_set/with_description/meta_
 dev/test_data/intermediate/expected/constant/constant_set/with_superset_of/meta_model.py,sha256=_qn-cmcULlHkRELIHUuhAAyPPGCAaTAmfvvyOaqT8fI,322
 dev/test_data/intermediate/expected/constant/constant_str/only_value/meta_model.py,sha256=BVXLVTfQS556QC89Wgxjrwohy4B_TGjyvQ5yRro9Ayw,121
 dev/test_data/intermediate/expected/constant/constant_str/with_description/meta_model.py,sha256=O1LU_vCmgg-9q5NOwcASa8XMphhmfb7sUIjHosK47rQ,150
+dev/test_data/intermediate/expected/constrained_primitive/inheritance/meta_model.py,sha256=xJ1a9vAZZwR9tgTxr-x3iYLsxZ-6FKS4jbuTVUUWQkQ,347
 dev/test_data/intermediate/expected/documentation/docstring_with_special_characters_in_literal/meta_model.py,sha256=AbEl1ieGRFClWQM7qcNS3QJthfm_DFM4A2YsR8FrjCo,626
 dev/test_data/intermediate/expected/documentation/docstring_with_special_characters_outside_literal/meta_model.py,sha256=YEr5kYn4F6voa4ZsBH4OU_HxqO1OUxedNPwkH_AIz5Q,622
 dev/test_data/intermediate/expected/empty/meta_model.py,sha256=ivZcgQPhDkqzxPurTKQkU5HjLmEPUPeTUKnSoVOwnTc,62
@@ -536,7 +537,7 @@ dev/tests/test_common.py,sha256=VK5oTFx7Sp8fgty4ltQAMMrgy0shW5csmOlFzUbhwrE,3963
 dev/tests/cpp/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dev/tests/cpp/test_common.py,sha256=pqoSQKdzSAN-RQrpjUNe-DE2yJW-DwRWqrOFRpcSig4,827
 dev/tests/cpp/test_main.py,sha256=8vDXC2PooVatGiiJTPzi_oNdfhN6vwDqtYyG5ZyewkI,5721
-dev/tests/cpp/test_pattern.py,sha256=GbLO8_z1SHF50kRGceei8qnWS5IQ5nRamyBVIgnkd_g,4881
+dev/tests/cpp/test_pattern.py,sha256=zaeaW-zVF84s-cwh2adzpdl4kX5L2MHcJTHEQvc9fiY,4974
 dev/tests/cpp/test_verification.py,sha256=arN2N5Zh2-G0En7wj1PulJZ3xr1-d00Se_rL2nmym6o,5661
 dev/tests/cpp/test_yielding.py,sha256=ToxerJX6YWYkXbL20hSQcM8mLW2M4PqIZ5vhuBygruw,5833
 dev/tests/csharp/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -560,10 +561,11 @@ dev/tests/infer_for_schema/test_property_in_set_of_primitives.py,sha256=mm3oWAtk
 dev/tests/intermediate/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dev/tests/intermediate/test_constructor.py,sha256=m3_AqVt6X-r6zUINmSMjxNWBdqEZow2HG09-RGizlMA,22074
 dev/tests/intermediate/test_hierarchy.py,sha256=wdVEHWKAp9bJkj_ru7KtM8vzkuUN4SXfpOAo8ApmhMo,6951
+dev/tests/intermediate/test_pickle.py,sha256=sxvuDt8c7utNMhqDn7V-WTehvzpgl3uhQgysm_SXygc,62963
 dev/tests/intermediate/test_revm.py,sha256=4IvrQJtKpshrgrKy8i5AV7aYXqtbrbrAqxWZZQPaki4,5152
 dev/tests/intermediate/test_translate.py,sha256=1mjpTu_7PdiF3QgxWianrg8Gl-bfX5AL-YixjiG59bk,12597
 dev/tests/intermediate/test_type_inference.py,sha256=QjAwqR06R3T_BNIbbGmGzHtx5ByFNHERz67by4avBJk,11063
-dev/tests/intermediate/test_types.py,sha256=CZeD-fg3hOcWY5MO3zNWcS7gylbzL5aXhIeuTCtc5TE,4607
+dev/tests/intermediate/test_types.py,sha256=92L3o4pG-jwGUNbQZz8EySJc8-c_KKghrMYMny196yc,19648
 dev/tests/java/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dev/tests/java/test_common.py,sha256=KkN4UcFNcYYH5jGv31euxuhh2zNZ4yk9v_xQdTlp2NI,506
 dev/tests/java/test_description.py,sha256=EghPTniak2cVJOGXLqz0CrtG0h0yKlw8hl0QRQZ8JRo,3655
@@ -597,8 +599,8 @@ dev/tests/xsd/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dev/tests/xsd/test_main.py,sha256=ekhnafOrTlP3sS5Zk3PAV5_QwvGbMxaF76EKEEB0gZc,8599
 dev/tests/yielding/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dev/tests/yielding/test_linear.py,sha256=gjfrVm29_NyUqR9MJ5p4vNT_qEW5LCzI5UZdsic_mEg,16682
-aas_core_codegen-0.0.16.dist-info/METADATA,sha256=LWN_zzSkJRjiTG9wck9o5hX6tjkqtgZWvUzllHfXGqU,7263
-aas_core_codegen-0.0.16.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-aas_core_codegen-0.0.16.dist-info/entry_points.txt,sha256=LxR4fYEJgMolkJKtt6jprMzraJzTwoT7l72xuWuYiLY,136
-aas_core_codegen-0.0.16.dist-info/top_level.txt,sha256=mcn2FIS04g-O2WLn8kyLkaJHpB8mqv92D2UsB-3BIsc,21
-aas_core_codegen-0.0.16.dist-info/RECORD,,
+aas_core_codegen-0.0.17.dist-info/METADATA,sha256=HjE9CF2XjZ--5wXDYazdc5OUdyh9fkeTooyV9-v2BP0,7263
+aas_core_codegen-0.0.17.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+aas_core_codegen-0.0.17.dist-info/entry_points.txt,sha256=LxR4fYEJgMolkJKtt6jprMzraJzTwoT7l72xuWuYiLY,136
+aas_core_codegen-0.0.17.dist-info/top_level.txt,sha256=mcn2FIS04g-O2WLn8kyLkaJHpB8mqv92D2UsB-3BIsc,21
+aas_core_codegen-0.0.17.dist-info/RECORD,,

{aas_core_codegen-0.0.16.dist-info → aas_core_codegen-0.0.17.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

dev/dev_scripts/run_tests_with_rerecord.py

@@ -11,6 +11,8 @@ import shlex
 def main() -> int:
     """Execute the main routine."""
     available_tests = [
+        "tests.cpp.test_main.Test_against_recorded",
+        "tests.cpp.test_verification.Test_against_recorded",
         "tests.csharp.test_main.Test_against_recorded",
         "tests.csharp.test_verification.Test_against_recorded",
         "tests.csharp.test_structure.Test_generation_against_recorded",
@@ -44,6 +46,8 @@ def main() -> int:
 
     repo_root = pathlib.Path(os.path.realpath(__file__)).parent.parent.parent
 
+    dev_root = repo_root / "dev"
+
     env = os.environ.copy()
     env["AAS_CORE_CODEGEN_RERECORD"] = "1"
 
@@ -56,7 +60,7 @@ def main() -> int:
         cmd = [sys.executable, "-m", "unittest", "-v", qualified_test_name]
 
         print(f"Executing {qualified_test_name}...")
-        exit_code = subprocess.call(cmd, cwd=str(repo_root), env=env)
+        exit_code = subprocess.call(cmd, cwd=str(dev_root), env=env)
         if exit_code != 0:
             cmd_str = " ".join(shlex.quote(part) for part in cmd)
             print(f"Failed to execute the test: {cmd_str}")

dev/test_data/intermediate/expected/constrained_primitive/inheritance/meta_model.py

@@ -0,0 +1,17 @@
+@invariant(lambda self: len(self) > 0, "Non-empty")
+class Something(str):
+    pass
+
+
+@invariant(lambda self: len(self) <= 9, "At most 9 characters")
+class Child(Something):
+    pass
+
+
+@invariant(lambda self: len(self) <= 5, "At most 5 characters")
+class Grand_child(Child):
+    pass
+
+
+__version__ = "dummy"
+__xml_namespace__ = "https://dummy.com"

dev/tests/cpp/test_pattern.py

@@ -23,43 +23,43 @@ std::vector<std::unique_ptr<revm::Instruction> > program;
   {  // -?[0-9]+
     {  // -?
       program.emplace_back(
-        std::make_unique<revm::InstructionSplit>(1, 2)
+        common::make_unique<revm::InstructionSplit>(1, 2)
       );
       // -
       program.emplace_back(  // 1
-        std::make_unique<revm::InstructionChar>(L'-')
+        common::make_unique<revm::InstructionChar>(L'-')
       );
     }  // -?
     {  // [0-9]+
       // [0-9]
       program.emplace_back(  // 2
-        std::make_unique<revm::InstructionSet>(
+        common::make_unique<revm::InstructionSet>(
           std::vector<revm::Range>{
             revm::Range(L'0', L'9')
           }
         )
       );
       program.emplace_back(
-        std::make_unique<revm::InstructionSplit>(2, 4)
+        common::make_unique<revm::InstructionSplit>(2, 4)
       );
     }  // [0-9]+
   }  // -?[0-9]+
   // -
   program.emplace_back(  // 4
-    std::make_unique<revm::InstructionChar>(L'-')
+    common::make_unique<revm::InstructionChar>(L'-')
   );
   {  // 0[1-9]|1[0-2]
     program.emplace_back(
-      std::make_unique<revm::InstructionSplit>(6, 9)
+      common::make_unique<revm::InstructionSplit>(6, 9)
     );
     {  // 0[1-9]
       // 0
       program.emplace_back(  // 6
-        std::make_unique<revm::InstructionChar>(L'0')
+        common::make_unique<revm::InstructionChar>(L'0')
       );
       // [1-9]
       program.emplace_back(
-        std::make_unique<revm::InstructionSet>(
+        common::make_unique<revm::InstructionSet>(
           std::vector<revm::Range>{
             revm::Range(L'1', L'9')
           }
@@ -67,16 +67,16 @@ std::vector<std::unique_ptr<revm::Instruction> > program;
       );
     }  // 0[1-9]
     program.emplace_back(
-      std::make_unique<revm::InstructionJump>(11)
+      common::make_unique<revm::InstructionJump>(11)
     );
     {  // 1[0-2]
       // 1
       program.emplace_back(  // 9
-        std::make_unique<revm::InstructionChar>(L'1')
+        common::make_unique<revm::InstructionChar>(L'1')
       );
       // [0-2]
       program.emplace_back(
-        std::make_unique<revm::InstructionSet>(
+        common::make_unique<revm::InstructionSet>(
           std::vector<revm::Range>{
             revm::Range(L'0', L'2')
           }
@@ -86,20 +86,20 @@ std::vector<std::unique_ptr<revm::Instruction> > program;
   }  // 0[1-9]|1[0-2]
   // -
   program.emplace_back(  // 11
-    std::make_unique<revm::InstructionChar>(L'-')
+    common::make_unique<revm::InstructionChar>(L'-')
   );
   {  // 0[0-9]|1[0-9]|2[0-9]|30|31
     program.emplace_back(
-      std::make_unique<revm::InstructionSplit>(13, 16)
+      common::make_unique<revm::InstructionSplit>(13, 16)
     );
     {  // 0[0-9]
       // 0
       program.emplace_back(  // 13
-        std::make_unique<revm::InstructionChar>(L'0')
+        common::make_unique<revm::InstructionChar>(L'0')
       );
       // [0-9]
       program.emplace_back(
-        std::make_unique<revm::InstructionSet>(
+        common::make_unique<revm::InstructionSet>(
           std::vector<revm::Range>{
             revm::Range(L'0', L'9')
           }
@@ -107,19 +107,19 @@ std::vector<std::unique_ptr<revm::Instruction> > program;
       );
     }  // 0[0-9]
     program.emplace_back(
-      std::make_unique<revm::InstructionJump>(30)
+      common::make_unique<revm::InstructionJump>(30)
     );
     program.emplace_back(  // 16
-      std::make_unique<revm::InstructionSplit>(17, 20)
+      common::make_unique<revm::InstructionSplit>(17, 20)
     );
     {  // 1[0-9]
       // 1
       program.emplace_back(  // 17
-        std::make_unique<revm::InstructionChar>(L'1')
+        common::make_unique<revm::InstructionChar>(L'1')
       );
       // [0-9]
       program.emplace_back(
-        std::make_unique<revm::InstructionSet>(
+        common::make_unique<revm::InstructionSet>(
           std::vector<revm::Range>{
             revm::Range(L'0', L'9')
           }
@@ -127,19 +127,19 @@ std::vector<std::unique_ptr<revm::Instruction> > program;
       );
     }  // 1[0-9]
     program.emplace_back(
-      std::make_unique<revm::InstructionJump>(30)
+      common::make_unique<revm::InstructionJump>(30)
     );
     program.emplace_back(  // 20
-      std::make_unique<revm::InstructionSplit>(21, 24)
+      common::make_unique<revm::InstructionSplit>(21, 24)
     );
     {  // 2[0-9]
       // 2
       program.emplace_back(  // 21
-        std::make_unique<revm::InstructionChar>(L'2')
+        common::make_unique<revm::InstructionChar>(L'2')
       );
       // [0-9]
       program.emplace_back(
-        std::make_unique<revm::InstructionSet>(
+        common::make_unique<revm::InstructionSet>(
           std::vector<revm::Range>{
             revm::Range(L'0', L'9')
           }
@@ -147,37 +147,37 @@ std::vector<std::unique_ptr<revm::Instruction> > program;
       );
     }  // 2[0-9]
     program.emplace_back(
-      std::make_unique<revm::InstructionJump>(30)
+      common::make_unique<revm::InstructionJump>(30)
     );
     program.emplace_back(  // 24
-      std::make_unique<revm::InstructionSplit>(25, 28)
+      common::make_unique<revm::InstructionSplit>(25, 28)
     );
     {  // 30
       // 3
       program.emplace_back(  // 25
-        std::make_unique<revm::InstructionChar>(L'3')
+        common::make_unique<revm::InstructionChar>(L'3')
       );
       // 0
       program.emplace_back(
-        std::make_unique<revm::InstructionChar>(L'0')
+        common::make_unique<revm::InstructionChar>(L'0')
       );
     }  // 30
     program.emplace_back(
-      std::make_unique<revm::InstructionJump>(30)
+      common::make_unique<revm::InstructionJump>(30)
     );
     {  // 31
       // 3
       program.emplace_back(  // 28
-        std::make_unique<revm::InstructionChar>(L'3')
+        common::make_unique<revm::InstructionChar>(L'3')
       );
       // 1
       program.emplace_back(
-        std::make_unique<revm::InstructionChar>(L'1')
+        common::make_unique<revm::InstructionChar>(L'1')
       );
     }  // 31
   }  // 0[0-9]|1[0-9]|2[0-9]|30|31
   program.emplace_back(  // 30
-    std::make_unique<revm::InstructionMatch>()
+    common::make_unique<revm::InstructionMatch>()
   );
 }  // ^(-?[0-9]+)-(0[1-9]|1[0-2])-(0[0-9]|1[0-9]|2[0-9]|30|31).*$""",
             code,