[Pkg-ocaml-maint-commits] r2341 - trunk/projects/ocaml-deblib

Stefano Zacchiroli zack at costa.debian.org
Wed Dec 28 13:58:11 UTC 2005


Author: zack
Date: 2005-12-28 13:58:10 +0000 (Wed, 28 Dec 2005)
New Revision: 2341

Modified:
   trunk/projects/ocaml-deblib/deblib_822Parser.ml
   trunk/projects/ocaml-deblib/deblib_822Parser.mli
   trunk/projects/ocaml-deblib/deblib_822Parser.mly
   trunk/projects/ocaml-deblib/deblib_Archive.ml
   trunk/projects/ocaml-deblib/deblib_Types.ml
   trunk/projects/ocaml-deblib/deblib_Utils.ml
   trunk/projects/ocaml-deblib/deblib_Utils.mli
   trunk/projects/ocaml-deblib/test.ml
Log:
added parsing of debian/control files


Modified: trunk/projects/ocaml-deblib/deblib_822Parser.ml
===================================================================
--- trunk/projects/ocaml-deblib/deblib_822Parser.ml	2005-12-28 13:57:46 UTC (rev 2340)
+++ trunk/projects/ocaml-deblib/deblib_822Parser.ml	2005-12-28 13:58:10 UTC (rev 2341)
@@ -20,42 +20,111 @@
     0|]
 
 let yylhs = "\255\255\
-\001\000\002\000\002\000\003\000\004\000\004\000\005\000\005\000\
-\006\000\006\000\000\000"
+\001\000\002\000\003\000\003\000\004\000\004\000\004\000\006\000\
+\006\000\005\000\007\000\007\000\008\000\008\000\009\000\009\000\
+\000\000\000\000"
 
 let yylen = "\002\000\
-\002\000\000\000\002\000\002\000\002\000\001\000\002\000\003\000\
-\002\000\003\000\002\000"
+\002\000\002\000\000\000\003\000\000\000\003\000\001\000\001\000\
+\002\000\001\000\002\000\001\000\002\000\003\000\002\000\003\000\
+\002\000\002\000"
 
 let yydefred = "\000\000\
-\000\000\000\000\000\000\011\000\000\000\000\000\000\000\000\000\
-\000\000\001\000\003\000\004\000\005\000\000\000\008\000\000\000\
-\010\000"
+\000\000\000\000\000\000\000\000\017\000\000\000\000\000\010\000\
+\000\000\018\000\000\000\000\000\000\000\001\000\000\000\011\000\
+\002\000\000\000\000\000\000\000\014\000\004\000\009\000\006\000\
+\000\000\016\000"
 
-let yydgoto = "\002\000\
-\004\000\005\000\006\000\007\000\008\000\015\000"
+let yydgoto = "\003\000\
+\005\000\010\000\006\000\011\000\007\000\019\000\008\000\009\000\
+\021\000"
 
-let yysindex = "\003\000\
-\004\255\000\000\003\255\000\000\007\000\004\255\005\255\004\255\
-\007\255\000\000\000\000\000\000\000\000\008\255\000\000\007\255\
-\000\000"
+let yysindex = "\007\000\
+\003\255\003\255\000\000\002\255\000\000\010\000\004\255\000\000\
+\003\255\000\000\011\000\009\255\011\255\000\000\003\255\000\000\
+\000\000\009\255\003\255\012\255\000\000\000\000\000\000\000\000\
+\011\255\000\000"
 
 let yyrindex = "\000\000\
-\010\000\000\000\000\000\000\000\000\000\010\000\000\000\009\255\
-\255\254\000\000\000\000\000\000\000\000\000\000\000\000\000\255\
-\000\000"
+\014\000\016\000\000\000\000\000\000\000\000\000\000\000\000\000\
+\003\000\000\000\000\000\018\000\001\000\000\000\014\000\000\000\
+\000\000\006\000\016\000\000\000\000\000\000\000\000\000\000\000\
+\002\000\000\000"
 
 let yygindex = "\000\000\
-\000\000\008\000\000\000\005\000\000\000\255\255"
+\000\000\000\000\004\000\005\000\254\255\008\000\012\000\000\000\
+\251\255"
 
-let yytablesize = 15
-let yytable = "\007\000\
-\009\000\007\000\009\000\001\000\003\000\009\000\010\000\012\000\
-\014\000\002\000\016\000\006\000\013\000\011\000\017\000"
+let yytablesize = 263
+let yytable = "\012\000\
+\013\000\015\000\012\000\004\000\013\000\008\000\015\000\001\000\
+\002\000\014\000\017\000\018\000\020\000\003\000\025\000\005\000\
+\012\000\007\000\022\000\026\000\016\000\000\000\000\000\024\000\
+\000\000\023\000\000\000\000\000\000\000\000\000\000\000\000\000\
+\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
+\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
+\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
+\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
+\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
+\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
+\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
+\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
+\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
+\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
+\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
+\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
+\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
+\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
+\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
+\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
+\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
+\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
+\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
+\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
+\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
+\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
+\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
+\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
+\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
+\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
+\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
+\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
+\000\000\013\000\015\000\013\000\015\000\012\000\008\000"
 
-let yycheck = "\001\001\
-\001\001\003\001\003\001\001\000\001\001\003\001\000\000\003\001\
-\002\001\000\000\003\001\003\001\008\000\006\000\016\000"
+let yycheck = "\002\000\
+\000\000\000\000\000\000\001\001\003\001\000\000\003\001\001\000\
+\002\000\000\000\000\000\003\001\002\001\000\000\003\001\000\000\
+\019\000\000\000\015\000\025\000\009\000\255\255\255\255\019\000\
+\255\255\018\000\255\255\255\255\255\255\255\255\255\255\255\255\
+\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
+\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
+\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
+\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
+\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
+\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
+\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
+\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
+\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
+\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
+\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
+\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
+\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
+\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
+\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
+\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
+\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
+\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
+\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
+\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
+\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
+\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
+\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
+\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
+\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
+\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
+\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
+\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
+\255\255\001\001\001\001\003\001\003\001\003\001\001\001"
 
 let yynames_const = "\
   EOL\000\
@@ -72,91 +141,135 @@
 ; (fun __caml_parser_env ->
     let _1 = (Parsing.peek_val __caml_parser_env 1 : 'Stanzas) in
     Obj.repr(
-# 19 "deblib_822Parser.mly"
-                (_1)
-# 78 "deblib_822Parser.ml"
+# 20 "deblib_822Parser.mly"
+                ( _1 )
+# 147 "deblib_822Parser.ml"
                : (string,string) Hashtbl.t list))
 ; (fun __caml_parser_env ->
+    let _1 = (Parsing.peek_val __caml_parser_env 1 : 'DebCtrlStanzas) in
     Obj.repr(
-# 22 "deblib_822Parser.mly"
-                   ( [] )
-# 84 "deblib_822Parser.ml"
+# 23 "deblib_822Parser.mly"
+                       ( _1 )
+# 154 "deblib_822Parser.ml"
+               : (string,string) Hashtbl.t list))
+; (fun __caml_parser_env ->
+    Obj.repr(
+# 26 "deblib_822Parser.mly"
+                        ( [] )
+# 160 "deblib_822Parser.ml"
                : 'Stanzas))
 ; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 1 : 'Stanza) in
-    let _2 = (Parsing.peek_val __caml_parser_env 0 : 'Stanzas) in
+    let _1 = (Parsing.peek_val __caml_parser_env 2 : 'Stanza) in
+    let _3 = (Parsing.peek_val __caml_parser_env 0 : 'Stanzas) in
     Obj.repr(
-# 23 "deblib_822Parser.mly"
-                   ( _1 :: _2 )
-# 92 "deblib_822Parser.ml"
+# 27 "deblib_822Parser.mly"
+                        ( _1 :: _3 )
+# 168 "deblib_822Parser.ml"
                : 'Stanzas))
 ; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 1 : 'Fields) in
     Obj.repr(
-# 27 "deblib_822Parser.mly"
+# 33 "deblib_822Parser.mly"
+                                ( [] )
+# 174 "deblib_822Parser.ml"
+               : 'DebCtrlStanzas))
+; (fun __caml_parser_env ->
+    let _1 = (Parsing.peek_val __caml_parser_env 2 : 'Stanza) in
+    let _2 = (Parsing.peek_val __caml_parser_env 1 : 'EOLs) in
+    let _3 = (Parsing.peek_val __caml_parser_env 0 : 'DebCtrlStanzas) in
+    Obj.repr(
+# 34 "deblib_822Parser.mly"
+                                ( _1 :: _3 )
+# 183 "deblib_822Parser.ml"
+               : 'DebCtrlStanzas))
+; (fun __caml_parser_env ->
+    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'Stanza) in
+    Obj.repr(
+# 35 "deblib_822Parser.mly"
+                                ( [ _1 ] )
+# 190 "deblib_822Parser.ml"
+               : 'DebCtrlStanzas))
+; (fun __caml_parser_env ->
+    Obj.repr(
+# 38 "deblib_822Parser.mly"
+              ()
+# 196 "deblib_822Parser.ml"
+               : 'EOLs))
+; (fun __caml_parser_env ->
+    let _2 = (Parsing.peek_val __caml_parser_env 0 : 'EOLs) in
+    Obj.repr(
+# 39 "deblib_822Parser.mly"
+              ()
+# 203 "deblib_822Parser.ml"
+               : 'EOLs))
+; (fun __caml_parser_env ->
+    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'Fields) in
+    Obj.repr(
+# 43 "deblib_822Parser.mly"
       ( let old = !tbl in
 	  tbl := Hashtbl.create 17;
 	  old
       )
-# 102 "deblib_822Parser.ml"
+# 213 "deblib_822Parser.ml"
                : 'Stanza))
 ; (fun __caml_parser_env ->
     let _1 = (Parsing.peek_val __caml_parser_env 1 : 'SingleField) in
     let _2 = (Parsing.peek_val __caml_parser_env 0 : 'Fields) in
     Obj.repr(
-# 33 "deblib_822Parser.mly"
+# 49 "deblib_822Parser.mly"
                        ()
-# 110 "deblib_822Parser.ml"
+# 221 "deblib_822Parser.ml"
                : 'Fields))
 ; (fun __caml_parser_env ->
     let _1 = (Parsing.peek_val __caml_parser_env 0 : 'SingleField) in
     Obj.repr(
-# 34 "deblib_822Parser.mly"
+# 50 "deblib_822Parser.mly"
                        ()
-# 117 "deblib_822Parser.ml"
+# 228 "deblib_822Parser.ml"
                : 'Fields))
 ; (fun __caml_parser_env ->
     let _1 = (Parsing.peek_val __caml_parser_env 1 : string*string) in
     Obj.repr(
-# 37 "deblib_822Parser.mly"
+# 53 "deblib_822Parser.mly"
               (
       let name,value = _1 in
 	if !Deblib_ParserOpts.care_about = [] || 
 	  List.mem name !Deblib_ParserOpts.care_about
 	then Hashtbl.add !tbl name (value)
     )
-# 129 "deblib_822Parser.ml"
+# 240 "deblib_822Parser.ml"
                : 'SingleField))
 ; (fun __caml_parser_env ->
     let _1 = (Parsing.peek_val __caml_parser_env 2 : string*string) in
     let _3 = (Parsing.peek_val __caml_parser_env 0 : 'Rest) in
     Obj.repr(
-# 44 "deblib_822Parser.mly"
+# 60 "deblib_822Parser.mly"
                    (
       let name,value = _1 in
 	if !Deblib_ParserOpts.care_about = [] || 
 	  List.mem name !Deblib_ParserOpts.care_about
 	then Hashtbl.add !tbl name (value ^ _3)
     )
-# 142 "deblib_822Parser.ml"
+# 253 "deblib_822Parser.ml"
                : 'SingleField))
 ; (fun __caml_parser_env ->
     let _1 = (Parsing.peek_val __caml_parser_env 1 : string) in
     Obj.repr(
-# 52 "deblib_822Parser.mly"
+# 68 "deblib_822Parser.mly"
                        ( _1 )
-# 149 "deblib_822Parser.ml"
+# 260 "deblib_822Parser.ml"
                : 'Rest))
 ; (fun __caml_parser_env ->
     let _1 = (Parsing.peek_val __caml_parser_env 2 : string) in
     let _3 = (Parsing.peek_val __caml_parser_env 0 : 'Rest) in
     Obj.repr(
-# 53 "deblib_822Parser.mly"
+# 69 "deblib_822Parser.mly"
                        ( _1 ^ _3 )
-# 157 "deblib_822Parser.ml"
+# 268 "deblib_822Parser.ml"
                : 'Rest))
-(* Entry main *)
+(* Entry main_822 *)
 ; (fun __caml_parser_env -> raise (Parsing.YYexit (Parsing.peek_val __caml_parser_env 0)))
+(* Entry main_debctrl *)
+; (fun __caml_parser_env -> raise (Parsing.YYexit (Parsing.peek_val __caml_parser_env 0)))
 |]
 let yytables =
   { Parsing.actions=yyact;
@@ -175,5 +288,7 @@
     Parsing.error_function=parse_error;
     Parsing.names_const=yynames_const;
     Parsing.names_block=yynames_block }
-let main (lexfun : Lexing.lexbuf -> token) (lexbuf : Lexing.lexbuf) =
+let main_822 (lexfun : Lexing.lexbuf -> token) (lexbuf : Lexing.lexbuf) =
    (Parsing.yyparse yytables 1 lexfun lexbuf : (string,string) Hashtbl.t list)
+let main_debctrl (lexfun : Lexing.lexbuf -> token) (lexbuf : Lexing.lexbuf) =
+   (Parsing.yyparse yytables 2 lexfun lexbuf : (string,string) Hashtbl.t list)

Modified: trunk/projects/ocaml-deblib/deblib_822Parser.mli
===================================================================
--- trunk/projects/ocaml-deblib/deblib_822Parser.mli	2005-12-28 13:57:46 UTC (rev 2340)
+++ trunk/projects/ocaml-deblib/deblib_822Parser.mli	2005-12-28 13:58:10 UTC (rev 2341)
@@ -4,5 +4,7 @@
   | EOL
   | EOF
 
-val main :
+val main_822 :
   (Lexing.lexbuf  -> token) -> Lexing.lexbuf -> (string,string) Hashtbl.t list
+val main_debctrl :
+  (Lexing.lexbuf  -> token) -> Lexing.lexbuf -> (string,string) Hashtbl.t list

Modified: trunk/projects/ocaml-deblib/deblib_822Parser.mly
===================================================================
--- trunk/projects/ocaml-deblib/deblib_822Parser.mly	2005-12-28 13:57:46 UTC (rev 2340)
+++ trunk/projects/ocaml-deblib/deblib_822Parser.mly	2005-12-28 13:58:10 UTC (rev 2341)
@@ -10,20 +10,36 @@
 %token EOL
 %token EOF
 
-%start main
-%type <(string,string) Hashtbl.t list> main
+%start main_822 main_debctrl
+%type <(string,string) Hashtbl.t list> main_822
+%type <(string,string) Hashtbl.t list> main_debctrl
 
 %%
 
-main:
-  | Stanzas EOF {$1}
+main_822:
+  | Stanzas EOF { $1 }
 
+main_debctrl:
+  | DebCtrlStanzas EOF { $1 }
+
 Stanzas:
-  |                { [] }
-  | Stanza Stanzas { $1 :: $2 }
+  |                     { [] }
+  | Stanza EOL Stanzas  { $1 :: $3 }
 
+  /* support for debian/control files
+   * they may miss the extra EOL after the last stanza and stanzas can be
+   * separated by an arbitrary (non-zero) number of EOLs */
+DebCtrlStanzas:
+  |                             { [] }
+  | Stanza EOLs DebCtrlStanzas  { $1 :: $3 }
+  | Stanza                      { [ $1 ] }
+
+EOLs:
+  | EOL       {}
+  | EOL EOLs  {}
+
 Stanza:
-  | Fields EOL
+  | Fields
       { let old = !tbl in
 	  tbl := Hashtbl.create 17;
 	  old

Modified: trunk/projects/ocaml-deblib/deblib_Archive.ml
===================================================================
--- trunk/projects/ocaml-deblib/deblib_Archive.ml	2005-12-28 13:57:46 UTC (rev 2340)
+++ trunk/projects/ocaml-deblib/deblib_Archive.ml	2005-12-28 13:58:10 UTC (rev 2341)
@@ -43,7 +43,7 @@
     tbl
 
 let create_with_source_tbl src_tbl pkg_name = 
-  let pkg_l = Deblib_Utils.parse822 pkg_name in
+  let pkg_l = Deblib_Utils.parse_822_file pkg_name in
   let pkg_tbl = bin_tbl_of_stanza_list pkg_l in
     {source_tbl = src_tbl;
      pkg_tbl = pkg_tbl;
@@ -53,7 +53,7 @@
 
 
 let create source_name pkg_name = 
-  let src_l = Deblib_Utils.parse822 source_name in
+  let src_l = Deblib_Utils.parse_822_file source_name in
   let tbl = src_tbl_of_stanza_list src_l in
     create_with_source_tbl tbl pkg_name
 

Modified: trunk/projects/ocaml-deblib/deblib_Types.ml
===================================================================
--- trunk/projects/ocaml-deblib/deblib_Types.ml	2005-12-28 13:57:46 UTC (rev 2340)
+++ trunk/projects/ocaml-deblib/deblib_Types.ml	2005-12-28 13:58:10 UTC (rev 2341)
@@ -2,6 +2,8 @@
 module Strset = Set.Make(String)
 module Strmap = Map.Make(String)
 
+type stanza = (string, string) Hashtbl.t
+
 type priority = 
   | Pri_Required
   | Pri_Important

Modified: trunk/projects/ocaml-deblib/deblib_Utils.ml
===================================================================
--- trunk/projects/ocaml-deblib/deblib_Utils.ml	2005-12-28 13:57:46 UTC (rev 2340)
+++ trunk/projects/ocaml-deblib/deblib_Utils.ml	2005-12-28 13:58:10 UTC (rev 2341)
@@ -16,14 +16,14 @@
     "sparc";
   ]
 
+let parse_822 = Deblib_822Parser.main_822 Deblib_822Lexer.next
+let parse_debctrl = Deblib_822Parser.main_debctrl Deblib_822Lexer.next
 
-let parse822 lexbuf = Deblib_822Parser.main Deblib_822Lexer.next lexbuf
-
-let parse822file file = 
+let parse_file parse_fun file = 
   let ic = open_in file in
   let lexbuf = Lexing.from_channel ic in
   let res =
-    try parse822 lexbuf
+    try parse_fun lexbuf
     with Parsing.Parse_error ->
       close_in ic;
       let msg = sprintf "Parse error while parsing: %s" file in
@@ -32,6 +32,9 @@
   close_in ic;
   res
 
+let parse_822_file = parse_file parse_822
+let parse_debctrl_file = parse_file parse_debctrl
+
 let pkg_re = Str.regexp "[ \t]*\\([a-z0-9+-.]+\\) *\\(\\[.*\\]\\)? *\\((\\(.*\\))\\)? *\\(\\[.*\\]\\)?";;
 let vers_re = Str.regexp " *\\(\\(<[<=]?\\)\\|\\(>[>=]?\\)\\|\\(=\\)\\)? *\\([^ ]*\\) *";;
 

Modified: trunk/projects/ocaml-deblib/deblib_Utils.mli
===================================================================
--- trunk/projects/ocaml-deblib/deblib_Utils.mli	2005-12-28 13:57:46 UTC (rev 2340)
+++ trunk/projects/ocaml-deblib/deblib_Utils.mli	2005-12-28 13:58:10 UTC (rev 2341)
@@ -1,20 +1,20 @@
 
 val release_archs : string list
 
-val parse822file : string -> (string, string) Hashtbl.t list
-val parse822 : Lexing.lexbuf -> (string, string) Hashtbl.t list
+val parse_822 : Lexing.lexbuf -> Deblib_Types.stanza list
+val parse_822_file : string -> Deblib_Types.stanza list
 
-val bin_pkg_of_stanza :
-  (string, string) Hashtbl.t -> Deblib_Types.binary_package
+val parse_debctrl: Lexing.lexbuf -> Deblib_Types.stanza list
+val parse_debctrl_file : string -> Deblib_Types.stanza list
 
-val src_pkg_of_stanza :
-  (string, string) Hashtbl.t -> Deblib_Types.source_package
+val bin_pkg_of_stanza : Deblib_Types.stanza -> Deblib_Types.binary_package
+val src_pkg_of_stanza : Deblib_Types.stanza -> Deblib_Types.source_package
 
 val src_tbl_of_stanza_list :
-  (string, string) Hashtbl.t list ->
-  (string, Deblib_Types.source_package) Hashtbl.t
+  Deblib_Types.stanza list ->
+    (string, Deblib_Types.source_package) Hashtbl.t
 
 val bin_tbl_of_stanza_list :
-  (string, string) Hashtbl.t list ->
-  (string, Deblib_Types.binary_package) Hashtbl.t
+  Deblib_Types.stanza list ->
+    (string, Deblib_Types.binary_package) Hashtbl.t
 

Modified: trunk/projects/ocaml-deblib/test.ml
===================================================================
--- trunk/projects/ocaml-deblib/test.ml	2005-12-28 13:57:46 UTC (rev 2340)
+++ trunk/projects/ocaml-deblib/test.ml	2005-12-28 13:58:10 UTC (rev 2341)
@@ -8,7 +8,7 @@
   let ic = open_in "Sources" in
   let lexbuf = Lexing.from_channel ic in
   let lst = 
-    try Deblib_822Parser.main Deblib_822Lexer.next lexbuf
+    try Deblib_822Parser.main_822 Deblib_822Lexer.next lexbuf
     with Parsing.Parse_error ->
       let msg = sprintf "Parse error while parsing: Sources" in
 	raise (Failure msg)




More information about the Pkg-ocaml-maint-commits mailing list