update else printing for test directory, move config_compiler.ml into ../scripts

Author: bobzhang

jscomp/bin/Makefile

@@ -32,8 +32,8 @@ refmt.exe: refmt_main.mli refmt_main.ml
 reactjs_jsx_ppx.exe:reactjs_ppx.mli reactjs_ppx.ml
 	$(NATIVE) -I +compiler-libs ocamlcommon.cmxa $^ -o $@
 
-config_whole_compiler.ml:config_whole_compiler.mlp ../config_compiler.js
-	node ../config_compiler.js
+config_whole_compiler.ml:config_whole_compiler.mlp ../../scripts/config_compiler.js
+	node ../../scripts/config_compiler.js
 bsc.exe: config_whole_compiler.mli config_whole_compiler.ml  whole_compiler.mli whole_compiler.ml
 	$(NATIVE) $(OCAMLOPT_FLAGS) $^  -o $@
 

jscomp/test/a_list_test.js

@@ -75,8 +75,7 @@ var suites_001 = /* :: */[
                                     /* [] */0
                                   ]
                                 ];
-                        }
-                        else {
+                        } else {
                           return /* :: */[
                                   0,
                                   /* [] */0

jscomp/test/a_string_test.js

@@ -79,8 +79,7 @@ var suites_001 = /* :: */[
                             })(Ext_string.split_by(/* None */0, function (x) {
                                 if (x === /* " " */32) {
                                   return /* true */1;
-                                }
-                                else {
+                                } else {
                                   return +(x === /* "\t" */9);
                                 }
                               }, "h hgso hgso \t hi")),

jscomp/test/and_or_tailcall_test.js

@@ -8,13 +8,11 @@ function f(b, _, _n) {
     var n = _n;
     if (n > 100000) {
       return /* false */0;
-    }
-    else if (b) {
+    } else if (b) {
       _n = n + 1 | 0;
       continue ;
 
-    }
-    else {
+    } else {
       return /* false */0;
     }
   };
@@ -25,11 +23,9 @@ function or_f(b, _, _n) {
     var n = _n;
     if (n > 100000) {
       return /* false */0;
-    }
-    else if (b) {
+    } else if (b) {
       return /* true */1;
-    }
-    else {
+    } else {
       _n = n + 1 | 0;
       continue ;
 

jscomp/test/app_root_finder.js

@@ -11,13 +11,11 @@ function find_package_json(_dir) {
     var dir = _dir;
     if (Fs.existsSync(Path.join(dir, package_json))) {
       return dir;
-    }
-    else {
+    } else {
       var new_dir = Path.dirname(dir);
       if (new_dir === dir) {
         throw Caml_builtin_exceptions.not_found;
-      }
-      else {
+      } else {
         _dir = new_dir;
         continue ;
 

jscomp/test/arith_lexer.js

@@ -29,8 +29,7 @@ function __ocaml_lex_lexeme_rec(lexbuf, ___ocaml_lex_state) {
       ___ocaml_lex_state = __ocaml_lex_state$1;
       continue ;
 
-    }
-    else {
+    } else {
       switch (__ocaml_lex_state$1) {
         case 0 : 
             ___ocaml_lex_state = 0;

jscomp/test/array_test.js

@@ -14,13 +14,11 @@ function is_sorted(x) {
     var i = _i;
     if (i >= (len - 1 | 0)) {
       return /* true */1;
-    }
-    else if (Caml_obj.caml_lessthan(Caml_array.caml_array_get(x, i), Caml_array.caml_array_get(x, i + 1 | 0))) {
+    } else if (Caml_obj.caml_lessthan(Caml_array.caml_array_get(x, i), Caml_array.caml_array_get(x, i + 1 | 0))) {
       _i = i + 1 | 0;
       continue ;
 
-    }
-    else {
+    } else {
       return /* false */0;
     }
   };

jscomp/test/bal_set_mini.js

@@ -4,8 +4,7 @@
 function height(param) {
   if (param) {
     return param[3];
-  }
-  else {
+  } else {
     return 0;
   }
 }
@@ -31,38 +30,30 @@ function bal(l, v, r) {
       var ll = l[0];
       if (height(ll) >= height(lr)) {
         return create(ll, lv, create(lr, v, r));
-      }
-      else if (lr) {
+      } else if (lr) {
         return create(create(ll, lv, lr[0]), lr[1], create(lr[2], v, r));
-      }
-      else {
+      } else {
         return /* Empty */0;
       }
-    }
-    else {
+    } else {
       return /* Empty */0;
     }
-  }
-  else if (hr > (hl + 2 | 0)) {
+  } else if (hr > (hl + 2 | 0)) {
     if (r) {
       var rr = r[2];
       var rv = r[1];
       var rl = r[0];
       if (height(rr) >= height(rl)) {
         return create(create(l, v, rl), rv, rr);
-      }
-      else if (rl) {
+      } else if (rl) {
         return create(create(l, v, rl[0]), rl[1], create(rl[2], rv, rr));
-      }
-      else {
+      } else {
         return /* Empty */0;
       }
-    }
-    else {
+    } else {
       return /* Empty */0;
     }
-  }
-  else {
+  } else {
     return /* Node */[
             l,
             v,
@@ -75,11 +66,9 @@ function bal(l, v, r) {
 function compare_int(x, y) {
   if (x > y) {
     return 1;
-  }
-  else if (x === y) {
+  } else if (x === y) {
     return 0;
-  }
-  else {
+  } else {
     return -1;
   }
 }
@@ -93,16 +82,13 @@ function add(x, t) {
     if (c) {
       if (c < 0) {
         return bal(add(x, l), v, r);
-      }
-      else {
+      } else {
         return bal(l, v, add(x, r));
       }
-    }
-    else {
+    } else {
       return t;
     }
-  }
-  else {
+  } else {
     return /* Node */[
             /* Empty */0,
             x,
@@ -123,12 +109,10 @@ function min_elt(_def, _param) {
         _def = param[1];
         continue ;
 
-      }
-      else {
+      } else {
         return param[1];
       }
-    }
-    else {
+    } else {
       return def;
     }
   };
@@ -137,8 +121,7 @@ function min_elt(_def, _param) {
 function remove_min_elt(l, v, r) {
   if (l) {
     return bal(remove_min_elt(l[0], l[1], l[2]), v, r);
-  }
-  else {
+  } else {
     return r;
   }
 }
@@ -148,12 +131,10 @@ function internal_merge(l, r) {
     if (r) {
       var rv = r[1];
       return bal(l, min_elt(rv, r), remove_min_elt(r[0], rv, r[2]));
-    }
-    else {
+    } else {
       return l;
     }
-  }
-  else {
+  } else {
     return r;
   }
 }
@@ -167,16 +148,13 @@ function remove(x, tree) {
     if (c) {
       if (c < 0) {
         return bal(remove(x, l), v, r);
-      }
-      else {
+      } else {
         return bal(l, v, remove(x, r));
       }
-    }
-    else {
+    } else {
       return internal_merge(l, r);
     }
-  }
-  else {
+  } else {
     return /* Empty */0;
   }
 }
@@ -190,12 +168,10 @@ function mem(x, _param) {
         _param = c < 0 ? param[0] : param[2];
         continue ;
 
-      }
-      else {
+      } else {
         return /* true */1;
       }
-    }
-    else {
+    } else {
       return /* false */0;
     }
   };

jscomp/test/bb.js

@@ -6,12 +6,10 @@ function f(x) {
   if (x !== 98) {
     if (x >= 99) {
       return "c";
-    }
-    else {
+    } else {
       return "a";
     }
-  }
-  else {
+  } else {
     return "b";
   }
 }
@@ -61,12 +59,10 @@ function test(x) {
   if (match !== 98) {
     if (match >= 99) {
       return "c";
-    }
-    else {
+    } else {
       return "a";
     }
-  }
-  else {
+  } else {
     return "b";
   }
 }