diff options
Diffstat (limited to 'stdlib')
| -rw-r--r-- | stdlib/array.ml | 4 | ||||
| -rw-r--r-- | stdlib/array.mli | 4 | ||||
| -rw-r--r-- | stdlib/arrayLabels.mli | 4 | ||||
| -rw-r--r-- | stdlib/callback.ml | 3 | ||||
| -rw-r--r-- | stdlib/camlinternalOO.ml | 4 | ||||
| -rw-r--r-- | stdlib/digest.ml | 4 | ||||
| -rw-r--r-- | stdlib/digest.mli | 2 | ||||
| -rw-r--r-- | stdlib/lazy.ml | 2 | ||||
| -rw-r--r-- | stdlib/lexing.ml | 5 | ||||
| -rw-r--r-- | stdlib/pervasives.ml | 3 | ||||
| -rw-r--r-- | stdlib/stdLabels.mli | 4 | ||||
| -rw-r--r-- | stdlib/sys.ml | 2 | ||||
| -rw-r--r-- | stdlib/sys.mli | 7 |
13 files changed, 26 insertions, 22 deletions
diff --git a/stdlib/array.ml b/stdlib/array.ml index 88428fd78..0b021918f 100644 --- a/stdlib/array.ml +++ b/stdlib/array.ml @@ -20,8 +20,8 @@ external get: 'a array -> int -> 'a = "%array_safe_get" external set: 'a array -> int -> 'a -> unit = "%array_safe_set" external unsafe_get: 'a array -> int -> 'a = "%array_unsafe_get" external unsafe_set: 'a array -> int -> 'a -> unit = "%array_unsafe_set" -external make: int -> 'a -> 'a array = "make_vect" -external create: int -> 'a -> 'a array = "make_vect" +external make: int -> 'a -> 'a array = "caml_make_vect" +external create: int -> 'a -> 'a array = "caml_make_vect" let init l f = if l = 0 then [||] else diff --git a/stdlib/array.mli b/stdlib/array.mli index 115d3dd1f..4712d8bf6 100644 --- a/stdlib/array.mli +++ b/stdlib/array.mli @@ -35,7 +35,7 @@ external set : 'a array -> int -> 'a -> unit = "%array_safe_set" Raise [Invalid_argument "index out of bounds"] if [n] is outside the range 0 to [Array.length a - 1]. *) -external make : int -> 'a -> 'a array = "make_vect" +external make : int -> 'a -> 'a array = "caml_make_vect" (** [Array.make n x] returns a fresh array of length [n], initialized with [x]. All the elements of this new array are initially @@ -48,7 +48,7 @@ external make : int -> 'a -> 'a array = "make_vect" If the value of [x] is a floating-point number, then the maximum size is only [Sys.max_array_length / 2].*) -external create : int -> 'a -> 'a array = "make_vect" +external create : int -> 'a -> 'a array = "caml_make_vect" (** @deprecated [Array.create] is an alias for {!Array.make}. *) val init : int -> (int -> 'a) -> 'a array diff --git a/stdlib/arrayLabels.mli b/stdlib/arrayLabels.mli index 0616ada1e..20e953647 100644 --- a/stdlib/arrayLabels.mli +++ b/stdlib/arrayLabels.mli @@ -34,7 +34,7 @@ external set : 'a array -> int -> 'a -> unit = "%array_safe_set" 0 to [Array.length a - 1]. You can also write [a.(n) <- x] instead of [Array.set a n x]. *) -external make : int -> 'a -> 'a array = "make_vect" +external make : int -> 'a -> 'a array = "caml_make_vect" (** [Array.make n x] returns a fresh array of length [n], initialized with [x]. All the elements of this new array are initially @@ -47,7 +47,7 @@ external make : int -> 'a -> 'a array = "make_vect" If the value of [x] is a floating-point number, then the maximum size is only [Sys.max_array_length / 2].*) -external create : int -> 'a -> 'a array = "make_vect" +external create : int -> 'a -> 'a array = "caml_make_vect" (** @deprecated [Array.create] is an alias for {!ArrayLabels.make}. *) val init : int -> f:(int -> 'a) -> 'a array diff --git a/stdlib/callback.ml b/stdlib/callback.ml index d070c2bb6..819f9d3f4 100644 --- a/stdlib/callback.ml +++ b/stdlib/callback.ml @@ -15,7 +15,8 @@ (* Registering Caml values with the C runtime for later callbacks *) -external register_named_value: string -> Obj.t -> unit = "register_named_value" +external register_named_value : string -> Obj.t -> unit + = "caml_register_named_value" let register name v = register_named_value name (Obj.repr v) diff --git a/stdlib/camlinternalOO.ml b/stdlib/camlinternalOO.ml index 29e81dc8c..95f07456f 100644 --- a/stdlib/camlinternalOO.ml +++ b/stdlib/camlinternalOO.ml @@ -450,7 +450,7 @@ let make_class_store pub_meths class_init init_table = let create_object table = (* XXX Appel de [obj_block] *) let obj = Obj.new_block Obj.object_tag table.size in - (* XXX Appel de [modify] *) + (* XXX Appel de [caml_modify] *) Obj.set_field obj 0 (Obj.repr table.buckets); set_id obj last_id; (Obj.obj obj) @@ -459,7 +459,7 @@ let create_object_opt obj_0 table = if (Obj.magic obj_0 : bool) then obj_0 else begin (* XXX Appel de [obj_block] *) let obj = Obj.new_block Obj.object_tag table.size in - (* XXX Appel de [modify] *) + (* XXX Appel de [caml_modify] *) Obj.set_field obj 0 (Obj.repr table.buckets); set_id obj last_id; (Obj.obj obj) diff --git a/stdlib/digest.ml b/stdlib/digest.ml index 04603303b..78a45d54e 100644 --- a/stdlib/digest.ml +++ b/stdlib/digest.ml @@ -17,8 +17,8 @@ type t = string -external unsafe_string: string -> int -> int -> t = "md5_string" -external channel: in_channel -> int -> t = "md5_chan" +external unsafe_string: string -> int -> int -> t = "caml_md5_string" +external channel: in_channel -> int -> t = "caml_md5_chan" let string str = unsafe_string str 0 (String.length str) diff --git a/stdlib/digest.mli b/stdlib/digest.mli index 9c94d60f2..72db79948 100644 --- a/stdlib/digest.mli +++ b/stdlib/digest.mli @@ -32,7 +32,7 @@ val substring : string -> int -> int -> t of [s] starting at character number [ofs] and containing [len] characters. *) -external channel : in_channel -> int -> t = "md5_chan" +external channel : in_channel -> int -> t = "caml_md5_chan" (** If [len] is nonnegative, [Digest.channel ic len] reads [len] characters from channel [ic] and returns their digest, or raises [End_of_file] if end-of-file is reached before [len] characters diff --git a/stdlib/lazy.ml b/stdlib/lazy.ml index 84158b257..6642e1ec9 100644 --- a/stdlib/lazy.ml +++ b/stdlib/lazy.ml @@ -37,7 +37,7 @@ fancy. We cannot use representation (3) for a [float Lazy.t] because - [make_array] assumes that only a [float] value can have tag + [caml_make_array] assumes that only a [float] value can have tag [Double_tag]. We have to use the built-in type constructor [lazy_t] to diff --git a/stdlib/lexing.ml b/stdlib/lexing.ml index 1899f78d8..0211144ef 100644 --- a/stdlib/lexing.ml +++ b/stdlib/lexing.ml @@ -57,8 +57,9 @@ type lex_tables = lex_check_code : string; lex_code: string;} -external c_engine: lex_tables -> int -> lexbuf -> int = "lex_engine" -external c_new_engine: lex_tables -> int -> lexbuf -> int = "new_lex_engine" +external c_engine : lex_tables -> int -> lexbuf -> int = "caml_lex_engine" +external c_new_engine : lex_tables -> int -> lexbuf -> int + = "caml_new_lex_engine" let engine tbl state buf = let result = c_engine tbl state buf in diff --git a/stdlib/pervasives.ml b/stdlib/pervasives.ml index f5ea6a349..2d653f616 100644 --- a/stdlib/pervasives.ml +++ b/stdlib/pervasives.ml @@ -424,6 +424,7 @@ let exit retcode = do_at_exit (); sys_exit retcode -external register_named_value: string -> 'a -> unit = "register_named_value" +external register_named_value : string -> 'a -> unit + = "caml_register_named_value" let _ = register_named_value "Pervasives.do_at_exit" do_at_exit diff --git a/stdlib/stdLabels.mli b/stdlib/stdLabels.mli index 509eccb62..4750bbffb 100644 --- a/stdlib/stdLabels.mli +++ b/stdlib/stdLabels.mli @@ -27,8 +27,8 @@ module Array : external length : 'a array -> int = "%array_length" external get : 'a array -> int -> 'a = "%array_safe_get" external set : 'a array -> int -> 'a -> unit = "%array_safe_set" - external make : int -> 'a -> 'a array = "make_vect" - external create : int -> 'a -> 'a array = "make_vect" + external make : int -> 'a -> 'a array = "caml_make_vect" + external create : int -> 'a -> 'a array = "caml_make_vect" val init : int -> f:(int -> 'a) -> 'a array val make_matrix : dimx:int -> dimy:int -> 'a -> 'a array array val create_matrix : dimx:int -> dimy:int -> 'a -> 'a array array diff --git a/stdlib/sys.ml b/stdlib/sys.ml index 32889830d..fd88f44e2 100644 --- a/stdlib/sys.ml +++ b/stdlib/sys.ml @@ -78,4 +78,4 @@ let catch_break on = (* OCaml version string, must be in the format described in sys.mli. *) -let ocaml_version = "3.07+8 (2003-12-29)";; +let ocaml_version = "3.07+9 (2003-12-30)";; diff --git a/stdlib/sys.mli b/stdlib/sys.mli index e1b871b08..bad9d86ef 100644 --- a/stdlib/sys.mli +++ b/stdlib/sys.mli @@ -188,6 +188,7 @@ val catch_break : bool -> unit val ocaml_version : string;; (** [ocaml_version] is the version of Objective Caml. - It is a string of the form ["major.minor[additional-info]"] - Where major and minor are integers, and [additional-info] is - a string that is empty or starts with a '+'. *) + It is a string of the form ["major.minor[.patchlevel][+additional-info]"] + Where [major], [minor], and [patchlevel] are integers, and + [additional-info] is an arbitrary string. The [[.patchlevel]] and + [[+additional-info]] parts may be absent. *) |