ProvableHQ/leo
1
1
Fork 0
mirror of https://github.com/ProvableHQ/leo.git synced 2024-11-23 15:15:47 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix conflicts

Browse Source
This commit is contained in:
collin 2022-08-03 16:18:34 -07:00
commit 3a32e51753
25 changed files with 197 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
compiler/compiler/src/test.rs
View File

@ -262,7 +262,8 @@ fn run_test(test: Test, handler: &Handler, err_buf: &BufferEmitter) -> Result<Va
// Open the package at the temporary directory.
let _package = handler.extend_if_error(Package::<Testnet3>::open(&directory).map_err(LeoError::Anyhow))?;
// Get the program process and check all instructions.
// Commented out since it bottlenecks the test framework.
// // Get the program process and check all instructions.
// handler.extend_if_error(package.get_process().map_err(LeoError::Anyhow))?;
}

8
tests/expectations/compiler/integers/i128/operator_methods.out
View File

@ -3,7 +3,7 @@ namespace: Compile
expectation: Pass
outputs:
- output:
- initial_input_ast: 01980590e6fa50034c226d4672bcd6d6a7f25b20dea3d696750947803335f586
initial_ast: fb0cc32c174c5b14d16bafef9de4bef50db82e85f825fd316864ccfb0ceaf193
unrolled_ast: fb0cc32c174c5b14d16bafef9de4bef50db82e85f825fd316864ccfb0ceaf193
ssa_ast: a77f23366aec73c3e1d33c304410fc058e50012fee1053e3815a34f574f4e5b6
- initial_input_ast: 2cdec89946ee5d754b1c20f14588f495b768d43e753f0f7070e81931bfad7325
initial_ast: 7f0b27bc6312e701cbde5401d6cfa0e53408dcbab2ca4c0388893095acead078
unrolled_ast: 7f0b27bc6312e701cbde5401d6cfa0e53408dcbab2ca4c0388893095acead078
ssa_ast: 751dd2a7c6576c5be7f9d248af5d3d9882cbc0c6cb3a311f89c635da4c01dc54

9
tests/expectations/compiler/integers/i128/rem.out Normal file
View File

@ -0,0 +1,9 @@
---
namespace: Compile
expectation: Pass
outputs:
- output:
- initial_input_ast: 7034fae8c2db1f78f9f42400f5a6b28d498a7d31f7e35923584622420bfa0ef6
initial_ast: ab1b9a36f37ef52f5211c5da9eaac5f50a54efb39c3ab9fce386e5868c30c944
unrolled_ast: ab1b9a36f37ef52f5211c5da9eaac5f50a54efb39c3ab9fce386e5868c30c944
ssa_ast: 4f20c71f9846f99cb2ff9be801d162a68bdf6bbe27cce6dd4334dc1742ef8910

8
tests/expectations/compiler/integers/i16/operator_methods.out
View File

@ -3,7 +3,7 @@ namespace: Compile
expectation: Pass
outputs:
- output:
- initial_input_ast: b0770aff98c17e17fb47ce2269ab3fe89208374c8f786f02c0747c71e24bd362
initial_ast: 91811f9d0b0dbe7b10516540b6315b84e89c29adecd3519633cb9daa018b6642
unrolled_ast: 91811f9d0b0dbe7b10516540b6315b84e89c29adecd3519633cb9daa018b6642
ssa_ast: 5e416fd79808589e432225eb608e390539aefb06e28b5c6d1c1d5419a9e3cdf1
- initial_input_ast: 7c6b3e32cd105e1721fbc2ec3b24d9cdafec2c8ffc85c86124ceb79b9d6944b3
initial_ast: 78f864048cf11fab25d246761081cf090f9e5c329246635a584b5d9b7681603e
unrolled_ast: 78f864048cf11fab25d246761081cf090f9e5c329246635a584b5d9b7681603e
ssa_ast: 0eec7d492c0f3c02e30e0552c6044b813a3e7821177238c59dcfc14593056627

9
tests/expectations/compiler/integers/i16/rem.out Normal file
View File

@ -0,0 +1,9 @@
---
namespace: Compile
expectation: Pass
outputs:
- output:
- initial_input_ast: 452b7c31531e8687d2bd8dd4036e0916485f052e946807e3cb3e23143f2eeaf3
initial_ast: 2867f7d56ace218e75060901c326d67c0c525c56ce27bb314ef8d7ae3ae1a76d
unrolled_ast: 2867f7d56ace218e75060901c326d67c0c525c56ce27bb314ef8d7ae3ae1a76d
ssa_ast: d6011175507672a6e14ac9229d2c623d6748c22687378d9e65d01edafc219783

8
tests/expectations/compiler/integers/i32/operator_methods.out
View File

@ -3,7 +3,7 @@ namespace: Compile
expectation: Pass
outputs:
- output:
- initial_input_ast: 5982207793f575c078ebaa299a9383b47ed884ac654e04814e434698b1e7b2d9
initial_ast: b21cc99be651e02756d59c2b09e20e3a26f28254950c532d597164718100f96d
unrolled_ast: b21cc99be651e02756d59c2b09e20e3a26f28254950c532d597164718100f96d
ssa_ast: ce3c988b360d4c57f25e47ab54d2a576679ef9fe81d94f573a76ed007f40779a
- initial_input_ast: db058c082b7ffb442e7add1f541930f3f69248fe6a1a75bd86dd9e76ed7da45e
initial_ast: 92bf5423aef1760db113f1027fc4b347a5ddb9ef463c0d556fc862a166ff56ac
unrolled_ast: 92bf5423aef1760db113f1027fc4b347a5ddb9ef463c0d556fc862a166ff56ac
ssa_ast: 2aa9d5cab12bb7b5b93d2095c2564cd39ac74514f6ba1b0dcd1f053a59b500b7

9
tests/expectations/compiler/integers/i32/rem.out Normal file
View File

@ -0,0 +1,9 @@
---
namespace: Compile
expectation: Pass
outputs:
- output:
- initial_input_ast: 1e1ad21140ba63decbebd0245ea4e64e60f42a572cf131e83e7dea27048774e5
initial_ast: 07dd99dfb2c6fd1213c9b8324cccc30c68032a0db4c53a26210511cedc901ae9
unrolled_ast: 07dd99dfb2c6fd1213c9b8324cccc30c68032a0db4c53a26210511cedc901ae9
ssa_ast: 160fbb8bdaf3c0d1caee7d6b069409e1b6429b50d0de2d8f157be2843ca3c041

8
tests/expectations/compiler/integers/i64/operator_methods.out
View File

@ -3,7 +3,7 @@ namespace: Compile
expectation: Pass
outputs:
- output:
- initial_input_ast: 3e1f97e09d691a7cc07c30632ba77ddb7381dca49117709bea416d388a5f715b
initial_ast: 6b13e53f52dca426745e7c9f360bac64aa60f23a6d16e97c7f756499de383ed2
unrolled_ast: 6b13e53f52dca426745e7c9f360bac64aa60f23a6d16e97c7f756499de383ed2
ssa_ast: 1a6da1f1a4119d8fa9b6d88042669c6de3a0fd395d20c434affb79db03151ea8
- initial_input_ast: 0acf8220ae3e5880de908b6467277ba8dad966ed868dc17048dff74f95f78ed2
initial_ast: b14915246b77003d6fc7ea6171cd48d3cb46ebb752c69907f7817c1361d7b80c
unrolled_ast: b14915246b77003d6fc7ea6171cd48d3cb46ebb752c69907f7817c1361d7b80c
ssa_ast: aacdf4f5a60f405a64407d4eb6d734796bdf0eb4498409f2aefb3302553372e6

9
tests/expectations/compiler/integers/i64/rem.out Normal file
View File

@ -0,0 +1,9 @@
---
namespace: Compile
expectation: Pass
outputs:
- output:
- initial_input_ast: fb4b6c2851eb750bb98fdc1a605cc454eae67d391169390fe4bc4762da357330
initial_ast: 1969b46b67698ba73bec9e20d52fe81166011cb88006617f37c813d755ecdc8c
unrolled_ast: 1969b46b67698ba73bec9e20d52fe81166011cb88006617f37c813d755ecdc8c
ssa_ast: f8d3bbaac6776dfb2724e33e487a8fd49db21c5c1ad1e4ccdcacb3bebd40574a

8
tests/expectations/compiler/integers/i8/operator_methods.out
View File

@ -3,7 +3,7 @@ namespace: Compile
expectation: Pass
outputs:
- output:
- initial_input_ast: fb24ac144cdf7a6e0e308c106be309c354ea413d2690b815b72b9bae3ce1a169
initial_ast: 368311591f23ba5a2593095f04744abee8659b072d83f95ca558ce885f239f95
unrolled_ast: 368311591f23ba5a2593095f04744abee8659b072d83f95ca558ce885f239f95
ssa_ast: 0da36a564bc5b5d5e15721d9f7b405e8d8149060d9df396975ae5ffb098c7666
- initial_input_ast: 765bdd32300bb1c6cc41a330ec4682bf661b5176d22558cabfc7bb32927b6b7e
initial_ast: 5b28380cf1df2fd88f238dd6fcd39014b48b67cb52e854403bbb22c60d62bcd8
unrolled_ast: 5b28380cf1df2fd88f238dd6fcd39014b48b67cb52e854403bbb22c60d62bcd8
ssa_ast: 2a40e20d2d9d6d7bad5dd658a2c98bc0b1ea7a93f853f87c5c75624724b0fa47

9
tests/expectations/compiler/integers/i8/rem.out Normal file
View File

@ -0,0 +1,9 @@
---
namespace: Compile
expectation: Pass
outputs:
- output:
- initial_input_ast: 5da63be4ca3051be011a7ac00c13189ffcde7abd35bf5a1ddfb4d204712522ae
initial_ast: adf8960ff38edc57c36a5272a7785b16970f7079cc1c0055f7ab7b5cad7737a3
unrolled_ast: adf8960ff38edc57c36a5272a7785b16970f7079cc1c0055f7ab7b5cad7737a3
ssa_ast: a413f7b78b2c1cbc0f6d11121303f69d730bd569287bad2d81c24361f2ddb9a4

8
tests/expectations/compiler/integers/u128/operator_methods.out
View File

@ -3,7 +3,7 @@ namespace: Compile
expectation: Pass
outputs:
- output:
- initial_input_ast: 323e17762e30677ac3100cad9a455a99d3d57115531e2ca04caa8cf1311266ac
initial_ast: 04dd2fc152a79580155495dbdbae6f9685460550425e5d595914a04b68b21460
unrolled_ast: 04dd2fc152a79580155495dbdbae6f9685460550425e5d595914a04b68b21460
ssa_ast: 24372d9eedc0e12e1b735e1b9627b4a58616c2ee50e400a15cadd0d02eff254e
- initial_input_ast: f7882e4643fc53461eefafdf2f724f98373f3651e7a9152ca7ad259df9824fcb
initial_ast: cdf941764d7bf0e68259338a7ccff08ebc8600b4580bc4d24b654429ee906961
unrolled_ast: cdf941764d7bf0e68259338a7ccff08ebc8600b4580bc4d24b654429ee906961
ssa_ast: 742f1dbd1a5e4cae41f82d64573ba9ec65c1c37004647f2dc5bc691b10768c2d

9
tests/expectations/compiler/integers/u128/rem.out Normal file
View File

@ -0,0 +1,9 @@
---
namespace: Compile
expectation: Pass
outputs:
- output:
- initial_input_ast: 5db93e51b45bd2c1865c73929c64b3d86b684c92e48aa32f851015d0c02f9887
initial_ast: 50332d1909ec58a3e4368ec29ab1836ec0a2b466ebd997900558940a4a668773
unrolled_ast: 50332d1909ec58a3e4368ec29ab1836ec0a2b466ebd997900558940a4a668773
ssa_ast: 9920fd00eeef41a2785dc00525e6a9644e6ab31c157ceeecfc073f6f68dd12f9

8
tests/expectations/compiler/integers/u16/operator_methods.out
View File

@ -3,7 +3,7 @@ namespace: Compile
expectation: Pass
outputs:
- output:
- initial_input_ast: ff9c2d1e56ff3e1807432f3315573cbfaf9129ee77b5782bfc87fdb29018fcfa
initial_ast: b421820b604e7060e5ab68f80666db1e7c44761836e4af18e6480030e7838b01
unrolled_ast: b421820b604e7060e5ab68f80666db1e7c44761836e4af18e6480030e7838b01
ssa_ast: bc06877111b17d90685d0ce9a92decb7a3067915d1609d9cd98f78d148aab345
- initial_input_ast: de68fd8f65ab55dd352992e05138d5ce25e9d5900aadc3dda46b4710141b415b
initial_ast: b58175a772bda3a885a92916c69724b39a36a6648a2f02eb04ef800426e2b1bd
unrolled_ast: b58175a772bda3a885a92916c69724b39a36a6648a2f02eb04ef800426e2b1bd
ssa_ast: 5c00983fc4cc7c4826c388f08ea042b79db37c59e09d8af0aee6109dd084df9c

9
tests/expectations/compiler/integers/u16/rem.out Normal file
View File

@ -0,0 +1,9 @@
---
namespace: Compile
expectation: Pass
outputs:
- output:
- initial_input_ast: bb055123854595a4f93cef4f89dfc0dd322e79a50ed9cf95ea4992e050a7e864
initial_ast: 9a60bb544f2a246733dd82bf045b981873076987be8f52eb80d741b373411042
unrolled_ast: 9a60bb544f2a246733dd82bf045b981873076987be8f52eb80d741b373411042
ssa_ast: b7183150cefd1184063f687e8f639e7bfd1767d04baefafd8564c933b55515ea

8
tests/expectations/compiler/integers/u32/operator_methods.out
View File

@ -3,7 +3,7 @@ namespace: Compile
expectation: Pass
outputs:
- output:
- initial_input_ast: 907decb03860d1163454d2b5b01e1034a748fd40b4d773e7f6b9130a11edf301
initial_ast: ce0e3d994459bc18e2ff67a33b6723513c5d282048b4b93de562e569fc363432
unrolled_ast: ce0e3d994459bc18e2ff67a33b6723513c5d282048b4b93de562e569fc363432
ssa_ast: 0001052f1275598e6bfcd81c8f55ca8889a86d5a21ff288b2f09ad56c33237a6
- initial_input_ast: 1ba0cb9923adad8e10e7f15abb34095a75df715005eda6fcbfc286bb735086bc
initial_ast: bedf638e35c99a24eb8182d190d9687d5f8d1fca5d143558fe27237c924d7719
unrolled_ast: bedf638e35c99a24eb8182d190d9687d5f8d1fca5d143558fe27237c924d7719
ssa_ast: 56a227e19f851b5281eb53c0fea6dea78e4a6f8010805d0222bef92378ca107a

9
tests/expectations/compiler/integers/u32/rem.out Normal file
View File

@ -0,0 +1,9 @@
---
namespace: Compile
expectation: Pass
outputs:
- output:
- initial_input_ast: a6c57f9e310c5c979bec62d2681c7bd2dc1ef0ce672a76c8480943858289937b
initial_ast: d5bf8671786ce2e2d0f1216d6be9e299e670be38e1a52b50af548e521a8a6ebb
unrolled_ast: d5bf8671786ce2e2d0f1216d6be9e299e670be38e1a52b50af548e521a8a6ebb
ssa_ast: 196e46248f9eed0cfc1897ef3fe88b154feb2085aff2db7cd52da6ce3ffad59f

8
tests/expectations/compiler/integers/u64/operator_methods.out
View File

@ -3,7 +3,7 @@ namespace: Compile
expectation: Pass
outputs:
- output:
- initial_input_ast: 58dc0a83c33aaa0f6ccbc5c4441afc1731f3786e885421af64b00c79256cc1c7
initial_ast: 439c9cbb5790ad633c223f55f00f440c943a8016dc5bc7a1ab6ab289111b70e7
unrolled_ast: 439c9cbb5790ad633c223f55f00f440c943a8016dc5bc7a1ab6ab289111b70e7
ssa_ast: 30f3c02a1c60d0407bca3ea6dc7d5b69173527b06af69951f530be86200726b0
- initial_input_ast: b14a42e44e9f3d53ae523553f456c7c7377db63853ebf36aaf0e2b4fc88197ce
initial_ast: a10e9f13ecf18cf313f84452fdded1e1769faf50aee884f64629f40aa3b352fb
unrolled_ast: a10e9f13ecf18cf313f84452fdded1e1769faf50aee884f64629f40aa3b352fb
ssa_ast: 33a7ebf3bb45c604475a18b6f23f3bed0e9ab87b766384a65e756beb1fd49b8b

9
tests/expectations/compiler/integers/u64/rem.out Normal file
View File

@ -0,0 +1,9 @@
---
namespace: Compile
expectation: Pass
outputs:
- output:
- initial_input_ast: 6824ff7cf3bf1848c9697340221c23ed27db55bd35fa0e3d4a51afb342dca798
initial_ast: e7c916a9c480b0a4d971e1fcfea3ee0ef53f505592aca0503721a7df246cbea8
unrolled_ast: e7c916a9c480b0a4d971e1fcfea3ee0ef53f505592aca0503721a7df246cbea8
ssa_ast: afb5bbfff45accea82e804d420db6bce009182dffd1569f21824e03b19fa5d95

8
tests/expectations/compiler/integers/u8/operator_methods.out
View File

@ -3,7 +3,7 @@ namespace: Compile
expectation: Pass
outputs:
- output:
- initial_input_ast: c3b116f4488d161d75436a017fb2cbef40813da29efcbe6f841eb8933101e1b9
initial_ast: f0eb1b31e1e5bca816153e30e3c16e5ad5fc289a28a4b357bd58e24795e1bb1e
unrolled_ast: f0eb1b31e1e5bca816153e30e3c16e5ad5fc289a28a4b357bd58e24795e1bb1e
ssa_ast: 6b429df3eb68656917a7f5341aabfbbff022b969cbe534062cb6be9305ade148
- initial_input_ast: d6c06d5e8b1e095caf4450d1dfa1f5dadcec9b7bf0c04c95a1bbfda5582b86ae
initial_ast: 88ddefda690a9fed07e1b4fe12b0631f33b53caffaf178269ee742801e8288db
unrolled_ast: 88ddefda690a9fed07e1b4fe12b0631f33b53caffaf178269ee742801e8288db
ssa_ast: 81532fb4e8b8d736e25d8ae927af92399f02e064df8925f8813f8db51b113b28

9
tests/expectations/compiler/integers/u8/rem.out Normal file
View File

@ -0,0 +1,9 @@
---
namespace: Compile
expectation: Pass
outputs:
- output:
- initial_input_ast: 75c65019abb9d4d2b03ca454d75070980c5eddfd4a3f55105da62dc462e6f2b4
initial_ast: 5efb20dc1326a870ee33fa4eac732b211ac929e531401e584197c905a55c74e7
unrolled_ast: 5efb20dc1326a870ee33fa4eac732b211ac929e531401e584197c905a55c74e7
ssa_ast: 9eb64a287cc5c93a9fffcb3e6eaaa722dd3ff31e8b86717aaae579cbbc658fdf

9
tests/expectations/compiler/statements/operations/rem_assign.out Normal file
View File

@ -0,0 +1,9 @@
---
namespace: Compile
expectation: Pass
outputs:
- output:
- initial_input_ast: no input
initial_ast: e858f8b0e6c5d4614eaecc150a9a5c8ab033450d76652e0f0ef6ea91ec910e39
unrolled_ast: e858f8b0e6c5d4614eaecc150a9a5c8ab033450d76652e0f0ef6ea91ec910e39
ssa_ast: ab2f448197a6b431bed9004df247074e51afa346017edc2f271b9aef27343ead

16
tests/parser/expression/binary/modulo.leo Normal file
View File

@ -0,0 +1,16 @@
/*
namespace: ParseExpression
expectation: Pass
*/
!-x.mod(y)
x.mod(y).mod(y).mod(y)
-x.mod(y)
(-x).mod(y)
-(x.mod(y))
(-x.mod(y)).mod(y)
!x.mod(y)
(!x).mod(y)
!(x.mod(y))
(!x.mod(y)).mod(y)
(x.mod(y) / x.mod(y)).mod(x.mod(y) / x.mod(y))

24
tests/parser/expression/binary/rem.leo Normal file
View File

@ -0,0 +1,24 @@
/*
namespace: ParseExpression
expectation: Pass
*/
1u8 % 1u8
2u8%3u8
1u8 % 2u8 % 3u8
1u8 ** 2u8 % 3u8 ** 4u8
!-x.rem(y)
x.rem(y).rem(y).rem(y)
-x.rem(y)
(-x).rem(y)
-(x.rem(y))
(-x.rem(y)).rem(y)
!x.rem(y)
(!x).rem(y)
!(x.rem(y))
(!x.rem(y)).rem(y)
(x.rem(y) % x.rem(y)).rem(x.rem(y) % x.rem(y))

16
tests/parser/expression/binary/rem_wrapped.leo Normal file
View File

@ -0,0 +1,16 @@
/*
namespace: ParseExpression
expectation: Pass
*/
!-x.rem_wrapped(y)
x.rem_wrapped(y).rem_wrapped(y).rem_wrapped(y)
-x.rem_wrapped(y)
(-x).rem_wrapped(y)
-(x.rem_wrapped(y))
(-x.rem_wrapped(y)).rem_wrapped(y)
!x.rem_wrapped(y)
(!x).rem_wrapped(y)
!(x.rem_wrapped(y))
(!x.rem_wrapped(y)).rem_wrapped(y)
(x.rem_wrapped(y) / x.rem_wrapped(y)).rem_wrapped(x.rem_wrapped(y) / x.rem_wrapped(y))