- allow $_o_XXX parameter name which is both unused and optional (same for $_b_XXX)

- shift is a ONE_SCALAR_PARA so that $box->pack_start(shift @l, 0, 0, 4) is parsed correctly
- in arrange_global_vars_declared(), don't keep anything in global_vars_declared, better
  create shadow packages to contain them
- much better merging of multiple files defining functions in the same package.
  This fixes the bad behaviour when using the cache (esp. do_pkgs, but it was even worse
  with things in ugtk2.pm)

1 files changed, 4 insertions, 1 deletions

diff --git a/perl_checker.src/tree.ml b/perl_checker.src/tree.ml
index 929a5a3..eabf553 100644
--- a/perl_checker.src/tree.ml
+++ b/perl_checker.src/tree.ml
@@ -274,7 +274,10 @@ let get_proto perl_proto body =
     | (I_array, _) :: _ :: _ -> warn_with_pos pos "an array must be the last variable in a prototype"
     | (I_hash, _) :: _ :: _ -> warn_with_pos pos "an hash must be the last variable in a prototype"
     | _ -> ());
-    let is_optional (_, s) = String.length s > 2 && (s.[0] = 'o' || s.[0] = 'b') && s.[1] = '_' in
+    let is_optional (_, s) = 
+      String.length s > 2 &&                (s.[0] = 'o' || s.[0] = 'b') && s.[1] = '_' ||
+      String.length s > 3 && s.[0] = '_' && (s.[1] = 'o' || s.[1] = 'b') && s.[2] = '_'
+    in
     let must_have, optional = break_at is_optional scalars in
     if not (List.for_all is_optional optional) then
       warn_with_pos pos "an non-optional argument must not follow an optional argument";