From 3c4273a06c37c37b9db79f8e9906579087ff85fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= Date: Wed, 4 Nov 2020 19:20:49 +0100 Subject: [PATCH] cmdlineTests: Use .yul extension for Yul files - Currently many files have .sol extension because originally the test script required it but this has changed some time ago. --- .../evm_to_wasm/{input.sol => input.yul} | 0 test/cmdlineTests/evm_to_wasm/output | 2 +- .../{input.sol => input.yul} | 0 test/cmdlineTests/evm_to_wasm_break/output | 2 +- .../object_compiler/{input.sol => input.yul} | 0 test/cmdlineTests/object_compiler/output | 34 ++-- test/cmdlineTests/strict_asm_jump/err | 2 +- .../strict_asm_jump/{input.sol => input.yul} | 0 .../yul_stack_opt/{input.sol => input.yul} | 0 test/cmdlineTests/yul_stack_opt/output | 158 +++++++++--------- .../{input.sol => input.yul} | 0 .../yul_stack_opt_disabled/output | 2 +- 12 files changed, 100 insertions(+), 100 deletions(-) rename test/cmdlineTests/evm_to_wasm/{input.sol => input.yul} (100%) rename test/cmdlineTests/evm_to_wasm_break/{input.sol => input.yul} (100%) rename test/cmdlineTests/object_compiler/{input.sol => input.yul} (100%) rename test/cmdlineTests/strict_asm_jump/{input.sol => input.yul} (100%) rename test/cmdlineTests/yul_stack_opt/{input.sol => input.yul} (100%) rename test/cmdlineTests/yul_stack_opt_disabled/{input.sol => input.yul} (100%) diff --git a/test/cmdlineTests/evm_to_wasm/input.sol b/test/cmdlineTests/evm_to_wasm/input.yul similarity index 100% rename from test/cmdlineTests/evm_to_wasm/input.sol rename to test/cmdlineTests/evm_to_wasm/input.yul diff --git a/test/cmdlineTests/evm_to_wasm/output b/test/cmdlineTests/evm_to_wasm/output index 11b63c6a2..599380726 100644 --- a/test/cmdlineTests/evm_to_wasm/output +++ b/test/cmdlineTests/evm_to_wasm/output @@ -1,5 +1,5 @@ -======= evm_to_wasm/input.sol (Ewasm) ======= +======= evm_to_wasm/input.yul (Ewasm) ======= Pretty printed source: object "object" { diff --git a/test/cmdlineTests/evm_to_wasm_break/input.sol b/test/cmdlineTests/evm_to_wasm_break/input.yul similarity index 100% rename from test/cmdlineTests/evm_to_wasm_break/input.sol rename to test/cmdlineTests/evm_to_wasm_break/input.yul diff --git a/test/cmdlineTests/evm_to_wasm_break/output b/test/cmdlineTests/evm_to_wasm_break/output index ecb9a9ce3..0348dcccb 100644 --- a/test/cmdlineTests/evm_to_wasm_break/output +++ b/test/cmdlineTests/evm_to_wasm_break/output @@ -1,5 +1,5 @@ -======= evm_to_wasm_break/input.sol (Ewasm) ======= +======= evm_to_wasm_break/input.yul (Ewasm) ======= Pretty printed source: object "object" { diff --git a/test/cmdlineTests/object_compiler/input.sol b/test/cmdlineTests/object_compiler/input.yul similarity index 100% rename from test/cmdlineTests/object_compiler/input.sol rename to test/cmdlineTests/object_compiler/input.yul diff --git a/test/cmdlineTests/object_compiler/output b/test/cmdlineTests/object_compiler/output index f257721b9..66ad61fb7 100644 --- a/test/cmdlineTests/object_compiler/output +++ b/test/cmdlineTests/object_compiler/output @@ -1,5 +1,5 @@ -======= object_compiler/input.sol (EVM) ======= +======= object_compiler/input.yul (EVM) ======= Pretty printed source: object "MyContract" { @@ -26,42 +26,42 @@ Binary representation: 33600055600b806012600039806000f350fe60005460005260206000f3 Text representation: - /* "object_compiler/input.sol":128:136 */ + /* "object_compiler/input.yul":128:136 */ caller - /* "object_compiler/input.sol":125:126 */ + /* "object_compiler/input.yul":125:126 */ 0x00 - /* "object_compiler/input.sol":118:137 */ + /* "object_compiler/input.yul":118:137 */ sstore dataSize(sub_0) - /* "object_compiler/input.sol":240:259 */ + /* "object_compiler/input.yul":240:259 */ dup1 dataOffset(sub_0) - /* "object_compiler/input.sol":125:126 */ + /* "object_compiler/input.yul":125:126 */ 0x00 - /* "object_compiler/input.sol":205:260 */ + /* "object_compiler/input.yul":205:260 */ codecopy - /* "object_compiler/input.sol":275:294 */ + /* "object_compiler/input.yul":275:294 */ dup1 - /* "object_compiler/input.sol":125:126 */ + /* "object_compiler/input.yul":125:126 */ 0x00 - /* "object_compiler/input.sol":265:295 */ + /* "object_compiler/input.yul":265:295 */ return pop stop sub_0: assembly { - /* "object_compiler/input.sol":397:398 */ + /* "object_compiler/input.yul":397:398 */ 0x00 - /* "object_compiler/input.sol":391:399 */ + /* "object_compiler/input.yul":391:399 */ sload - /* "object_compiler/input.sol":397:398 */ + /* "object_compiler/input.yul":397:398 */ 0x00 - /* "object_compiler/input.sol":381:400 */ + /* "object_compiler/input.yul":381:400 */ mstore - /* "object_compiler/input.sol":417:421 */ + /* "object_compiler/input.yul":417:421 */ 0x20 - /* "object_compiler/input.sol":397:398 */ + /* "object_compiler/input.yul":397:398 */ 0x00 - /* "object_compiler/input.sol":407:422 */ + /* "object_compiler/input.yul":407:422 */ return } diff --git a/test/cmdlineTests/strict_asm_jump/err b/test/cmdlineTests/strict_asm_jump/err index caefd1690..48d061fee 100644 --- a/test/cmdlineTests/strict_asm_jump/err +++ b/test/cmdlineTests/strict_asm_jump/err @@ -1,6 +1,6 @@ Warning: Yul is still experimental. Please use the output with care. Error: Function not found. - --> strict_asm_jump/input.sol:1:3: + --> strict_asm_jump/input.yul:1:3: | 1 | { jump(1) } | ^^^^ diff --git a/test/cmdlineTests/strict_asm_jump/input.sol b/test/cmdlineTests/strict_asm_jump/input.yul similarity index 100% rename from test/cmdlineTests/strict_asm_jump/input.sol rename to test/cmdlineTests/strict_asm_jump/input.yul diff --git a/test/cmdlineTests/yul_stack_opt/input.sol b/test/cmdlineTests/yul_stack_opt/input.yul similarity index 100% rename from test/cmdlineTests/yul_stack_opt/input.sol rename to test/cmdlineTests/yul_stack_opt/input.yul diff --git a/test/cmdlineTests/yul_stack_opt/output b/test/cmdlineTests/yul_stack_opt/output index 5f0cee8ea..7c0e8ca66 100644 --- a/test/cmdlineTests/yul_stack_opt/output +++ b/test/cmdlineTests/yul_stack_opt/output @@ -1,5 +1,5 @@ -======= yul_stack_opt/input.sol (EVM) ======= +======= yul_stack_opt/input.yul (EVM) ======= Pretty printed source: object "object" { @@ -42,164 +42,164 @@ Binary representation: 6001808155806002558060035580600455806005558060065580600755806008558060095580600a5580600b5580600c5580600d55808155806002558060035580600455806005558060065580600755806008558060095580600a5580600b5580600c5580600d5580815550 Text representation: - /* "yul_stack_opt/input.sol":98:99 */ + /* "yul_stack_opt/input.yul":98:99 */ 0x01 dup1 dup2 - /* "yul_stack_opt/input.sol":129:141 */ + /* "yul_stack_opt/input.yul":129:141 */ sstore - /* "yul_stack_opt/input.sol":98:99 */ + /* "yul_stack_opt/input.yul":98:99 */ dup1 - /* "yul_stack_opt/input.sol":151:160 */ + /* "yul_stack_opt/input.yul":151:160 */ 0x02 - /* "yul_stack_opt/input.sol":144:164 */ + /* "yul_stack_opt/input.yul":144:164 */ sstore - /* "yul_stack_opt/input.sol":98:99 */ + /* "yul_stack_opt/input.yul":98:99 */ dup1 - /* "yul_stack_opt/input.sol":174:183 */ + /* "yul_stack_opt/input.yul":174:183 */ 0x03 - /* "yul_stack_opt/input.sol":167:187 */ + /* "yul_stack_opt/input.yul":167:187 */ sstore - /* "yul_stack_opt/input.sol":98:99 */ + /* "yul_stack_opt/input.yul":98:99 */ dup1 - /* "yul_stack_opt/input.sol":197:206 */ + /* "yul_stack_opt/input.yul":197:206 */ 0x04 - /* "yul_stack_opt/input.sol":190:210 */ + /* "yul_stack_opt/input.yul":190:210 */ sstore - /* "yul_stack_opt/input.sol":98:99 */ + /* "yul_stack_opt/input.yul":98:99 */ dup1 - /* "yul_stack_opt/input.sol":220:229 */ + /* "yul_stack_opt/input.yul":220:229 */ 0x05 - /* "yul_stack_opt/input.sol":213:233 */ + /* "yul_stack_opt/input.yul":213:233 */ sstore - /* "yul_stack_opt/input.sol":98:99 */ + /* "yul_stack_opt/input.yul":98:99 */ dup1 - /* "yul_stack_opt/input.sol":243:252 */ + /* "yul_stack_opt/input.yul":243:252 */ 0x06 - /* "yul_stack_opt/input.sol":236:256 */ + /* "yul_stack_opt/input.yul":236:256 */ sstore - /* "yul_stack_opt/input.sol":98:99 */ + /* "yul_stack_opt/input.yul":98:99 */ dup1 - /* "yul_stack_opt/input.sol":266:275 */ + /* "yul_stack_opt/input.yul":266:275 */ 0x07 - /* "yul_stack_opt/input.sol":259:279 */ + /* "yul_stack_opt/input.yul":259:279 */ sstore - /* "yul_stack_opt/input.sol":98:99 */ + /* "yul_stack_opt/input.yul":98:99 */ dup1 - /* "yul_stack_opt/input.sol":289:298 */ + /* "yul_stack_opt/input.yul":289:298 */ 0x08 - /* "yul_stack_opt/input.sol":282:302 */ + /* "yul_stack_opt/input.yul":282:302 */ sstore - /* "yul_stack_opt/input.sol":98:99 */ + /* "yul_stack_opt/input.yul":98:99 */ dup1 - /* "yul_stack_opt/input.sol":312:321 */ + /* "yul_stack_opt/input.yul":312:321 */ 0x09 - /* "yul_stack_opt/input.sol":305:325 */ + /* "yul_stack_opt/input.yul":305:325 */ sstore - /* "yul_stack_opt/input.sol":98:99 */ + /* "yul_stack_opt/input.yul":98:99 */ dup1 - /* "yul_stack_opt/input.sol":335:344 */ + /* "yul_stack_opt/input.yul":335:344 */ 0x0a - /* "yul_stack_opt/input.sol":328:348 */ + /* "yul_stack_opt/input.yul":328:348 */ sstore - /* "yul_stack_opt/input.sol":98:99 */ + /* "yul_stack_opt/input.yul":98:99 */ dup1 - /* "yul_stack_opt/input.sol":358:368 */ + /* "yul_stack_opt/input.yul":358:368 */ 0x0b - /* "yul_stack_opt/input.sol":351:372 */ + /* "yul_stack_opt/input.yul":351:372 */ sstore - /* "yul_stack_opt/input.sol":98:99 */ + /* "yul_stack_opt/input.yul":98:99 */ dup1 - /* "yul_stack_opt/input.sol":382:392 */ + /* "yul_stack_opt/input.yul":382:392 */ 0x0c - /* "yul_stack_opt/input.sol":375:396 */ + /* "yul_stack_opt/input.yul":375:396 */ sstore - /* "yul_stack_opt/input.sol":98:99 */ + /* "yul_stack_opt/input.yul":98:99 */ dup1 - /* "yul_stack_opt/input.sol":406:416 */ + /* "yul_stack_opt/input.yul":406:416 */ 0x0d - /* "yul_stack_opt/input.sol":399:420 */ + /* "yul_stack_opt/input.yul":399:420 */ sstore - /* "yul_stack_opt/input.sol":98:99 */ + /* "yul_stack_opt/input.yul":98:99 */ dup1 dup2 - /* "yul_stack_opt/input.sol":129:141 */ + /* "yul_stack_opt/input.yul":129:141 */ sstore - /* "yul_stack_opt/input.sol":98:99 */ + /* "yul_stack_opt/input.yul":98:99 */ dup1 - /* "yul_stack_opt/input.sol":151:160 */ + /* "yul_stack_opt/input.yul":151:160 */ 0x02 - /* "yul_stack_opt/input.sol":144:164 */ + /* "yul_stack_opt/input.yul":144:164 */ sstore - /* "yul_stack_opt/input.sol":98:99 */ + /* "yul_stack_opt/input.yul":98:99 */ dup1 - /* "yul_stack_opt/input.sol":174:183 */ + /* "yul_stack_opt/input.yul":174:183 */ 0x03 - /* "yul_stack_opt/input.sol":167:187 */ + /* "yul_stack_opt/input.yul":167:187 */ sstore - /* "yul_stack_opt/input.sol":98:99 */ + /* "yul_stack_opt/input.yul":98:99 */ dup1 - /* "yul_stack_opt/input.sol":197:206 */ + /* "yul_stack_opt/input.yul":197:206 */ 0x04 - /* "yul_stack_opt/input.sol":190:210 */ + /* "yul_stack_opt/input.yul":190:210 */ sstore - /* "yul_stack_opt/input.sol":98:99 */ + /* "yul_stack_opt/input.yul":98:99 */ dup1 - /* "yul_stack_opt/input.sol":220:229 */ + /* "yul_stack_opt/input.yul":220:229 */ 0x05 - /* "yul_stack_opt/input.sol":213:233 */ + /* "yul_stack_opt/input.yul":213:233 */ sstore - /* "yul_stack_opt/input.sol":98:99 */ + /* "yul_stack_opt/input.yul":98:99 */ dup1 - /* "yul_stack_opt/input.sol":243:252 */ + /* "yul_stack_opt/input.yul":243:252 */ 0x06 - /* "yul_stack_opt/input.sol":236:256 */ + /* "yul_stack_opt/input.yul":236:256 */ sstore - /* "yul_stack_opt/input.sol":98:99 */ + /* "yul_stack_opt/input.yul":98:99 */ dup1 - /* "yul_stack_opt/input.sol":266:275 */ + /* "yul_stack_opt/input.yul":266:275 */ 0x07 - /* "yul_stack_opt/input.sol":259:279 */ + /* "yul_stack_opt/input.yul":259:279 */ sstore - /* "yul_stack_opt/input.sol":98:99 */ + /* "yul_stack_opt/input.yul":98:99 */ dup1 - /* "yul_stack_opt/input.sol":289:298 */ + /* "yul_stack_opt/input.yul":289:298 */ 0x08 - /* "yul_stack_opt/input.sol":282:302 */ + /* "yul_stack_opt/input.yul":282:302 */ sstore - /* "yul_stack_opt/input.sol":98:99 */ + /* "yul_stack_opt/input.yul":98:99 */ dup1 - /* "yul_stack_opt/input.sol":312:321 */ + /* "yul_stack_opt/input.yul":312:321 */ 0x09 - /* "yul_stack_opt/input.sol":305:325 */ + /* "yul_stack_opt/input.yul":305:325 */ sstore - /* "yul_stack_opt/input.sol":98:99 */ + /* "yul_stack_opt/input.yul":98:99 */ dup1 - /* "yul_stack_opt/input.sol":335:344 */ + /* "yul_stack_opt/input.yul":335:344 */ 0x0a - /* "yul_stack_opt/input.sol":328:348 */ + /* "yul_stack_opt/input.yul":328:348 */ sstore - /* "yul_stack_opt/input.sol":98:99 */ + /* "yul_stack_opt/input.yul":98:99 */ dup1 - /* "yul_stack_opt/input.sol":358:368 */ + /* "yul_stack_opt/input.yul":358:368 */ 0x0b - /* "yul_stack_opt/input.sol":351:372 */ + /* "yul_stack_opt/input.yul":351:372 */ sstore - /* "yul_stack_opt/input.sol":98:99 */ + /* "yul_stack_opt/input.yul":98:99 */ dup1 - /* "yul_stack_opt/input.sol":382:392 */ + /* "yul_stack_opt/input.yul":382:392 */ 0x0c - /* "yul_stack_opt/input.sol":375:396 */ + /* "yul_stack_opt/input.yul":375:396 */ sstore - /* "yul_stack_opt/input.sol":98:99 */ + /* "yul_stack_opt/input.yul":98:99 */ dup1 - /* "yul_stack_opt/input.sol":406:416 */ + /* "yul_stack_opt/input.yul":406:416 */ 0x0d - /* "yul_stack_opt/input.sol":399:420 */ + /* "yul_stack_opt/input.yul":399:420 */ sstore - /* "yul_stack_opt/input.sol":98:99 */ + /* "yul_stack_opt/input.yul":98:99 */ dup1 dup2 - /* "yul_stack_opt/input.sol":729:743 */ + /* "yul_stack_opt/input.yul":729:743 */ sstore pop diff --git a/test/cmdlineTests/yul_stack_opt_disabled/input.sol b/test/cmdlineTests/yul_stack_opt_disabled/input.yul similarity index 100% rename from test/cmdlineTests/yul_stack_opt_disabled/input.sol rename to test/cmdlineTests/yul_stack_opt_disabled/input.yul diff --git a/test/cmdlineTests/yul_stack_opt_disabled/output b/test/cmdlineTests/yul_stack_opt_disabled/output index f6fa373df..c65f6f367 100644 --- a/test/cmdlineTests/yul_stack_opt_disabled/output +++ b/test/cmdlineTests/yul_stack_opt_disabled/output @@ -1,5 +1,5 @@ -======= yul_stack_opt_disabled/input.sol (EVM) ======= +======= yul_stack_opt_disabled/input.yul (EVM) ======= Pretty printed source: object "object" {