Remove String_with_var.Loc.fail
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
This commit is contained in:
parent
843792ad5d
commit
9750f84b76
|
@ -211,7 +211,7 @@ module Var = struct
|
||||||
|
|
||||||
let to_string = string_of_var
|
let to_string = string_of_var
|
||||||
|
|
||||||
let fail v ~f = Loc.fail (loc v) "%s" (f (to_string v))
|
let pp fmt t = Format.pp_print_string fmt (to_string t)
|
||||||
|
|
||||||
let sexp_of_t t = Sexp.atom (to_string t)
|
let sexp_of_t t = Sexp.atom (to_string t)
|
||||||
|
|
||||||
|
|
|
@ -49,6 +49,8 @@ end
|
||||||
module Var : sig
|
module Var : sig
|
||||||
type t
|
type t
|
||||||
|
|
||||||
|
val pp : t Fmt.t
|
||||||
|
|
||||||
val sexp_of_t : t -> Sexp.t
|
val sexp_of_t : t -> Sexp.t
|
||||||
|
|
||||||
val loc : t -> Loc.t
|
val loc : t -> Loc.t
|
||||||
|
@ -60,8 +62,6 @@ module Var : sig
|
||||||
|
|
||||||
val destruct : t -> kind
|
val destruct : t -> kind
|
||||||
|
|
||||||
val fail : t -> f:(string -> string) -> _
|
|
||||||
|
|
||||||
val to_string : t -> string
|
val to_string : t -> string
|
||||||
|
|
||||||
val rename : t -> new_name:string -> t
|
val rename : t -> new_name:string -> t
|
||||||
|
|
|
@ -242,19 +242,19 @@ end = struct
|
||||||
if syntax_version >= min_version then
|
if syntax_version >= min_version then
|
||||||
Some v
|
Some v
|
||||||
else
|
else
|
||||||
String_with_vars.Var.fail var ~f:(fun var ->
|
Loc.fail (String_with_vars.Var.loc var)
|
||||||
sprintf "Variable %s is available in since version %s. \
|
"Variable %a is available in since version %s. \
|
||||||
Current version is %s"
|
Current version is %s"
|
||||||
var
|
String_with_vars.Var.pp var
|
||||||
(Syntax.Version.to_string min_version)
|
(Syntax.Version.to_string min_version)
|
||||||
(Syntax.Version.to_string syntax_version))
|
(Syntax.Version.to_string syntax_version)
|
||||||
| Renamed_in (in_version, new_name) -> begin
|
| Renamed_in (in_version, new_name) -> begin
|
||||||
if syntax_version >= in_version then
|
if syntax_version >= in_version then
|
||||||
String_with_vars.Var.fail var ~f:(fun old_name ->
|
Loc.fail (String_with_vars.Var.loc var)
|
||||||
sprintf "Variable %s has been renamed to %s since %s"
|
"Variable %a has been renamed to %s since %s"
|
||||||
old_name
|
String_with_vars.Var.pp var
|
||||||
(String_with_vars.Var.(to_string (rename var ~new_name)))
|
(String_with_vars.Var.(to_string (rename var ~new_name)))
|
||||||
(Syntax.Version.to_string in_version))
|
(Syntax.Version.to_string in_version)
|
||||||
else
|
else
|
||||||
expand t ~syntax_version:in_version
|
expand t ~syntax_version:in_version
|
||||||
~var:(String_with_vars.Var.rename var ~new_name)
|
~var:(String_with_vars.Var.rename var ~new_name)
|
||||||
|
@ -263,12 +263,12 @@ end = struct
|
||||||
if syntax_version < in_version then
|
if syntax_version < in_version then
|
||||||
Some v
|
Some v
|
||||||
else
|
else
|
||||||
String_with_vars.Var.fail var ~f:(fun var ->
|
Loc.fail (String_with_vars.Var.loc var)
|
||||||
sprintf "Variable %s has been deleted in version %s. \
|
"Variable %a has been deleted in version %s. \
|
||||||
Current version is: %s"
|
Current version is: %s"
|
||||||
var
|
String_with_vars.Var.pp var
|
||||||
(Syntax.Version.to_string in_version)
|
(Syntax.Version.to_string in_version)
|
||||||
(Syntax.Version.to_string syntax_version)))
|
(Syntax.Version.to_string syntax_version))
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -354,8 +354,9 @@ let (expand_vars_string, expand_vars_path) =
|
||||||
begin match Var.Kind.to_value_no_deps_or_targets ~scope v with
|
begin match Var.Kind.to_value_no_deps_or_targets ~scope v with
|
||||||
| Some _ as v -> v
|
| Some _ as v -> v
|
||||||
| None ->
|
| None ->
|
||||||
String_with_vars.Var.fail var
|
Loc.fail (String_with_vars.Var.loc var)
|
||||||
~f:(sprintf "Variable %s is not allowed in this context")
|
"Variable %a is not allowed in this context"
|
||||||
|
String_with_vars.Var.pp var
|
||||||
end)
|
end)
|
||||||
in
|
in
|
||||||
let expand_vars t ~scope ~dir ?extra_vars s =
|
let expand_vars t ~scope ~dir ?extra_vars s =
|
||||||
|
@ -938,7 +939,8 @@ module Action = struct
|
||||||
end
|
end
|
||||||
| Some Path_no_dep -> Some [Value.Dir (Path.relative dir s)]
|
| Some Path_no_dep -> Some [Value.Dir (Path.relative dir s)]
|
||||||
| None ->
|
| None ->
|
||||||
String_with_vars.Var.fail var ~f:(sprintf "Unknown form: %s")
|
Loc.fail (String_with_vars.Var.loc var) "Unknown form: %a"
|
||||||
|
String_with_vars.Var.pp var
|
||||||
end
|
end
|
||||||
in
|
in
|
||||||
let expand var syntax_version =
|
let expand var syntax_version =
|
||||||
|
|
Loading…
Reference in New Issue