src/test/contracts/expected/key_hash.religo.expected

 let check_hash_key = (kh1_k2: (key_hash, key))
 : (bool, key_hash) => {
-  let (kh1, k2) = kh1_k2;
+  let kh1, k2 = kh1_k2;
   let kh2: key_hash = Crypto.hash_key(k2);
   ((kh1 == kh2), kh2)
 };

src/test/contracts/expected/let_multiple.religo.expected

-let ((x: int), (y: int)) = (1, 2);
+let (x: int), (y: int) = (1, 2);
 
 let main = (p: unit): int => x + y;
 
-let ((x: int), (y: int)) = (3, 3);
+let (x: int), (y: int) = (3, 3);
 
 let main_paren = (p: unit): int => x + y;
 
 let foobar: (int, int) = (23, 42);
 
-let ((foo: int), (bar: int)) = foobar;
+let (foo: int), (bar: int) = foobar;
 
 let non_tuple_rhs = (p: unit): int => foo + bar;

src/test/contracts/expected/letin.religo.expected

@@ -30,3 +30,8 @@ let letin_nesting2 = (x: int) => {
   let z = 3;
   x + y + z
 };
+
+let x = {
+  let _, (x, _) = (1n, (2n, 3n));
+  x
+};

src/test/contracts/expected/multisig.religo.expected

@@ -43,7 +43,7 @@ let check_message = ((param, s): (check_message_pt, storage))
       let keys: authorized_keys = s.auth;
       let aux = ((vk, pkh_sig): ((nat, authorized_keys),
          (key_hash, signature))): (nat, authorized_keys) => {
-        let (valid, keys) = vk;
+        let valid, keys = vk;
         switch(keys) {
         | [] => vk
         | [key, ...keys] =>
@@ -62,7 +62,7 @@ let check_message = ((param, s): (check_message_pt, storage))
             }
         }
       };
-      let (valid, keys) = 
+      let valid, keys = 
         List.fold(aux, param.signatures, (valid, keys));
       if (valid < s.threshold) {
       

src/test/contracts/letin.mligo

@@ -26,4 +26,8 @@ let letin_nesting (_: unit) =
 let letin_nesting2 (x: int) = 
   let y = 2 in 
   let z = 3 in
-  x + y + z
\ No newline at end of file
+  x + y + z
+
+let x =
+  let (_, (x, _)) = (1n, (2n, 3n)) in 
+  x

src/test/contracts/letin.religo

@@ -27,4 +27,9 @@ let letin_nesting2 = (x: int) => {
   let y = 2;
   let z = 3;
   x + y + z
-}
\ No newline at end of file
+}
+
+let x = {
+  let (_, (x, _)) = (1n, (2n, 3n));
+  x
+}

tools/webide/packages/server/src/ligo-compiler.ts

@@ -7,7 +7,7 @@ import { logger } from './logger';
 const { spawn } = require('child_process');
 const dataDir = process.env['DATA_DIR'] || path.join(__dirname, 'tmp');
 
-const JOB_TIMEOUT = 10000;
+const JOB_TIMEOUT = 50000;
 
 export class CompilerError extends Error {
   constructor(message: string) {

vendors/Red-Black_Trees/PolyMap.ml

@@ -31,6 +31,10 @@ let find key map =
 let find_opt key map =
   try Some (find key map) with Not_found -> None
 
+let find_default key make_default_v map =
+  try find key map, map with
+    Not_found -> let v = make_default_v () in v, add key v map
+
 let has_key key map =
   match find_opt key map with
     Some _ -> true

vendors/Red-Black_Trees/PolyMap.mli

@@ -57,6 +57,13 @@ val find : 'key -> ('key, 'value) t -> 'value
 
 val find_opt : 'key -> ('key, 'value) t -> 'value option
 
+(* The value of the call [find_default key make_default_v map] is
+   [value] if the key [key] is bound to [value] in the map [map], and
+   [make_default_v ()] otherwise. In the first case, the
+   [make_default_v] function is not executed *)
+
+val find_default : 'key -> (unit -> 'value) -> ('key, 'value) map -> 'value * ('key, 'value) map
+
 (* The value of the call [find_opt key map] is [true] if the key
    [key] is bound to some value in the map [map], and [None]
    otherwise. *)