diff options
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | src/tree.ml | 2 |
2 files changed, 4 insertions, 1 deletions
@@ -1,3 +1,6 @@ +- don't die when @ISA or "use base" is used more than once, + make it a warning instead (needed for Parted bindings) + Version 1.2.26 - 24 February 2014, by Thierry Vignaud - fix "undeclared variable $_" false positive on List::Util::first() diff --git a/src/tree.ml b/src/tree.ml index d0faf80..ec312e7 100644 --- a/src/tree.ml +++ b/src/tree.ml @@ -205,7 +205,7 @@ let get_uses t = let get_isa t = let get_isa_ isa exporter pos classes = - if isa <> None || exporter <> None then die_with_pos pos "\"use base\" and \"@ISA\" must be used once only"; + if isa <> None || exporter <> None then warn_with_pos [Warn_strange] pos "\"use base\" and \"@ISA\" must be used once only"; let special, l = List.partition (fun (s, _) -> s = "DynaLoader" || s = "Exporter") classes in let exporter = if List.mem_assoc "Exporter" special then Some pos else None in let isa = if l = [] && special <> [] then None else Some l in |