diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2003-10-01 14:11:18 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2003-10-01 14:11:18 +0000 |
| commit | 28078989d8ad0cd5303aadb8ba86583bebc26586 (patch) | |
| tree | 19ea4a510037aa3775eb7964590733f4088ee1cf | |
| parent | 9af0f015edcaa21684d40d96743957131d8103bd (diff) | |
| download | perl_checker-28078989d8ad0cd5303aadb8ba86583bebc26586.tar perl_checker-28078989d8ad0cd5303aadb8ba86583bebc26586.tar.gz perl_checker-28078989d8ad0cd5303aadb8ba86583bebc26586.tar.bz2 perl_checker-28078989d8ad0cd5303aadb8ba86583bebc26586.tar.xz perl_checker-28078989d8ad0cd5303aadb8ba86583bebc26586.zip | |
fix locally imported at toplevel
| -rw-r--r-- | perl_checker.src/global_checks.ml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/perl_checker.src/global_checks.ml b/perl_checker.src/global_checks.ml index 79b26ac..6e7b46c 100644 --- a/perl_checker.src/global_checks.ml +++ b/perl_checker.src/global_checks.ml @@ -241,8 +241,6 @@ let check_unused_local_variables vars = | _ -> if s.[0] != '_' || s = "_" then warn_with_pos pos (sprintf "unused variable %s" (variable2s v)) ) (List.hd vars.my_vars) - -let imported_add i1 i2 = if i1 = None && i2 = None then None else Some (some_or i1 [] @ some_or i2 []) let check_variables vars t = let rec check_variables_ vars t = fold_tree check vars t @@ -384,7 +382,7 @@ let check_variables vars t = let l = get_imported vars.state vars.current_package (package_name, (args, pos)) in let vars = if vars.is_toplevel then ( - vars.current_package.imported := imported_add !(vars.current_package.imported) (Some l) ; + vars.current_package.imported := Some (get_imports vars.state vars.current_package @ l) ; vars ) else { vars with locally_imported = l @ vars.locally_imported } in @@ -436,6 +434,8 @@ let check_tree state package = if !Flags.verbose then print_endline_flush_always ("checking package " ^ package.package_name) ; let _vars = check_variables vars package.body in () + +let imported_add i1 i2 = if i1 = None && i2 = None then None else Some (some_or i1 [] @ some_or i2 []) let add_package_to_state state package = let package = |