PR#5677: do not use "value" as identifier (genprintval.ml)

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12690 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
master
Damien Doligez 2012-07-10 15:03:11 +00:00
parent 9c3b2b4784
commit 1330131d70
5 changed files with 11 additions and 10 deletions

View File

@ -169,6 +169,7 @@ Bug Fixes:
- PR#5655: ocamlbuild doesn't pass cflags when building C stubs
- PR#5661: fixes for the test suite
- PR#5671: initialization of compare_ext field in caml_final_custom_operations()
- PR#5677: do not use "value" as identifier (genprintval.ml)
- problem with printing of string literals in camlp4 (reported on caml-list)
- emacs mode: colorization of comments and strings now works correctly

View File

@ -47,7 +47,7 @@ let check_depth ppf depth obj ty =
module EvalPath =
struct
type value = Debugcom.Remote_value.t
type valu = Debugcom.Remote_value.t
exception Error
let rec eval_path = function
Pident id ->

View File

@ -33,10 +33,10 @@ module type OBJ =
module type EVALPATH =
sig
type value
val eval_path: Path.t -> value
type valu
val eval_path: Path.t -> valu
exception Error
val same_value: value -> value -> bool
val same_value: valu -> valu -> bool
end
module type S =
@ -52,7 +52,7 @@ module type S =
Env.t -> t -> type_expr -> Outcometree.out_value
end
module Make(O : OBJ)(EVP : EVALPATH with type value = O.t) = struct
module Make(O : OBJ)(EVP : EVALPATH with type valu = O.t) = struct
type t = O.t

View File

@ -29,10 +29,10 @@ module type OBJ =
module type EVALPATH =
sig
type value
val eval_path: Path.t -> value
type valu
val eval_path: Path.t -> valu
exception Error
val same_value: value -> value -> bool
val same_value: valu -> valu -> bool
end
module type S =
@ -48,5 +48,5 @@ module type S =
Env.t -> t -> type_expr -> Outcometree.out_value
end
module Make(O : OBJ)(EVP : EVALPATH with type value = O.t) :
module Make(O : OBJ)(EVP : EVALPATH with type valu = O.t) :
(S with type t = O.t)

View File

@ -65,7 +65,7 @@ let rec eval_path = function
(* To print values *)
module EvalPath = struct
type value = Obj.t
type valu = Obj.t
exception Error
let eval_path p = try eval_path p with Symtable.Error _ -> raise Error
let same_value v1 v2 = (v1 == v2)