-

Makefile

@@ -1,4 +1,4 @@
-# $Id: Makefile,v 5.3 2007-09-12 00:54:46 ddr Exp $
+# $Id: Makefile,v 5.4 2007-09-12 09:42:26 ddr Exp $
 
 PREFIX=/usr
 LANGDIR=$(PREFIX)/share/geneweb
@@ -12,7 +12,6 @@ include tools/Makefile.inc
 all:: opt
 
 out::
-	cd src; $(MAKE) ppdef
 	cd wserver; $(MAKE) all
 	cd dag2html; $(MAKE) out
 	cd src; $(MAKE) PREFIX=$(PREFIX) all
@@ -23,7 +22,6 @@ out::
 	cd gwtp; $(MAKE) all
 
 opt::
-	cd src; $(MAKE) ppdef
 	cd wserver; $(MAKE) opt
 	cd dag2html; $(MAKE) opt
 	cd src; $(MAKE) PREFIX=$(PREFIX) opt
@@ -180,7 +178,7 @@ clean_mismatch:
 	rm src/pa_lock.cmo src/pa_html.cmo src/def.syn.cmo
 
 depend:
-	cd src; $(MAKE) ppdef pr_dep.cmo def.syn.cmo gwlib.ml
+	cd src; $(MAKE) pr_dep.cmo def.syn.cmo gwlib.ml
 	cd src; $(MAKE) pa_lock.cmo pa_html.cmo q_codes.cmo
 	cd wserver; $(MAKE) depend
 	cd src; $(MAKE) depend

README

@@ -3,7 +3,7 @@ OVERVIEW:
 GeneWeb is a genealogy software with a Web interface. It can be used
 off-line or as a Web service.
 
-This is the version 5.01-exp
+This is the version 5.01
 
 To compile, you need the Objective Caml compiler which can be found at:
    http://caml.inria.fr/ocaml/

etc/LISEZMOI.txt

@@ -1,4 +1,4 @@
-GeneWeb 5.00
+GeneWeb 5.01
 
 Pour demarrer avec GeneWeb, suivez les instructions suivantes:
 

etc/README.txt

@@ -1,4 +1,4 @@
-GeneWeb 5.00
+GeneWeb 5.01
 
 If you are under Windows:
    Double-click on the file "index.htm" of the directory "doc",

ged2gwb/ged2gwb.ml

@@ -1,5 +1,5 @@
 (* camlp4r pa_extend.cmo ../src/pa_lock.cmo *)
-(* $Id: ged2gwb.ml,v 5.51 2007-02-14 10:14:36 ddr Exp $ *)
+(* $Id: ged2gwb.ml,v 5.52 2007-09-12 09:42:26 ddr Exp $ *)
 (* Copyright (c) 1998-2007 INRIA *)
 
 open Dbdisk;
@@ -600,9 +600,7 @@ value using_token (p_con, p_prm) =
 ;
 
 value date_lexer =
-  {Token.tok_func s =
-     (make_date_lexing s,
-      fun _ -> IFDEF OCAML_308 THEN Token.dummy_loc ELSE (0, 0) END);
+  {Token.tok_func s = (make_date_lexing s, fun _ -> Token.dummy_loc);
    Token.tok_using = using_token; Token.tok_removing _ = ();
    Token.tok_match = tparse; Token.tok_text _ = "<tok>";
    Token.tok_comm = None}

rpm/Makefile

@@ -1,6 +1,6 @@
-# $Id: Makefile,v 5.1 2007-02-26 10:18:04 ddr Exp $
+# $Id: Makefile,v 5.2 2007-09-12 09:42:26 ddr Exp $
 
-VERSION=5.00
+VERSION=5.01
 RELEASE=1
 DESTDIR=/usr/src/RPM
 

setup/setup.ml

@@ -1,5 +1,5 @@
 (* camlp4r *)
-(* $Id: setup.ml,v 5.6 2007-02-25 02:32:19 ddr Exp $ *)
+(* $Id: setup.ml,v 5.7 2007-09-12 09:42:26 ddr Exp $ *)
 
 open Printf;
 
@@ -1871,12 +1871,12 @@ value intro () =
 value main () =
   do {
     IFDEF UNIX THEN intro ()
-    ELSIFDEF SYS_COMMAND THEN
+    ELSE IFDEF SYS_COMMAND THEN
       let len = Array.length Sys.argv in
       if len > 2 && Sys.argv.(len - 2) = "-wserver" then () else intro ()
     ELSE
       try let _ = Sys.getenv "WSERVER" in () with [ Not_found -> intro () ]
-    END;
+    END END;
     Wserver.f None port.val 0 None wrap_setup
   }
 ;

src/.depend

@@ -203,11 +203,11 @@ mergeIndOk.cmx: adef.cmx config.cmi consang.cmx def.cmi futil.cmx gutil.cmx \
     gwdb.cmx history.cmx hutil.cmx merge.cmx mergeInd.cmx mutil.cmx \
     update.cmx updateInd.cmx updateIndOk.cmx util.cmx ../wserver/wserver.cmx 
 mk_consang.cmo: adef.cmi argl.cmo consang.cmi consangAll.cmi db2.cmi \
-    db2disk.cmi db2out.cmi dbdisk.cmi def.cmi futil.cmi gwdb.cmi iovalue.cmi \
-    lock.cmi mutil.cmi name.cmi outbase.cmi secure.cmi 
+    db2disk.cmi db2out.cmi def.cmi futil.cmi gwdb.cmi iovalue.cmi lock.cmi \
+    mutil.cmi name.cmi outbase.cmi secure.cmi 
 mk_consang.cmx: adef.cmx argl.cmx consang.cmx consangAll.cmx db2.cmx \
-    db2disk.cmx db2out.cmx dbdisk.cmi def.cmi futil.cmx gwdb.cmx iovalue.cmx \
-    lock.cmx mutil.cmx name.cmx outbase.cmx secure.cmx 
+    db2disk.cmx db2out.cmx def.cmi futil.cmx gwdb.cmx iovalue.cmx lock.cmx \
+    mutil.cmx name.cmx outbase.cmx secure.cmx 
 mostdesc.cmo: adef.cmi argl.cmo consang.cmi def.cmi gwdb.cmi name.cmi \
     num.cmi pqueue.cmi secure.cmi 
 mostdesc.cmx: adef.cmx argl.cmx consang.cmx def.cmi gwdb.cmx name.cmx \

src/Makefile

@@ -1,4 +1,4 @@
-# $Id: Makefile,v 5.44 2007-08-13 08:00:31 ddr Exp $
+# $Id: Makefile,v 5.45 2007-09-12 09:42:26 ddr Exp $
 
 include ../tools/Makefile.inc
 
@@ -145,19 +145,16 @@ i18n: pr_transl.cmo always
 	( \
 	  for i in $$OBJS; do \
 	    echo $$i 1>&2; \
-	    camlp4r ./ppdef.cmo ./pa_lock.cmo ./pa_html.cmo ./pr_transl.cmo pa_extend.cmo $$i; \
+	    camlp5r pa_macro.cmo ./pa_lock.cmo ./pa_html.cmo ./pr_transl.cmo pa_extend.cmo $$i; \
 	  done; \
 	  cat ../hd/etc/*.txt ../hd/lang/start_utf8.txt ../hd/lang/advanced.txt | sed -e 's/%\[//g' -e 's/%]//g' -e 's/\]/\]\n/g' | grep "\[" | sed -e "s/^.*\[\*\?//" -e "s/::.*$$//" -e "s/].*$$//" \
 	) | \
 	sort | uniq | grep -v '^$$' > i18n
 
-ppdef:
-	$(MAKE) ppdef.cmo CAMLP4F="-loc loc" PPDEF=pa_macro.cmo
-
 always:
 
 depend:
-	$(MAKE) ppdef pr_dep.cmo def.syn.cmo gwlib.ml
+	$(MAKE) pr_dep.cmo def.syn.cmo gwlib.ml
 	$(MAKE) pa_lock.cmo pa_html.cmo q_codes.cmo
 	export LC_ALL=C; TOP=.. ../tools/camlp4_depend.sh $(OCAMLI) $$(ls *.mli *.ml) > .depend.new
 	mv .depend.new .depend

src/i18n

@@ -347,6 +347,7 @@ update
 use "link" instead of "create"
 user/password/cancel
 validate/delete
+version
 view source
 visualize/show/hide/summary
 warnings

src/pr_dep.ml

@@ -1,5 +1,5 @@
 (* camlp4r *)
-(* $Id: pr_dep.ml,v 5.5 2007-07-11 16:15:21 ddr Exp $ *)
+(* $Id: pr_dep.ml,v 5.6 2007-09-12 09:42:26 ddr Exp $ *)
 
 #load "q_MLast.cmo";
 
@@ -50,21 +50,28 @@ value rec ctyp =
   | TyMan _ t1 t2 -> do { ctyp t1; ctyp t2; }
   | TyOlb _ _ t -> ctyp t
   | TyQuo _ _ -> ()
-  | TyTup _ tl -> list ctyp tl
+  | <:ctyp< ($list:tl$) >> -> list ctyp tl
   | TyVrn _ sbtll _ -> list variant sbtll
   | x ->
       IFDEF OCAML_309 THEN
         match x with
         [ TyRec _ ldl -> list label_decl ldl
-        | TySum _ cdl -> list constr_decl cdl
+        | <:ctyp< [ $list:cdl$ ] >> -> list constr_decl cdl
         | x -> not_impl "ctyp" x ]
       ELSE
         match x with
-        [ TyRec _ _ ldl -> list label_decl ldl
-        | TySum _ _ cdl -> list constr_decl cdl
+        [ <:ctyp< { $list:ldl$ } >> -> list label_decl ldl
+        | <:ctyp< [ $list:cdl$ ] >> -> list constr_decl cdl
         | x -> not_impl "ctyp" x ]
       END ]
-and constr_decl (_, _, tl) = list ctyp tl
+and constr_decl (_, _, tl) =
+  IFDEF CAMLP5_4_09 AND STRICT THEN
+    match tl with
+    [ <:vala< tl >> -> list ctyp tl
+    | _ -> failwith "constr_decl" ]
+  ELSE
+    list ctyp tl
+  END
 and label_decl (_, _, _, t) = ctyp t
 and variant =
   fun
@@ -74,7 +81,7 @@ and ctyp_module =
   fun
   [ TyAcc _ t _ -> ctyp_module t
   | TyApp _ t1 t2 -> do { ctyp t1; ctyp t2; }
-  | TyUid _ m -> addmodule m
+  | <:ctyp< $uid:m$ >> -> addmodule m
   | x -> not_impl "ctyp_module" x ]
 ;
 
@@ -92,17 +99,17 @@ value rec patt =
   | PaOlb _ _ peoo ->
       option (fun (p, eo) -> do { patt p; option expr eo }) peoo
   | PaOrp _ p1 p2 -> do { patt p1; patt p2; }
-  | PaRec _ lpl -> list label_patt lpl
+  | <:patt< { $list:lpl$ } >> -> list label_patt lpl
   | PaRng _ p1 p2 -> do { patt p1; patt p2; }
   | PaStr _ _ -> ()
-  | PaTup _ pl -> list patt pl
+  | <:patt< ($list:pl$) >> -> list patt pl
   | PaTyc _ p t -> do { patt p; ctyp t; }
   | PaUid _ _ -> ()
   | PaVrn _ _ -> ()
   | x -> not_impl "patt" x ]
 and patt_module =
   fun
-  [ PaUid _ m -> addmodule m
+  [ <:patt< $uid:m$ >> -> addmodule m
   | PaAcc _ p _ -> patt_module p
   | x -> not_impl "patt_module" x ]
 and label_patt (p1, p2) = do { patt p1; patt p2; }
@@ -117,34 +124,45 @@ and expr =
   | ExAss _ e1 e2 -> do { expr e1; expr e2; }
   | ExChr _ _ -> ()
   | ExCoe _ e t1 t2 -> do { expr e; option ctyp t1; ctyp t2 }
-  | ExFor _ _ e1 e2 _ el -> do { expr e1; expr e2; list expr el; }
+  | <:expr< for $_$ = $e1$ $to:_$ $e2$ do { $list:el$ } >> -> do {
+      expr e1;
+      expr e2;
+      list expr el;
+    }
   | ExFun _ pwel -> list match_case pwel
   | ExIfe _ e1 e2 e3 -> do { expr e1; expr e2; expr e3; }
   | <:expr< $int:_$ >> -> ()
   | ExFlo _ _ -> ()
   | ExLab _ _ eo -> option expr eo
   | ExLaz _ e -> expr e
-  | ExLet _ _ pel e -> do { list let_binding pel; expr e; }
+  | <:expr< let $flag:_$ $list:pel$ in $e$ >> -> do {
+      list let_binding pel;
+      expr e;
+    }
   | ExLid _ _ -> ()
   | ExLmd _ _ me e -> do { module_expr me; expr e; }
   | ExMat _ e pwel -> do { expr e; list match_case pwel; }
   | ExNew _ li -> longident li
   | ExOlb _ _ eo -> option expr eo
-  | ExRec _ lel w -> do { list label_expr lel; option expr w; }
-  | ExSeq _ el -> list expr el
+  | <:expr< { $list:lel$ } >> -> list label_expr lel
+  | <:expr< { ($w$) with $list:lel$ } >> -> do {
+      list label_expr lel;
+      expr w;
+    }
+  | <:expr< do { $list:el$ } >> -> list expr el
   | ExSnd _ e _ -> expr e
   | ExSte _ e1 e2 -> do { expr e1; expr e2; }
   | ExStr _ _ -> ()
   | ExTry _ e pwel -> do { expr e; list match_case pwel; }
-  | ExTup _ el -> list expr el
+  | <:expr< ($list:el$) >> -> list expr el
   | ExTyc _ e t -> do { expr e; ctyp t; }
   | ExUid _ _ -> ()
   | ExVrn _ _ -> ()
-  | ExWhi _ e el -> do { expr e; list expr el; }
+  | <:expr< while $e$ do { $list:el$ } >> -> do { expr e; list expr el; }
   | x -> not_impl "expr" x ]
 and expr_module =
   fun
-  [ ExUid _ m -> addmodule m
+  [ <:expr< $uid:m$ >> -> addmodule m
   | e -> expr e ]
 and let_binding (p, e) = do { patt p; expr e }
 and label_expr (p, e) = do { patt p; expr e }
@@ -163,8 +181,8 @@ and with_constr =
   | x -> not_impl "with_constr" x ]
 and sig_item =
   fun
-  [ SgDcl _ sil -> list sig_item sil
-  | SgExc _ _ tl -> list ctyp tl
+  [ <:sig_item< declare $list:sil$ end >> -> list sig_item sil
+  | <:sig_item< exception $_$ of $list:tl$ >> -> list ctyp tl
   | SgExt _ _ t _ -> ctyp t
   | SgMod _ _ x ->
       IFDEF CAMLP5 THEN
@@ -179,19 +197,19 @@ and sig_item =
   | x -> not_impl "sig_item" x ]
 and module_expr =
   fun
-  [ MeAcc _ (MeUid _ m) _ -> addmodule m
+  [ <:module_expr< $uid:m$ . $_$ >> -> addmodule m
   | MeApp _ me1 me2 -> do { module_expr me1; module_expr me2; }
   | MeFun _ _ mt me -> do { module_type mt; module_expr me; }
-  | MeStr _ sil -> list str_item sil
+  | <:module_expr< struct $list:sil$ end >> -> list str_item sil
   | MeTyc _ me mt -> do { module_expr me; module_type mt; }
   | MeUid _ _ -> ()
   | x -> not_impl "module_expr" x ]
 and str_item =
   fun
   [ StCls _ cil -> list (fun ci -> class_expr ci.ciExp) cil
-  | StDcl _ sil -> list str_item sil
+  | <:str_item< declare $list:sil$ end >> -> list str_item sil
   | StDir _ _ _ -> ()
-  | StExc _ _ tl _ -> list ctyp tl
+  | <:str_item< exception $_$ of $list:tl$ = $_$ >> -> list ctyp tl
   | StExp _ e -> expr e
   | StExt _ _ t _ -> ctyp t
   | StMod _ _ x ->

src/pr_transl.ml

@@ -1,5 +1,5 @@
 (* camlp4r q_MLast.cmo *)
-(* $Id: pr_transl.ml,v 5.3 2007-01-19 01:53:16 ddr Exp $ *)
+(* $Id: pr_transl.ml,v 5.4 2007-09-12 09:42:26 ddr Exp $ *)
 (* Copyright (c) 1998-2007 INRIA *)
 
 open MLast;
@@ -18,10 +18,8 @@ value trace =
    "ftransl"; "ftransl_nth"]
 ;
 
-value loc = IFDEF OCAML_308 THEN Token.dummy_loc ELSE (0, 0) END;
-value token_eval_string loc s =
-  IFDEF OCAML_308 THEN Token.eval_string loc s ELSE Token.eval_string s END
-;
+value loc = Token.dummy_loc;
+value token_eval_string loc s = Token.eval_string loc s;
 
 value rec expr e =
   match e with

src/q_codes.ml

@@ -1,4 +1,4 @@
-(* $Id: q_codes.ml,v 5.2 2007-01-19 01:53:16 ddr Exp $ *)
+(* $Id: q_codes.ml,v 5.3 2007-09-12 09:42:26 ddr Exp $ *)
 (* Copyright (c) 1998-2007 INRIA *)
 
 value f _ =
@@ -18,10 +18,7 @@ value f _ =
 *)
   | "CODE_DOUBLE_NATIVE" -> "11"
   | x ->
-      Stdpp.raise_with_loc
-        (IFDEF OCAML_308 THEN (Token.make_loc (0, String.length x))
-         ELSE (0, String.length x)
-         END)
+      Stdpp.raise_with_loc (Token.make_loc (0, String.length x))
         (Failure ("bad code " ^ x)) ]
 ;
 

src/version.ml

@@ -1,7 +1,7 @@
-(* $Id: version.ml,v 5.4 2007-02-26 13:34:55 ddr Exp $ *)
+(* $Id: version.ml,v 5.5 2007-09-12 09:42:26 ddr Exp $ *)
 (* Copyright (c) 1998-2007 INRIA *)
 
-value txt = "5.01-exp";
+value txt = "5.01";
 
 value available_languages =
   ["af"; "bg"; "br"; "ca"; "cs"; "da"; "de"; "en"; "es"; "eo"; "et"; "fi";

tools/Makefile.inc.unix

@@ -1,9 +1,8 @@
-# $Id: Makefile.inc.unix,v 1.4 2007-08-13 08:00:31 ddr Exp $
+# $Id: Makefile.inc.unix,v 1.5 2007-09-12 09:42:26 ddr Exp $
 
 TOP=..
-CAMLP4_COMM=TOP=$(TOP) $(TOP)/tools/camlp4_comm.sh $(PPDEF)
+CAMLP4_COMM=TOP=$(TOP) $(TOP)/tools/camlp4_comm.sh
 CAMLP4F=-DUNIX
-PPDEF=$(TOP)/src/ppdef.cmo
 CAMLP4D=+camlp5
 LIBUNIX=-cclib -lunix
 OCAMLC=ocamlc.opt -warn-error A

tools/Makefile.inc.win

@@ -1,9 +1,8 @@
-# $Id: Makefile.inc.win,v 5.5 2007-08-13 08:00:31 ddr Exp $
+# $Id: Makefile.inc.win,v 5.6 2007-09-12 09:42:26 ddr Exp $
 
 TOP=..
-CAMLP4_COMM=TOP=$(TOP) $(TOP)/tools/camlp4_comm.sh $(PPDEF)
+CAMLP4_COMM=TOP=$(TOP) $(TOP)/tools/camlp4_comm.sh
 CAMLP4F=-DWIN95
-PPDEF=$(TOP)/src/ppdef.cmo
 CAMLP4D=+camlp5
 LIBUNIX=-cclib -lunix
 OCAMLC=ocamlc.opt -warn-error A

tools/camlp4_comm.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
-# $Id: camlp4_comm.sh,v 5.3 2007-07-11 16:15:21 ddr Exp $
+# $Id: camlp4_comm.sh,v 5.4 2007-09-12 09:42:26 ddr Exp $
 
-ARGS1=
+ARGS1=pa_macro.cmo
 FILE=
 while test "" != "$1"; do
 	case $1 in