[Pkg-ocaml-maint-commits] [labltk] 01/03: New upstream version 8.06.2+dfsg

[Stéphane Glondu]

This is an automated email from the git hooks/post-receive script.

glondu pushed a commit to branch master
in repository labltk.

commit ae90ca23fe34d5b88dc24ff1c05e873dbc8967af
Author: Stephane Glondu <steph at glondu.net>
Date:   Sat Jul 15 16:31:16 2017 +0200

    New upstream version 8.06.2+dfsg
---
 Changes                 | 12 ++++++++++++
 browser/editor.ml       |  4 ++--
 browser/lexical.ml      |  2 +-
 browser/searchid.ml     |  1 +
 browser/searchpos.ml    | 11 +++++++----
 browser/viewer.ml       |  4 ++--
 support/Makefile.common |  2 +-
 support/cltkUtf.c       |  2 +-
 8 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/Changes b/Changes
index 95c963f..c4f4a5b 100644
--- a/Changes
+++ b/Changes
@@ -1,3 +1,15 @@
+2016-08-10:
+-----------
+* Release labltk-8.06.2, for ocaml 4.04
+
+2016-08-02:
+-----------
+* update browser for 4.04
+
+2016-04-28:
+-----------
+* Fix warning 52
+
 2016-04-27:
 -----------
 * Release labltk-8.06.1
diff --git a/browser/editor.ml b/browser/editor.ml
index 42a00cb..bd43f9f 100644
--- a/browser/editor.ml
+++ b/browser/editor.ml
@@ -83,7 +83,7 @@ let goto_line tw =
   and ic = Entry.create fi ~width:10
   and get_int ew =
       try int_of_string (Entry.get ew)
-      with Failure "int_of_string" -> 0
+      with Failure _ (*"int_of_string"*) -> 0
   in
   let buttons = Frame.create tl in
   let ok = Button.create buttons ~text:"Ok" ~command:
@@ -184,7 +184,7 @@ let send_phrase txt =
           end;
           match token with
             CLASS | EXTERNAL | EXCEPTION | FUNCTOR
-          | LET | MODULE | OPEN | TYPE | VAL | SHARP when bol ->
+          | LET | MODULE | OPEN | TYPE | VAL | HASH when bol ->
               if !block_start = [] then
                 if !after then pend := pos else start := pos
               else block_start := pos :: List.tl !block_start
diff --git a/browser/lexical.ml b/browser/lexical.ml
index a700f72..a423edc 100644
--- a/browser/lexical.ml
+++ b/browser/lexical.ml
@@ -111,7 +111,7 @@ let tag ?(start=tstart) ?(stop=tend) tw =
       | INFIXOP3 _
       | INFIXOP4 _
       | PREFIXOP _
-      | SHARP
+      | HASH
           -> "infix"
       | LABEL _
       | OPTLABEL _
diff --git a/browser/searchid.ml b/browser/searchid.ml
index ce9cce9..e1e7a93 100644
--- a/browser/searchid.ml
+++ b/browser/searchid.ml
@@ -437,6 +437,7 @@ let rec bound_variables pat =
   | Ppat_lazy pat -> bound_variables pat
   | Ppat_extension _ -> []
   | Ppat_exception pat -> bound_variables pat
+  | Ppat_open (_, pat) -> bound_variables pat
 
 let search_structure str ~name ~kind ~prefix =
   let loc = ref 0 in
diff --git a/browser/searchpos.ml b/browser/searchpos.ml
index 0111acd..086c536 100644
--- a/browser/searchpos.ml
+++ b/browser/searchpos.ml
@@ -485,7 +485,7 @@ and view_type_decl path ~env =
       [Sig_type(ident_of_path path ~default:"t", td, Trec_first)]
 
 and view_type_id li ~env =
-  let path, decl = lookup_type li env in
+  let path = lookup_type li env in
   view_type_decl path ~env
 
 and view_class_id li ~env =
@@ -528,7 +528,7 @@ and view_decl lid ~kind ~env =
 and view_decl_menu lid ~kind ~env ~parent =
   let path, kname =
     try match kind with
-      `Type -> fst (lookup_type lid env), "Type"
+      `Type -> lookup_type lid env, "Type"
     | `Class -> fst (lookup_class lid env), "Class"
     | `Module -> lookup_module ~load:true lid env, "Module"
     | `Modtype -> fst (lookup_modtype lid env), "Module type"
@@ -797,8 +797,9 @@ and search_pos_expr ~pos exp =
   | Texp_construct (_, _, l) -> List.iter l ~f:(search_pos_expr ~pos)
   | Texp_variant (_, None) -> ()
   | Texp_variant (_, Some exp) -> search_pos_expr exp ~pos
-  | Texp_record (l, opt) ->
-      List.iter l ~f:(fun (_, _, exp) -> search_pos_expr exp ~pos);
+  | Texp_record {fields=l; extended_expression=opt} ->
+      Array.iter l ~f:
+        (function (_,Overridden(_,exp)) -> search_pos_expr exp ~pos | _ -> ());
       (match opt with None -> () | Some exp -> search_pos_expr exp ~pos)
   | Texp_field (exp, _, _) -> search_pos_expr exp ~pos
   | Texp_setfield (a, _, _, b) ->
@@ -843,6 +844,8 @@ and search_pos_expr ~pos exp =
       ()
   | Texp_extension_constructor _ ->
       ()
+  | Texp_letexception (_, exp) ->
+      search_pos_expr exp ~pos
   end;
   add_found_str (`Exp(`Expr, exp.exp_type)) ~env:exp.exp_env ~loc:exp.exp_loc
   end
diff --git a/browser/viewer.ml b/browser/viewer.ml
index 5ca8896..3c841a7 100644
--- a/browser/viewer.ml
+++ b/browser/viewer.ml
@@ -609,7 +609,7 @@ object (self)
     let display index =
       let `Num pos = Listbox.index box ~index in
       try
-        let li, k = List.nth l pos in
+        let li, k = try List.nth l pos with Failure _ -> raise Exit in
         self#hide_after (n+1);
         if !current = Some (li,k) then () else
         let path =
@@ -623,7 +623,7 @@ object (self)
         in
         current := Some (li,k);
         view_symbol li ~kind:k ~env ?path
-      with Failure "nth" -> ()
+      with Exit -> ()
     in
     Jg_box.add_completion box ~double:false ~action:display;
     bind box ~events:[`KeyRelease] ~fields:[`Char]
diff --git a/support/Makefile.common b/support/Makefile.common
index 32757ec..d24d591 100644
--- a/support/Makefile.common
+++ b/support/Makefile.common
@@ -25,7 +25,7 @@ CAMLC=$(BINDIR)/ocamlc$(OPT)
 CAMLOPT=$(BINDIR)/ocamlopt$(OPT)
 CAMLCB=$(BINDIR)/ocamlc
 CAMLOPTB=$(BINDIR)/ocamlopt
-CAMLCOMP=$(CAMLC) -c -warn-error A-3-52
+CAMLCOMP=$(CAMLC) -c -warn-error A-3
 CAMLYACC=$(BINDIR)/ocamlyacc -v
 CAMLLEX=$(BINDIR)/ocamllex
 CAMLLIBR=$(CAMLC) -a
diff --git a/support/cltkUtf.c b/support/cltkUtf.c
index b104256..eb33500 100644
--- a/support/cltkUtf.c
+++ b/support/cltkUtf.c
@@ -36,7 +36,7 @@
 
 #ifdef UTFCONVERSION
 
-char *external_to_utf( char *str ){
+char *external_to_utf( const char *str ){
   char *res;
   Tcl_DString dstr;
   int length;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/labltk.git