clean up

Author: bobzhang

jscomp/core/lam_dispatch_primitive.ml

@@ -85,8 +85,6 @@ let translate loc (prim_name : string)
       -> Js_long.bits_of_float args     
     | "caml_int64_float_of_bits"
       -> Js_long.float_of_bits args 
-    | "caml_int64_bswap"
-      -> Js_long.swap args    
     | "caml_int64_min"       
       ->  Js_long.min args 
     | "caml_int64_max" 
@@ -318,27 +316,13 @@ let translate loc (prim_name : string)
             call Js_runtime_modules.caml_primitive
         | _ -> assert false 
       end
-    | "caml_string_get"    
-      -> 
-      E.runtime_call Js_runtime_modules.string "get" args
     | "caml_fill_bytes"
     | "bytes_to_string"
     | "bytes_of_string"
     | "caml_blit_string" 
     | "caml_blit_bytes"
       -> 
       call Js_runtime_modules.bytes
-    | "caml_backtrace_status"
-    | "caml_get_exception_backtrace"
-    | "caml_get_exception_raw_backtrace"
-    | "caml_record_backtrace"
-    | "caml_convert_raw_backtrace" 
-    | "caml_get_current_callstack"
-      -> E.unit
-    (* unit -> unit 
-       _ -> unit  
-       major_slice : int -> int 
-    *)
     (** Note we captured [exception/extension] creation in the early pass, this primitive is 
         like normal one to set the identifier *)
     | "caml_exn_slot_id"
@@ -358,11 +342,9 @@ let translate loc (prim_name : string)
     (*                      ] *)
     | "caml_sys_time"
     | "caml_sys_getenv"
-    | "caml_sys_system_command" 
     | "caml_sys_getcwd" (* check browser or nodejs *)
     | "caml_sys_is_directory"
     | "caml_sys_exit"
-      (* | "caml_sys_file_exists" *)
       -> 
       call Js_runtime_modules.sys
     | "caml_lex_engine"

jscomp/main/builtin_cmi_datasets.ml

@@ -78,7 +78,6 @@ external readAs : spawnResult ->
 *)
 
 
-let caml_sys_system_command _cmd = 127
 
 let caml_sys_getcwd : unit -> string = [%raw{|function(param){
     if (typeof process === "undefined" || process.cwd === undefined){

jscomp/main/builtin_cmj_datasets.ml

@@ -30,7 +30,6 @@ val caml_sys_time : unit -> float
 
 val os_type : unit -> string 
 
-val caml_sys_system_command : string -> int
 
 val caml_sys_getcwd : unit -> string 
 

jscomp/runtime/caml_sys.ml

@@ -23,7 +23,7 @@ type backend_type =
   | Native
   | Bytecode
   | Other of string
-(* System interface *)
+  (* System interface *)
 
 (* external get_config: unit -> string * int * bool = "caml_sys_get_config" *)
 external get_argv: unit -> string * string array = "caml_sys_get_argv"
@@ -37,26 +37,20 @@ external cygwin : unit -> bool = "%ostype_cygwin"
 external get_backend_type : unit -> backend_type = "%backend_type"
 
 let (executable_name, argv) = get_argv()
-#if BS 
+
 external get_os_type : unit -> string = "#os_type"
 let os_type = get_os_type ()
-#else
-let (os_type, _, _) = get_config()
-#end
 let backend_type = get_backend_type ()
 let big_endian = big_endian ()
 let word_size = word_size ()
 let int_size = int_size ()
 let unix = unix ()
 let win32 = win32 ()
 let cygwin = cygwin ()
-#if BS 
+
 let max_array_length = 2147483647 (* 2^ 31 - 1 *)
 let max_string_length = 2147483647
-#else
-let max_array_length = max_wosize ()
-let max_string_length = word_size / 8 * max_array_length - 1
-#end
+
 external runtime_variant : unit -> string = "caml_runtime_variant"
 external runtime_parameters : unit -> string = "caml_runtime_parameters"
 
@@ -66,20 +60,14 @@ external remove: string -> unit = "caml_sys_remove"
 external rename : string -> string -> unit = "caml_sys_rename"
 external getenv: string -> string = "caml_sys_getenv"
 
-#if BS 
+
 external getEnv : 'a -> string -> string option = "" [@@bs.get_index] 
 let getenv_opt s =
-    match [%external process ] with 
-    | None -> None
-    | Some x -> getEnv x##env s
-#else
-let getenv_opt s =
-  (* TODO: expose a non-raising primitive directly. *)
-  try Some (getenv s)
-  with Not_found -> None
-#end
+  match [%external process ] with 
+  | None -> None
+  | Some x -> getEnv x#env s
 
-external command: string -> int = "caml_sys_system_command"
+let command: string -> int = fun _ -> 127
 external time: unit -> (float [@unboxed]) =
   "caml_sys_time" "caml_sys_time_unboxed" [@@noalloc]
 external chdir: string -> unit = "caml_sys_chdir"
@@ -94,7 +82,7 @@ type signal_behavior =
   | Signal_handle of (int -> unit)
 
 let signal : int -> signal_behavior -> signal_behavior
-                = fun _ _ -> Signal_default
+  = fun _ _ -> Signal_default
 
 let set_signal sig_num sig_beh = ignore(signal sig_num sig_beh)
 
@@ -135,15 +123,9 @@ let catch_break on =
   else
     set_signal sigint Signal_default
 
-#if BS
+
 let enable_runtime_warnings : bool -> unit = fun _ -> () 
 let runtime_warnings_enabled : unit -> bool = fun _ -> false
-#else
-external enable_runtime_warnings: bool -> unit =
-  "caml_ml_enable_runtime_warnings"
-external runtime_warnings_enabled: unit -> bool =
-  "caml_ml_runtime_warnings_enabled"
-#end
 (* The version string is found in file ../VERSION *)
 
 let ocaml_version = "4.06.2+BS"

jscomp/runtime/caml_sys.mli

@@ -62,7 +62,7 @@ val getenv_opt: string -> string option
     @since 4.05
 *)
 
-external command : string -> int = "caml_sys_system_command"
+val command : string -> int
 (** Execute the given shell command and return its exit code. *)
 
 external time : unit -> (float [@unboxed]) =

jscomp/stdlib-406/sys.ml

@@ -35,10 +35,6 @@ function caml_sys_time(param) {
   }
 }
 
-function caml_sys_system_command(_cmd) {
-  return 127;
-}
-
 var caml_sys_getcwd = (function(param){
     if (typeof process === "undefined" || process.cwd === undefined){
       return "/"  
@@ -94,7 +90,6 @@ export {
   caml_sys_getenv ,
   caml_sys_time ,
   os_type ,
-  caml_sys_system_command ,
   caml_sys_getcwd ,
   caml_sys_get_argv ,
   caml_sys_exit ,

jscomp/stdlib-406/sys.mli

@@ -25,6 +25,10 @@ function getenv_opt(s) {
 
 }
 
+function command(param) {
+  return 127;
+}
+
 var interactive = {
   contents: false
 };
@@ -127,6 +131,7 @@ export {
   argv ,
   executable_name ,
   getenv_opt ,
+  command ,
   interactive ,
   os_type ,
   backend_type ,

lib/4.06.1/unstable/js_compiler.ml

@@ -35,10 +35,6 @@ function caml_sys_time(param) {
   }
 }
 
-function caml_sys_system_command(_cmd) {
-  return 127;
-}
-
 var caml_sys_getcwd = (function(param){
     if (typeof process === "undefined" || process.cwd === undefined){
       return "/"  
@@ -93,7 +89,6 @@ function caml_sys_file_exists(_s) {
 exports.caml_sys_getenv = caml_sys_getenv;
 exports.caml_sys_time = caml_sys_time;
 exports.os_type = os_type;
-exports.caml_sys_system_command = caml_sys_system_command;
 exports.caml_sys_getcwd = caml_sys_getcwd;
 exports.caml_sys_get_argv = caml_sys_get_argv;
 exports.caml_sys_exit = caml_sys_exit;

lib/4.06.1/whole_compiler.ml

@@ -25,6 +25,10 @@ function getenv_opt(s) {
 
 }
 
+function command(param) {
+  return 127;
+}
+
 var interactive = {
   contents: false
 };
@@ -126,6 +130,7 @@ var ocaml_version = "4.06.2+BS";
 exports.argv = argv;
 exports.executable_name = executable_name;
 exports.getenv_opt = getenv_opt;
+exports.command = command;
 exports.interactive = interactive;
 exports.os_type = os_type;
 exports.backend_type = backend_type;