stdlib: Use new destructuring assignment syntax

Author: shesek

src/stdlib/btc.minsc

@@ -63,8 +63,8 @@ fn tx::sighash::tr_leaf($tx, $vin, $script_leaf, $utxos, $sighash_ty) = psbt::si
 // TOOD tx::sighash::sw0() with just the signed utxo & tx::sighash::presw() with just the utxo's script
 
 fn psbt::finalize_witness($psbt, $input_witnesses) = psbt::update($psbt, [
-  "inputs": map($input_witnesses, |$in_wit|
-    $in_wit.0: [ "final_script_witness": $in_wit.1 ]
+  "inputs": map($input_witnesses, |[ $input_index, $witness ]|
+    $input_index: [ "final_script_witness": $witness ]
   )
 ]);
 
@@ -197,7 +197,7 @@ fn nFromAlt($max_n) = `
 // ]
 fn ifelseif($clauses) = if isEmpty($clauses) then `` else `
   // Check all clauses but the last, running the first one that matches
-  map(initial($clauses), |$clause| `$clause.0 OP_IF $clause.1 OP_ELSE`)
+  map(initial($clauses), |[ $condition, $body ]| `$condition OP_IF $body OP_ELSE`)
 
   // The last clause is checked using OP_VERIFY instead of another IF..ELSE to save some bytes.
   { if last($clauses).0 != default then `last($clauses).0 OP_VERIFY` else ``}
@@ -216,7 +216,7 @@ fn match($clauses) = if isEmpty($clauses) then `` else
   ifelseif(
     // DUP the value being matched to keep it available for the next clause, while allowing condition
     // scripts to consume it (with e.g. OP_EQUAL). It will be removed before the matching script is run.
-    map(initial($clauses), |$clause| `OP_DUP $clause.0`: `OP_DROP $clause.1`)
+    map(initial($clauses), |[ $condition, $body ]| `OP_DUP $condition`: `OP_DROP $body`)
 
     // The last clause doesn't need to DUP/DROP as there are no more conditions that need the value.
     // In the case of a `default` branch, the value will remain available on stack.
@@ -225,9 +225,9 @@ fn match($clauses) = if isEmpty($clauses) then `` else
 
 // Match the item at the top of the stack for equality.
 // For example: switch[ 0: `$alice_pk OP_CHECKSIG`, 1: `<6 months> OP_CSV OP_DROP` ]
-fn switch($clauses) = match(map($clauses, |$clause| {
-  $condition = if $clause.0 != default then `$clause.0 OP_EQUAL` else default;
-  $condition: $clause.1
+fn switch($clauses) = match(map($clauses, |[ $condition, $body ]| {
+  $condition = if $condition != default then `$condition OP_EQUAL` else default;
+  $condition: $body
 }));
 
 // Pop an index number off the stack and execute the `$scripts` branch with that index.

src/stdlib/elements.minsc

@@ -52,11 +52,10 @@ fn checkOutput($vout, $asset_id, $amount, $spk_tup) = `
   checkOutputSpk($vout, $spk_tup)
 `;
 
-fn checkOutputSpk($vout, $spk_tup) = `
-  // $spk_tup is a tuple of the witness version and program
+fn checkOutputSpk($vout, [ $witness_version, $witness_prog ]) = `
   $vout OP_INSPECTOUTPUTSCRIPTPUBKEY
-  $spk_tup.0 OP_EQUALVERIFY
-  $spk_tup.1 OP_EQUALVERIFY
+  $witness_version OP_EQUALVERIFY
+  $witness_prog OP_EQUALVERIFY
 `;
 
 fn checkSameAsset($vin, $vout) = `

src/stdlib/stdlib.minsc

@@ -30,8 +30,8 @@ fn reduce($arr, $fn) = if !isEmpty($arr) then fold(tail($arr), $arr.0, $fn) else
 fn filterMap($arr, $fn) = flatMap($arr, |$el| { $r = $fn($el); if $r != filterMap::skip then [$r] else [] });
 filterMap::skip = symbol("filterMap::skip");
 
-fn find($arr, $fn)  = foldUntil($arr, null,  |$acc, $el| if $fn($el)  then true:$el  else false:null);
-fn some($arr, $fn)  = foldUntil($arr, false, |$acc, $el| if $fn($el)  then true:true else false:false);
+fn find($arr, $fn) = foldUntil($arr, null,  |$acc, $el| if $fn($el) then true:$el  else false:null);
+fn some($arr, $fn) = foldUntil($arr, false, |$acc, $el| if $fn($el) then true:true else false:false);
 fn every($arr, $fn) = !some($arr, |$el| !$fn($el));
 
 fn contains($arr, $needle) = some($arr, |$el| $el == $needle);
@@ -59,9 +59,8 @@ fn join($strs, $sep) =
   else if len($strs) == 1 then $strs.0
   else concat([ $strs.0 ] + map(tail($strs), |$str| $sep + $str));
 
-// Array tag extraction with multiple values (`$tagged->$tag` can be used for a single value)
-fn t::multi($tagged, $tag) = $tagged | filter(|$kv| $kv.0 == $tag) | map(|$kv| $kv.1);
-
+// Array tag extraction with multiple values (`$tagged->tag` can be used for a single value)
+fn t::multi($tagged, $tag) = $tagged | filter(|[$k, _]| $k == $tag) | map(|[_, $v]| $v);
 
 //
 // Dev utilities
@@ -73,12 +72,11 @@ fn assert::eq($a, $b) = ($a == $b) || throw("Not equal: "+$a+" != "+$b+"");
 fn assert::msg($bool, $msg) = $bool || throw($msg);
 
 // Scope inspection
-dyn fn env::pretty() = env() | map(|$kv| $kv.0+" = "+pretty($kv.1)+" // "+typeof($kv.1)) | join("\n\n")| symbol();
-dyn fn env::repr() = env() | filter(|$kv| !isFunction($kv.1)) | map(|$kv| $kv.0+" = "+repr($kv.1)+"; // "+typeof($kv.1)) | join("\n\n") | symbol();
-dyn fn env::debug() = env() | map(|$kv| $kv.0+" = "+_debug_nonfn($kv.1)) | join("\n\n") | symbol();
+dyn fn env::pretty() = env() | map(|[$k:$v]| $k+" = "+pretty($v)+" // "+typeof($v)) | join("\n\n") | symbol();
+dyn fn env::repr() = env() | filter(|[$k:$v]| !isFunction($v)) | map(|[$k:$v]| $k+" = "+repr($v)+"; // "+typeof($v)) | join("\n\n") | symbol();
+dyn fn env::debug() = env() | map(|[$k:$v]| $k+" = "+_debug_nonfn($v)) | join("\n\n") | symbol();
 fn _debug_nonfn($v) = if !isFunction($v) then debug($v) else $v;
 
-
 dyn fn log::env($label) = log("variables:\n----\n" + env::pretty() + "\n----");
 dyn fn log::debug_env($label) = log("variables:\n----\n" + env::debug() + "\n----");