Remake the world again

joshaber · joshaber · commit 17afcfacce11 · 2017-03-23T17:13:46.000-04:00
Signed-Off-By: Josh Abernathy &lt;joshaber@gmail.com&gt;
diff --git a/lib/js/array.js b/lib/js/array.js
@@ -218,8 +218,7 @@ function sort(cmp, a) {
         x = i31 + 2 | 0;
       }
       return x;
-    }
-    else if ((i31 + 1 | 0) < l && Curry._2(cmp, Caml_array.caml_array_get(a, i31), Caml_array.caml_array_get(a, i31 + 1 | 0)) < 0) {
+    } else if ((i31 + 1 | 0) < l && Curry._2(cmp, Caml_array.caml_array_get(a, i31), Caml_array.caml_array_get(a, i31 + 1 | 0)) < 0) {
       return i31 + 1 | 0;
     } else if (i31 < l) {
       return i31;
@@ -243,17 +242,15 @@ function sort(cmp, a) {
           _i = j;
           continue ;
           
-        }
-        else {
+        } else {
           return Caml_array.caml_array_set(a, i$1, e$1);
         }
       };
     }
     catch (exn){
       if (exn[0] === Bottom) {
         return Caml_array.caml_array_set(a, exn[1], e);
-      }
-      else {
+      } else {
         throw exn;
       }
     }
@@ -299,12 +296,10 @@ function sort(cmp, a) {
           _i = father;
           continue ;
           
-        }
-        else {
+        } else {
           return Caml_array.caml_array_set(a, 0, e);
         }
-      }
-      else {
+      } else {
         return Caml_array.caml_array_set(a, i, e);
       }
     };
@@ -322,8 +317,7 @@ function sort(cmp, a) {
     var e$1 = Caml_array.caml_array_get(a, 1);
     Caml_array.caml_array_set(a, 1, Caml_array.caml_array_get(a, 0));
     return Caml_array.caml_array_set(a, 0, e$1);
-  }
-  else {
+  } else {
     return 0;
   }
 }
@@ -355,8 +349,7 @@ function stable_sort(cmp, a) {
         } else {
           return blit(src2, i2, dst, d + 1 | 0, src2r - i2 | 0);
         }
-      }
-      else {
+      } else {
         Caml_array.caml_array_set(dst, d, s2);
         var i2$1 = i2 + 1 | 0;
         if (i2$1 < src2r) {
diff --git a/lib/js/caml_array.js b/lib/js/caml_array.js
@@ -66,8 +66,7 @@ function caml_array_set(xs, index, newval) {
           Caml_builtin_exceptions.invalid_argument,
           "index out of bounds"
         ];
-  }
-  else {
+  } else {
     xs[index] = newval;
     return /* () */0;
   }
@@ -79,8 +78,7 @@ function caml_array_get(xs, index) {
           Caml_builtin_exceptions.invalid_argument,
           "index out of bounds"
         ];
-  }
-  else {
+  } else {
     return xs[index];
   }
 }
diff --git a/lib/js/camlinternalMod.js b/lib/js/camlinternalMod.js
@@ -22,11 +22,9 @@ function init_mod(loc, shape) {
             return Caml_array.caml_array_set(struct_, idx, CamlinternalOO.dummy_class(loc));
         
       }
-    }
-    else if (shape.tag) {
+    } else if (shape.tag) {
       return Caml_array.caml_array_set(struct_, idx, shape[0]);
-    }
-    else {
+    } else {
       var comps = shape[0];
       var v = /* array */[];
       Caml_array.caml_array_set(struct_, idx, v);
diff --git a/lib/js/camlinternalOO.js b/lib/js/camlinternalOO.js
@@ -534,8 +534,7 @@ function set_method(table, label, element) {
     var element$1 = element;
     resize(array, label$1 + 1 | 0);
     return Caml_array.caml_array_set(array[/* methods */1], label$1, element$1);
-  }
-  else {
+  } else {
     table[/* hidden_meths */5] = /* :: */[
       /* tuple */[
         label,
@@ -554,8 +553,7 @@ function get_method(table, label) {
   catch (exn){
     if (exn === Caml_builtin_exceptions.not_found) {
       return Caml_array.caml_array_get(table[/* methods */1], label);
-    }
-    else {
+    } else {
       throw exn;
     }
   }
@@ -903,8 +901,7 @@ function build_path(n, keys, tables) {
 function lookup_keys(i, keys, tables) {
   if (i < 0) {
     return tables;
-  }
-  else {
+  } else {
     var key = Caml_array.caml_array_get(keys, i);
     var _tables = tables;
     while(true) {
diff --git a/lib/js/hashtbl.js b/lib/js/hashtbl.js
@@ -139,8 +139,7 @@ function resize(indexfun, h) {
                     param[1],
                     Caml_array.caml_array_get(ndata, nidx)
                   ]);
-      }
-      else {
+      } else {
         return /* () */0;
       }
     };
diff --git a/lib/js/js_json.js b/lib/js/js_json.js
@@ -41,53 +41,47 @@ function test(x, v) {
 function decodeString(json) {
   if (typeof json === "string") {
     return /* Some */[json];
-  }
-  else {
+  } else {
     return /* None */0;
   }
 }
 
 function decodeNumber(json) {
   if (typeof json === "number") {
     return /* Some */[json];
-  }
-  else {
+  } else {
     return /* None */0;
   }
 }
 
 function decodeObject(json) {
   if (typeof json === "object" && !Array.isArray(json) && json !== null) {
     return /* Some */[json];
-  }
-  else {
+  } else {
     return /* None */0;
   }
 }
 
 function decodeArray(json) {
   if (Array.isArray(json)) {
     return /* Some */[json];
-  }
-  else {
+  } else {
     return /* None */0;
   }
 }
 
 function decodeBoolean(json) {
   if (typeof json === "boolean") {
     return /* Some */[json];
-  }
-  else {
+  } else {
     return /* None */0;
   }
 }
 
 function decodeNull(json) {
   if (json === null) {
     return /* Some */[null];
-  }
-  else {
+  } else {
     return /* None */0;
   }
 }
diff --git a/lib/js/parsing.js b/lib/js/parsing.js
@@ -143,8 +143,7 @@ function yyparse(tables, start, lexer, lexbuf) {
       current_lookahead_fun[0] = function (tok) {
         if (tok.length !== undefined) {
           return +(Caml_array.caml_array_get(tables[/* transl_block */2], tok.tag | 0) === curr_char);
-        }
-        else {
+        } else {
           return +(Caml_array.caml_array_get(tables[/* transl_const */1], tok) === curr_char);
         }
       };
@@ -163,8 +162,7 @@ function symbol_start_pos() {
     var i = _i;
     if (i <= 0) {
       return Caml_array.caml_array_get(env[/* symb_end_stack */3], env[/* asp */10]);
-    }
-    else {
+    } else {
       var st = Caml_array.caml_array_get(env[/* symb_start_stack */2], (env[/* asp */10] - i | 0) + 1 | 0);
       var en = Caml_array.caml_array_get(env[/* symb_end_stack */3], (env[/* asp */10] - i | 0) + 1 | 0);
       if (Caml_obj.caml_notequal(st, en)) {
diff --git a/lib/js/weak.js b/lib/js/weak.js
@@ -192,8 +192,7 @@ function Make(H) {
       if (prev_len) {
         Caml_obj.caml_obj_truncate(bucket, prev_len + 1 | 0);
         Caml_obj.caml_obj_truncate(hbucket, prev_len);
-      }
-      else {
+      } else {
         Caml_array.caml_array_set(t[/* table */0], t[/* rover */4], emptybucket);
         Caml_array.caml_array_set(t[/* hashes */1], t[/* rover */4], /* int array */[]);
       }
@@ -289,8 +288,7 @@ function Make(H) {
       var i = _i;
       if (i >= sz) {
         return Curry._2(ifnotfound, h, index);
-      }
-      else if (h === Caml_array.caml_array_get(hashes, i)) {
+      } else if (h === Caml_array.caml_array_get(hashes, i)) {
         var match = Caml_weak.caml_weak_get_copy(bucket, i);
         if (match) {
           if (Curry._2(H[/* equal */0], match[0], d)) {
@@ -341,8 +339,7 @@ function Make(H) {
       var i = _i;
       if (i >= sz) {
         return ifnotfound;
-      }
-      else if (h === Caml_array.caml_array_get(hashes, i)) {
+      } else if (h === Caml_array.caml_array_get(hashes, i)) {
         var match = Caml_weak.caml_weak_get_copy(bucket, i);
         if (match) {
           if (Curry._2(H[/* equal */0], match[0], d)) {
@@ -387,8 +384,7 @@ function Make(H) {
       var i = _i;
       if (i >= sz) {
         return accu;
-      }
-      else if (h === Caml_array.caml_array_get(hashes, i)) {
+      } else if (h === Caml_array.caml_array_get(hashes, i)) {
         var match = Caml_weak.caml_weak_get_copy(bucket, i);
         if (match) {
           if (Curry._2(H[/* equal */0], match[0], d)) {

Original file line number	Diff line number	Diff line change
`@@ -66,8 +66,7 @@ function caml_array_set(xs, index, newval) {`
`66`	`66`	`Caml_builtin_exceptions.invalid_argument,`
`67`	`67`	`"index out of bounds"`
`68`	`68`	`];`
`69`		`- }`
`70`		`- else {`
	`69`	`+ } else {`
`71`	`70`	`xs[index] = newval;`
`72`	`71`	`return /* () */0;`
`73`	`72`	`}`
`@@ -79,8 +78,7 @@ function caml_array_get(xs, index) {`
`79`	`78`	`Caml_builtin_exceptions.invalid_argument,`
`80`	`79`	`"index out of bounds"`
`81`	`80`	`];`
`82`		`- }`
`83`		`- else {`
	`81`	`+ } else {`
`84`	`82`	`return xs[index];`
`85`	`83`	`}`
`86`	`84`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,53 +41,47 @@ function test(x, v) {`
`41`	`41`	`function decodeString(json) {`
`42`	`42`	`if (typeof json === "string") {`
`43`	`43`	`return /* Some */[json];`
`44`		`- }`
`45`		`- else {`
	`44`	`+ } else {`
`46`	`45`	`return /* None */0;`
`47`	`46`	`}`
`48`	`47`	`}`
`49`	`48`
`50`	`49`	`function decodeNumber(json) {`
`51`	`50`	`if (typeof json === "number") {`
`52`	`51`	`return /* Some */[json];`
`53`		`- }`
`54`		`- else {`
	`52`	`+ } else {`
`55`	`53`	`return /* None */0;`
`56`	`54`	`}`
`57`	`55`	`}`
`58`	`56`
`59`	`57`	`function decodeObject(json) {`
`60`	`58`	`if (typeof json === "object" && !Array.isArray(json) && json !== null) {`
`61`	`59`	`return /* Some */[json];`
`62`		`- }`
`63`		`- else {`
	`60`	`+ } else {`
`64`	`61`	`return /* None */0;`
`65`	`62`	`}`
`66`	`63`	`}`
`67`	`64`
`68`	`65`	`function decodeArray(json) {`
`69`	`66`	`if (Array.isArray(json)) {`
`70`	`67`	`return /* Some */[json];`
`71`		`- }`
`72`		`- else {`
	`68`	`+ } else {`
`73`	`69`	`return /* None */0;`
`74`	`70`	`}`
`75`	`71`	`}`
`76`	`72`
`77`	`73`	`function decodeBoolean(json) {`
`78`	`74`	`if (typeof json === "boolean") {`
`79`	`75`	`return /* Some */[json];`
`80`		`- }`
`81`		`- else {`
	`76`	`+ } else {`
`82`	`77`	`return /* None */0;`
`83`	`78`	`}`
`84`	`79`	`}`
`85`	`80`
`86`	`81`	`function decodeNull(json) {`
`87`	`82`	`if (json === null) {`
`88`	`83`	`return /* Some */[null];`
`89`		`- }`
`90`		`- else {`
	`84`	`+ } else {`
`91`	`85`	`return /* None */0;`
`92`	`86`	`}`
`93`	`87`	`}`