waalge
/
aiken
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

now tests are passing

This commit is contained in:
Kasey White 2023-04-09 00:49:43 -04:00 committed by Kasey
parent efb901f3b4
commit 9e95e24624
3 changed files with 14 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
crates/aiken-lang/src/gen_uplc.rs
View File

@ -2753,34 +2753,6 @@ impl<'a> CodeGenerator<'a> {
let func_scope = func_index_map.get(&func).unwrap(); let func_scope = func_index_map.get(&func).unwrap();
let mut added_dependencies = vec![];
let Some(function_component) = function_definitions.get(&func)
else {
unreachable!("Function Definition should exist");
};
if !function_component.args.is_empty() {
for same_scope_func in func_index_map
.iter()
.filter(|item| item.1 == func_scope && &func != item.0)
.map(|item| item.0)
{
if !self.defined_functions.contains_key(same_scope_func)
&& !final_func_dep_ir.contains_key(same_scope_func)
{
added_dependencies.push(same_scope_func.clone());
}
}
}
let Some(function_component) = function_definitions.get_mut(&func)
else {
unreachable!("Function Definition should exist");
};
function_component.dependencies.extend(added_dependencies);
let function_component = function_definitions.get(&func).unwrap(); let function_component = function_definitions.get(&func).unwrap();
let mut dep_ir = vec![]; let mut dep_ir = vec![];

12
crates/aiken-project/src/blueprint/validator.rs
View File

@ -688,8 +688,8 @@ mod test {
"$ref": "#/definitions/test_module~1Either$ByteArray_test_module~1Interval$Int" "$ref": "#/definitions/test_module~1Either$ByteArray_test_module~1Interval$Int"
} }
}, },
"compiledCode": "59013a010000323232323232323232323222324a26600e64a66600e66e1d200000113232533300e3010002149854cc02d241334c6973742f5475706c652f436f6e73747220636f6e7461696e73206d6f7265206974656d73207468616e2065787065637465640016300e0013006003153330073370e900100089919299980718080010a4c2a660169201334c6973742f5475706c652f436f6e73747220636f6e7461696e73206d6f7265206974656d73207468616e2065787065637465640016300e001300600315330094912b436f6e73747220696e64657820646964206e6f74206d6174636820616e7920747970652076617269616e740016300937540040046600200290001111199980319b8700100300c233330050053370000890011807000801001118031baa0015734ae6d5ce2ab9d5573caae7d5d0aba201", "compiledCode": "59020d01000032323232323232323232323222324a26601064a66601066e1d200000113232533300f3011002149854cc031241334c6973742f5475706c652f436f6e73747220636f6e7461696e73206d6f7265206974656d73207468616e2065787065637465640016375c601e002600c0062a66601066e1d200200113232533300f301100213300b32533300b3370e9000000899192999809180a0010a4c2a6601e9201334c6973742f5475706c652f436f6e73747220636f6e7461696e73206d6f7265206974656d73207468616e2065787065637465640016375a602400260120042a66601666e1d2002001153330103009002149854cc03524011d4578706563746564206e6f206669656c647320666f7220436f6e7374720016153300d4912b436f6e73747220696e64657820646964206e6f74206d6174636820616e7920747970652076617269616e740016300900149854cc031241334c6973742f5475706c652f436f6e73747220636f6e7461696e73206d6f7265206974656d73207468616e2065787065637465640016300f0013006003153300a4912b436f6e73747220696e64657820646964206e6f74206d6174636820616e7920747970652076617269616e740016300600200233001001480008888cccc01ccdc38008018069199980280299b8000448008c03c0040080088c01cdd5000918029baa0015734ae6d5ce2ab9d5573caae7d5d0aba201",
"hash": "d2615c021b2e14cd4ff854eb0a9ed88fd9f8a004105784d693f9aee0", "hash": "81069a852b9bbd130ba6b06973fc5f0b3213a50fbb84cbba54f06a3a",
"definitions": { "definitions": {
"ByteArray": { "ByteArray": {
"dataType": "bytes" "dataType": "bytes"
@ -772,8 +772,8 @@ mod test {
"$ref": "#/definitions/test_module~1Dict$test_module~1UUID_Int" "$ref": "#/definitions/test_module~1Dict$test_module~1UUID_Int"
} }
}, },
"compiledCode": "59011101000032323232323232323232323222324a26601064a66601066e1d200000113232533300f301100213300b3300600123232498c040008dd71807000a4c2a66018921334c6973742f5475706c652f436f6e73747220636f6e7461696e73206d6f7265206974656d73207468616e20657870656374656400163756601e00260186ea800c54cc0292412b436f6e73747220696e64657820646964206e6f74206d6174636820616e7920747970652076617269616e740016300a37540040046002002444a66601600429309980398009806001199801801980680100099800800a40004444666600a66e1c00400c02c8cccc014014cdc000224004601a002004004ae695cdab9c5573aaae7955cfaba15745", "compiledCode": "59011301000032323232323232323232323222324a26601064a66601066e1d200000113232533300f301100213300b3300600123232498dd698080011bae300e00149854cc031241334c6973742f5475706c652f436f6e73747220636f6e7461696e73206d6f7265206974656d73207468616e20657870656374656400163756601e00260186ea800c54cc0292412b436f6e73747220696e64657820646964206e6f74206d6174636820616e7920747970652076617269616e740016300a37540040046002002444a66601600429309980398009806001199801801980680100099800800a40004444666600a66e1c00400c02c8cccc014014cdc000224004601a002004004ae695cdab9c5573aaae7955cfaba15745",
"hash": "7fd359ec9930889984ffcaee7f7a044d872851560b051d05c5520486", "hash": "c45b98b234bf69a44f78196b4aeaac02010d1b9d345c977cfaf98cc7",
"definitions": { "definitions": {
"ByteArray": { "ByteArray": {
"dataType": "bytes" "dataType": "bytes"
@ -1033,8 +1033,8 @@ mod test {
"$ref": "#/definitions/test_module~1LinkedList$Int" "$ref": "#/definitions/test_module~1LinkedList$Int"
} }
}, },
"compiledCode": "5902840100003232323232323232323232323232323222232324a26601c64a66601c66e1d20000011323253330153017002133011300800149854cc0492401334c6973742f5475706c652f436f6e73747220636f6e7461696e73206d6f7265206974656d73207468616e20657870656374656400163015001300c0051533300e3370e9001000899191919299980b980c801099191980a9980700091980b1806800a4c931bac3017002375c602a0022a660289201334c6973742f5475706c652f436f6e73747220636f6e7461696e73206d6f7265206974656d73207468616e20657870656374656400163232337606032004603200260320026eb0c05c004c05c008dd6980a80098060028a9980824812b436f6e73747220696e64657820646964206e6f74206d6174636820616e7920747970652076617269616e740016300c0040043300d300400200230010012232533300a3370e90000008991919192999809980a80109980799803803800a4c2a66020921334c6973742f5475706c652f436f6e73747220636f6e7461696e73206d6f7265206974656d73207468616e206578706563746564001630130013013002301100130080021533300a3370e90010008a99980798040010a4c2a6601892011d4578706563746564206e6f206669656c647320666f7220436f6e7374720016153300c4912b436f6e73747220696e64657820646964206e6f74206d6174636820616e7920747970652076617269616e74001630080013001001222533300d00214984cc024c004c038008ccc00c00cc03c008004cc0040052000222233330073370e00200601a4666600a00a66e000112002300f0010020022300737540024600a6ea80055cd2b9b5738aae7555cf2ab9f5742ae881", "compiledCode": "59036d01000032323232323232323232323232323232323222232324a26602064a66602066e1d20000011323253330173019002133013300800149854cc0512401334c6973742f5475706c652f436f6e73747220636f6e7461696e73206d6f7265206974656d73207468616e20657870656374656400163017001300e005153330103370e9001000899191919299980c980d801099191980b9980700091980c1808800a4c931bac3019002375c602e0022a6602c9201334c6973742f5475706c652f436f6e73747220636f6e7461696e73206d6f7265206974656d73207468616e20657870656374656400163232337606036004603600260360026eb0c064004c064008dd6980b80098070028a9980924812b436f6e73747220696e64657820646964206e6f74206d6174636820616e7920747970652076617269616e740016300e0040043300f300800200230010012232533300c3370e9000000899191919299980a980b80109980899803803800a4c2a66024921334c6973742f5475706c652f436f6e73747220636f6e7461696e73206d6f7265206974656d73207468616e2065787065637465640016301500130150023370e900118081baa3013001300a0021533300c3370e90010008a99980898050010a4c2a6601c9211d4578706563746564206e6f206669656c647320666f7220436f6e7374720016153300e4912b436f6e73747220696e64657820646964206e6f74206d6174636820616e7920747970652076617269616e740016300a0013001001222533300f00214984cc02cc004c040008ccc00c00cc044008004c00400488c94ccc020cdc3a4000002264646464a666022602600426601a6600e00e002930a998072481334c6973742f5475706c652f436f6e73747220636f6e7461696e73206d6f7265206974656d73207468616e206578706563746564001630110013011002375a601e002600c0042a66601066e1d20020011533300d3006002149854cc02924011d4578706563746564206e6f206669656c647320666f7220436f6e7374720016153300a4912b436f6e73747220696e64657820646964206e6f74206d6174636820616e7920747970652076617269616e740016300600133001001480008888cccc01ccdc38008018069199980280299b8000448008c03c0040080088c01cdd5000918029baa0015734ae6d5ce2ab9d5573caae7d5d0aba21",
"hash": "aa6c9ffe85565798974269ea30a9b76744bb8608356c758d75486560", "hash": "c61be6b28e5405a4dec3c5392d40c18831c36ba1cef9e348ca9c2bfd",
"definitions": { "definitions": {
"Bool": { "Bool": {
"title": "Bool", "title": "Bool",

8
examples/acceptance_tests/072/plutus.json Normal file
View File

@ -0,0 +1,8 @@
{
"preamble": {
"title": "aiken-lang/acceptance_test_072",
"version": "0.0.0",
"plutusVersion": "v2"
},
"validators": []
}