diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2002-12-04 22:11:57 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2002-12-04 22:11:57 +0000 |
| commit | d1609de77aeb01a784950d707354770bde196782 (patch) | |
| tree | 9c271c0769fe413ab89baeea491783d26fe67293 /perl_checker.src | |
| parent | 1310c8fe02524b095663ca7c79bd803747e6754b (diff) | |
| download | perl_checker-d1609de77aeb01a784950d707354770bde196782.tar perl_checker-d1609de77aeb01a784950d707354770bde196782.tar.gz perl_checker-d1609de77aeb01a784950d707354770bde196782.tar.bz2 perl_checker-d1609de77aeb01a784950d707354770bde196782.tar.xz perl_checker-d1609de77aeb01a784950d707354770bde196782.zip | |
handle "use lib qw(...)"
Diffstat (limited to 'perl_checker.src')
| -rw-r--r-- | perl_checker.src/perl_checker.ml | 2 | ||||
| -rw-r--r-- | perl_checker.src/tree.ml | 6 | ||||
| -rw-r--r-- | perl_checker.src/tree.mli | 1 |
3 files changed, 7 insertions, 2 deletions
diff --git a/perl_checker.src/perl_checker.ml b/perl_checker.src/perl_checker.ml index f328b32..bf4853d 100644 --- a/perl_checker.src/perl_checker.ml +++ b/perl_checker.src/perl_checker.ml @@ -51,7 +51,7 @@ and parse_package_if_needed state (package_name, pos) = if List.mem_assoc package_name state.per_package then [], state else try let package = snd (List.hd state.per_package) in - let inc = inc package.file_name package.package_name package.has_package_name in + let inc = !Tree.use_lib @ inc package.file_name package.package_name package.has_package_name in if List.mem package_name !ignored_packages then [], state else let rel_file = String.concat "/" (split_at2 ':'':' package_name) ^ ".pm" in diff --git a/perl_checker.src/tree.ml b/perl_checker.src/tree.ml index ee1a4ce..bc72db8 100644 --- a/perl_checker.src/tree.ml +++ b/perl_checker.src/tree.ml @@ -43,6 +43,7 @@ let anonymous_package_count = ref 0 let default_state = { per_package = []; files_parsed = []; global_vars_declared = Hashtbl.create 256; global_vars_used = ref [] } let empty_exports = { export_ok = []; export_auto = []; export_tags = []; special_export = None } let ignored_packages = ref [] +let use_lib = ref [] let die_with_pos pos msg = failwith (Info.pos2sfull pos ^ msg) let warn_with_pos pos msg = prerr_endline (Info.pos2sfull pos ^ msg) @@ -146,13 +147,16 @@ let get_exported t = ) empty_exports t let uses_external_package = function - | "vars" | "MDK::Common::Globals" | "Exporter" | "diagnostics" | "strict" | "lib" | "POSIX" + | "vars" | "MDK::Common::Globals" | "Exporter" | "diagnostics" | "strict" | "lib" | "POSIX" | "Gtk" | "Gtk2" | "Config" | "Socket" | "Net::FTP" | "IO::Socket" | "DynaLoader" | "Data::Dumper" -> true | _ -> false let get_uses t = List.fold_left (fun uses e -> match e with + | Use(Ident(None, "lib", _), [libs]) -> + use_lib := List.map snd (from_qw libs) @ !use_lib ; + uses | Use(Ident _ as pkg, _) when uses_external_package (string_of_Ident pkg) -> uses | Use(Ident(_, _, pos) as ident, l) -> let package = string_of_Ident ident in diff --git a/perl_checker.src/tree.mli b/perl_checker.src/tree.mli index 71eeb04..e5d19c1 100644 --- a/perl_checker.src/tree.mli +++ b/perl_checker.src/tree.mli @@ -29,6 +29,7 @@ type state = { } val ignored_packages : string list ref +val use_lib : string list ref val default_state : state val get_global_info_from_package : fromparser list -> per_package list * (string * pos) list |