diff options
Diffstat (limited to 'stdlib')
| -rw-r--r-- | stdlib/.depend | 3 | ||||
| -rw-r--r-- | stdlib/Makefile | 3 | ||||
| -rw-r--r-- | stdlib/pervasives.ml | 7 | ||||
| -rw-r--r-- | stdlib/pervasives.mli | 10 | ||||
| -rw-r--r-- | stdlib/sys.ml | 8 | ||||
| -rw-r--r-- | stdlib/sys.mli | 8 |
6 files changed, 17 insertions, 22 deletions
diff --git a/stdlib/.depend b/stdlib/.depend index f988c3da9..4bab0d09a 100644 --- a/stdlib/.depend +++ b/stdlib/.depend @@ -3,7 +3,6 @@ format.cmi: list.cmi gc.cmi: lexing.cmi: obj.cmi parsing.cmi: lexing.cmi obj.cmi -pervasives.cmi: sys.cmi printexc.cmi: arg.cmo: arg.cmi sys.cmi string.cmi list.cmi array.cmi printf.cmi array.cmo: array.cmi list.cmi array.cmi @@ -17,7 +16,7 @@ lexing.cmo: lexing.cmi string.cmi obj.cmi list.cmo: list.cmi list.cmi obj.cmo: obj.cmi parsing.cmo: parsing.cmi array.cmi lexing.cmi obj.cmi -pervasives.cmo: pervasives.cmi sys.cmi +pervasives.cmo: pervasives.cmi printexc.cmo: printexc.cmi obj.cmi printf.cmo: printf.cmi string.cmi obj.cmi queue.cmo: queue.cmi diff --git a/stdlib/Makefile b/stdlib/Makefile index fe2f3687c..e450ab52e 100644 --- a/stdlib/Makefile +++ b/stdlib/Makefile @@ -29,9 +29,6 @@ pervasives.cmi: pervasives.mli pervasives.cmo: pervasives.ml $(CAMLC) -nopervasives -c pervasives.ml -sys.cmi: sys.mli - $(CAMLC) -nopervasives -c sys.mli - .SUFFIXES: .mli .ml .cmi .cmo .mli.cmi: diff --git a/stdlib/pervasives.ml b/stdlib/pervasives.ml index bc1014158..e406db952 100644 --- a/stdlib/pervasives.ml +++ b/stdlib/pervasives.ml @@ -134,7 +134,12 @@ let stderr = open_descriptor_out 2 (* General output functions *) -open Sys +type open_flag = + Open_rdonly | Open_wronly | Open_rdwr + | Open_append | Open_creat | Open_trunc | Open_excl + | Open_binary | Open_text + +external open_desc: string -> open_flag list -> int -> int = "sys_open" let open_out_gen mode perm name = open_descriptor_out(open_desc name mode perm) diff --git a/stdlib/pervasives.mli b/stdlib/pervasives.mli index ff40c49d1..02b01c118 100644 --- a/stdlib/pervasives.mli +++ b/stdlib/pervasives.mli @@ -146,9 +146,15 @@ val read_int : unit -> int val read_float : unit -> float (* General output functions *) + +type open_flag = + Open_rdonly | Open_wronly | Open_rdwr + | Open_append | Open_creat | Open_trunc | Open_excl + | Open_binary | Open_text + val open_out : string -> out_channel val open_out_bin : string -> out_channel -val open_out_gen : Sys.open_flag list -> int -> string -> out_channel +val open_out_gen : open_flag list -> int -> string -> out_channel val flush : out_channel -> unit = "flush" val output_char : out_channel -> char -> unit = "output_char" val output_string : out_channel -> string -> unit @@ -165,7 +171,7 @@ val close_out : out_channel -> unit = "close_out" (* General input functions *) val open_in : string -> in_channel val open_in_bin : string -> in_channel -val open_in_gen : Sys.open_flag list -> int -> string -> in_channel +val open_in_gen : open_flag list -> int -> string -> in_channel val input_char : in_channel -> char = "input_char" val input_line : in_channel -> string val input : in_channel -> string -> int -> int -> int diff --git a/stdlib/sys.ml b/stdlib/sys.ml index b6172e418..79a40d9b3 100644 --- a/stdlib/sys.ml +++ b/stdlib/sys.ml @@ -1,18 +1,12 @@ (* System interface *) -type open_flag = - Open_rdonly | Open_wronly | Open_rdwr - | Open_append | Open_creat | Open_trunc | Open_excl - | Open_binary | Open_text - external get_argv: unit -> string array = "sys_get_argv" let argv = get_argv() +external file_exists: string -> bool = "sys_file_exists" external remove: string -> unit = "sys_remove" external getenv: string -> string = "sys_getenv" -external open_desc: string -> open_flag list -> int -> int = "sys_open" -external close_desc: int -> unit = "sys_close" external command: string -> int = "sys_system_command" external chdir: string -> unit = "sys_chdir" diff --git a/stdlib/sys.mli b/stdlib/sys.mli index b6332a14a..99c5e9375 100644 --- a/stdlib/sys.mli +++ b/stdlib/sys.mli @@ -1,15 +1,9 @@ (* System interface *) -type open_flag = - Open_rdonly | Open_wronly | Open_rdwr - | Open_append | Open_creat | Open_trunc | Open_excl - | Open_binary | Open_text - val argv: string array +val file_exists: string -> bool = "sys_file_exists" val remove: string -> unit = "sys_remove" val getenv: string -> string = "sys_getenv" -val open_desc: string -> open_flag list -> int -> int = "sys_open" -val close_desc: int -> unit = "sys_close" val command: string -> int = "sys_system_command" val chdir: string -> unit = "sys_chdir" |