diff options
| author | Xavier Leroy <xavier.leroy@inria.fr> | 2003-06-19 15:53:53 +0000 |
|---|---|---|
| committer | Xavier Leroy <xavier.leroy@inria.fr> | 2003-06-19 15:53:53 +0000 |
| commit | 1fa763e0c58fa76de0bfaf879f7fdd63ca99f0ec (patch) | |
| tree | b5b6ccb30ef36b441b794d55c74841533e1a5c11 /stdlib | |
| parent | b55c04a78864716f083b03fcdacddd2939e81d6e (diff) | |
Merge branch with recursive modules
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5602 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'stdlib')
| -rw-r--r-- | stdlib/camlinternalOO.ml | 10 | ||||
| -rw-r--r-- | stdlib/camlinternalOO.mli | 1 | ||||
| -rw-r--r-- | stdlib/sys.ml | 2 |
3 files changed, 12 insertions, 1 deletions
diff --git a/stdlib/camlinternalOO.ml b/stdlib/camlinternalOO.ml index dcf23dd6f..8d5c3cb6a 100644 --- a/stdlib/camlinternalOO.ml +++ b/stdlib/camlinternalOO.ml @@ -257,6 +257,16 @@ type table = mutable vars: vars; mutable initializers: (obj -> unit) list } +let dummy_table = + { buckets = [| |]; + methods_by_name = Meths.empty; + methods_by_label = Labs.empty; + previous_states = []; + hidden_meths = []; + vars = Vars.empty; + initializers = []; + size = initial_object_size } + let table_count = ref 0 let new_table () = diff --git a/stdlib/camlinternalOO.mli b/stdlib/camlinternalOO.mli index 83586a7f3..5e945f931 100644 --- a/stdlib/camlinternalOO.mli +++ b/stdlib/camlinternalOO.mli @@ -37,6 +37,7 @@ val set_method : table -> label -> meth -> unit val narrow : table -> string list -> string list -> string list -> unit val widen : table -> unit val add_initializer : table -> (obj -> unit) -> unit +val dummy_table : table val create_table : string list -> table val init_class : table -> unit diff --git a/stdlib/sys.ml b/stdlib/sys.ml index 1a12fca48..2f1cda152 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.06+34 (2003-05-21)";; +let ocaml_version = "3.06+35 (2003-06-16)";; |