Attachment #187524 for bug #265241

View | Details | Raw Unified | Return to bug 265241
Collapse All | Expand All




# since 3.09.3 we don't need any source tree
camlp4o_pr_emacs: \
		tags.cmxa pr_emacs_tags.cmxa 
	${CAMLOPT} -linkall -o $@ -I ${CAMLP4DIR} odyl.cmxa camlp5.cmxa \
		pa_o_fast.cmx $+ \
		odyl.cmx

camlp4o_pr_vi: \
		tags.cmxa pr_vi_tags.cmxa 
	${CAMLOPT} -linkall -o $@ -I ${CAMLP4DIR} odyl.cmxa camlp5.cmxa \
		pa_o_fast.cmx $+ \
		odyl.cmx

camlp4o_pr_emacs_ext: tags.cmxa pr_emacs_tags.cmxa 
	${CAMLOPT} -linkall -o $@ -I ${CAMLP4DIR} odyl.cmxa camlp5.cmxa \
		pa_o.cmx pa_op.cmx $+ \
		odyl.cmx

camlp4o_pr_vi_ext: tags.cmxa pr_vi_tags.cmxa 
	${CAMLOPT} -linkall -o $@ -I ${CAMLP4DIR} odyl.cmxa camlp5.cmxa \
		pa_o.cmx pa_op.cmx $+ \
		odyl.cmx


Lines 1-3 Link Here

(-)otags-3.09.3.3/Makefile.here.tpl (-1 / +3 lines)
		1
		2
1	# This is a --Makefile--	3	# This is a --Makefile--
2	# $Id: Makefile.here.tpl,v 1.13 2007-04-06 20:58:17 tews Exp $	4	# $Id: Makefile.here.tpl,v 1.13 2007-04-06 20:58:17 tews Exp $
3	ROOT=/usr/local	5	ROOT=/usr/local
Lines 16-22 Link Here
16	CAMLOPT=tplocamlopt	18	CAMLOPT=tplocamlopt
17	CAMLAR=tplocamlc -a	19	CAMLAR=tplocamlc -a
18	CAMLP4O=tplcamlp4o	20	CAMLP4O=tplcamlp4o
19	CAMLP4DIR=${shell ${CAMLP4O} -where}	21	CAMLP4DIR=${shell ${CAMLP4O} -where}/../camlp5
20	CAMLDEP=ocamldep	22	CAMLDEP=ocamldep
21		23
22	# native compilation available? Set to ``true'' or ``false'' !	24	# native compilation available? Set to ``true'' or ``false'' !

Lines 11-17 Link Here

(-)otags-3.09.3.3/configure (-2 / +2 lines)
11	root=/usr/local	11	root=/usr/local
12	bindir=$root/bin	12	bindir=$root/bin
13	bindir_spec=no	13	bindir_spec=no
14	libdir=$root/lib/ocaml/camlp4	14	libdir=$root/lib/ocaml/camlp5
15	#libdir=`camlp4 -where`	15	#libdir=`camlp4 -where`
16	libdir_spec=no	16	libdir_spec=no
17	#splaydir=$root/lib/ocaml	17	#splaydir=$root/lib/ocaml
Lines 77-83 Link Here
77		77
78	# check ocamlc version	78	# check ocamlc version
79	if [ $versioncheck = 1 ] ; then	79	if [ $versioncheck = 1 ] ; then
80	if [ "$ocv" \< "3.09" -o "$ocv" \> "3.09.99" ] ; then	80	if [ "$ocv" \< "3.09" ] ; then
81	echo ocaml version $ocv found. Need 3.09.x.	81	echo ocaml version $ocv found. Need 3.09.x.
82	exit 1	82	exit 1
83	fi	83	fi

Lines 2-8 Link Here

(-)otags-3.09.3.3/editor.ml (-1 / +1 lines)
2	(* Cuihtlauac Alvarado, France Telecon, Recherche & Developement *)	2	(* Cuihtlauac Alvarado, France Telecon, Recherche & Developement *)
3	(* Jean-François Monin, Université Joseph Fourier - VERIMAG *)	3	(* Jean-François Monin, Université Joseph Fourier - VERIMAG *)
4		4
5	(* ocamlc options: !-I `camlp4o -where`!*)	5	(* ocamlc options: !-I `camlp5 -where`!*)
6		6
7	(* $Id: editor.ml,v 1.4 2007-04-06 20:58:17 tews Exp $ *)	7	(* $Id: editor.ml,v 1.4 2007-04-06 20:58:17 tews Exp $ *)
8		8

Lines 23-29 Link Here

(-)otags-3.09.3.3/mk_conf (-1 / +1 lines)
23	echo "let editor = ref Emacs"	23	echo "let editor = ref Emacs"
24	echo "let output = ref (Some \"TAGS\")"	24	echo "let output = ref (Some \"TAGS\")"
25	echo "let camlp4 = ref (None : string option)"	25	echo "let camlp4 = ref (None : string option)"
26	echo "let camlp4_default = \"camlp4o\""	26	echo "let camlp4_default = \"camlp5o\""
27	echo "let quotations = ref false"	27	echo "let quotations = ref false"
28	echo "let mli_tags = ref true"	28	echo "let mli_tags = ref true"
29		29





(* $Id: pr.ml,v 1.17 2007-04-06 20:58:17 tews Exp $ *)

(* ocamlc options: !-pp "camlp5o q_MLast.cmo" -I `camlp5 -where`!*)
(* ocamldep options: !-pp "camlp5o q_MLast.cmo"!*)


module type Tags_param = sig
  val add : string -> int * int -> unit

*)

  (* TODO: remove this crap *)
  (*let kludge (a, b) = a.Lexing.pos_cnum, b.Lexing.pos_cnum*)
  let kludge loc = (Stdpp.first_pos loc), (Stdpp.last_pos loc)

  let rec pe_patt ast = 
    let loc = kludge (MLast.loc_of_patt ast) in

  | <:str_item< module type $i$ = $mt$ >> 
	-> T.add i loc; pe_module_type_expr mt
  | <:str_item< type $list:ssltl$ >>  ->
    (*List.iter (fun ((loc,s),_,c,_) -> T.add s (kludge loc); pe_ctyp c) ssltl*)
    List.iter (fun td -> 
		 let loc,s = td.MLast.tdNam in
		   T.add s (kludge loc); 
		   pe_ctyp td.MLast.tdDef
	      ) ssltl

  | <:str_item< value $opt:rf$ $list:pel$ >> -> List.iter (fun (p,  _) -> pe_patt p) pel
  | <:str_item< class $list:cd$ >> ->
      List.iter (etag_class_info) cd

	-> T.add i loc; pe_module_type_expr mt
  | <:sig_item< open $sl$ >> -> ()
  | <:sig_item< type $list:ssltl$ >>  ->
    (*List.iter (fun ((loc,s),_,c,_) -> T.add s (kludge loc); pe_ctyp c) ssltl*)
    List.iter
      (fun td -> 
	 let loc,s = td.MLast.tdNam in
	   T.add s (kludge loc); 
	   pe_ctyp td.MLast.tdDef
      ) ssltl
  | <:sig_item< value $s$ : $t$ >> -> T.add s loc 
  | <:sig_item< class $list:cd$ >> -> List.iter (etag_class_type_info) cd
  | <:sig_item< class type $list:cd$ >> -> List.iter etag_class_type_info cd

Lines 4-11 Link Here

(-)otags-3.09.3.3/splay.ml (-2 / +2 lines)
4		4
5	(* $Id: splay.ml,v 1.3 2007-03-15 22:40:43 tews Exp $ *)	5	(* $Id: splay.ml,v 1.3 2007-03-15 22:40:43 tews Exp $ *)
6		6
7	(* ocamlc options: !-pp camlp4o!*)	7	(* ocamlc options: !-pp camlp5o!*)
8	(* ocamldep options: !-pp camlp4o!*)	8	(* ocamldep options: !-pp camlp5o!*)
9		9
10	(* dcell mutable, parcours fermeture éclair *)	10	(* dcell mutable, parcours fermeture éclair *)
11		11

Return to bug 265241

Lines 70-92 Link Here

(-)otags-3.09.3.3/Makefile (-4 / +4 lines)
70	# since 3.09.3 we don't need any source tree	70	# since 3.09.3 we don't need any source tree
71	camlp4o_pr_emacs: \	71	camlp4o_pr_emacs: \
72	tags.cmxa pr_emacs_tags.cmxa	72	tags.cmxa pr_emacs_tags.cmxa
73	${CAMLOPT} -linkall -o $@ -I ${CAMLP4DIR} odyl.cmxa camlp4.cmxa \	73	${CAMLOPT} -linkall -o $@ -I ${CAMLP4DIR} odyl.cmxa camlp5.cmxa \
74	pa_o_fast.cmx $+ \	74	pa_o_fast.cmx $+ \
75	odyl.cmx	75	odyl.cmx
76		76
77	camlp4o_pr_vi: \	77	camlp4o_pr_vi: \
78	tags.cmxa pr_vi_tags.cmxa	78	tags.cmxa pr_vi_tags.cmxa
79	${CAMLOPT} -linkall -o $@ -I ${CAMLP4DIR} odyl.cmxa camlp4.cmxa \	79	${CAMLOPT} -linkall -o $@ -I ${CAMLP4DIR} odyl.cmxa camlp5.cmxa \
80	pa_o_fast.cmx $+ \	80	pa_o_fast.cmx $+ \
81	odyl.cmx	81	odyl.cmx
82		82
83	camlp4o_pr_emacs_ext: tags.cmxa pr_emacs_tags.cmxa	83	camlp4o_pr_emacs_ext: tags.cmxa pr_emacs_tags.cmxa
84	${CAMLOPT} -linkall -o $@ -I ${CAMLP4DIR} odyl.cmxa camlp4.cmxa \	84	${CAMLOPT} -linkall -o $@ -I ${CAMLP4DIR} odyl.cmxa camlp5.cmxa \
85	pa_o.cmx pa_op.cmx $+ \	85	pa_o.cmx pa_op.cmx $+ \
86	odyl.cmx	86	odyl.cmx
87		87
88	camlp4o_pr_vi_ext: tags.cmxa pr_vi_tags.cmxa	88	camlp4o_pr_vi_ext: tags.cmxa pr_vi_tags.cmxa
89	${CAMLOPT} -linkall -o $@ -I ${CAMLP4DIR} odyl.cmxa camlp4.cmxa \	89	${CAMLOPT} -linkall -o $@ -I ${CAMLP4DIR} odyl.cmxa camlp5.cmxa \
90	pa_o.cmx pa_op.cmx $+ \	90	pa_o.cmx pa_op.cmx $+ \
91	odyl.cmx	91	odyl.cmx
92		92

Lines 4-11 Link Here

(-)otags-3.09.3.3/pr.ml (-5 / +19 lines)
4		4
5	(* $Id: pr.ml,v 1.17 2007-04-06 20:58:17 tews Exp $ *)	5	(* $Id: pr.ml,v 1.17 2007-04-06 20:58:17 tews Exp $ *)
6		6
7	(* ocamlc options: !-pp "camlp4o q_MLast.cmo" -I `camlp4o -where`!*)	7	(* ocamlc options: !-pp "camlp5o q_MLast.cmo" -I `camlp5 -where`!*)
8	(* ocamldep options: !-pp "camlp4o q_MLast.cmo"!*)	8	(* ocamldep options: !-pp "camlp5o q_MLast.cmo"!*)
		9
9		10
10	module type Tags_param = sig	11	module type Tags_param = sig
11	val add : string -> int * int -> unit	12	val add : string -> int * int -> unit
Lines 20-26 Link Here
20	*)	21	*)
21		22
22	(* TODO: remove this crap *)	23	(* TODO: remove this crap *)
23	let kludge (a, b) = a.Lexing.pos_cnum, b.Lexing.pos_cnum	24	(let kludge (a, b) = a.Lexing.pos_cnum, b.Lexing.pos_cnum)
		25	let kludge loc = (Stdpp.first_pos loc), (Stdpp.last_pos loc)
24		26
25	let rec pe_patt ast =	27	let rec pe_patt ast =
26	let loc = kludge (MLast.loc_of_patt ast) in	28	let loc = kludge (MLast.loc_of_patt ast) in
Lines 125-131 Link Here
125	\| <:str_item< module type $i$ = $mt$ >>	127	\| <:str_item< module type $i$ = $mt$ >>
126	-> T.add i loc; pe_module_type_expr mt	128	-> T.add i loc; pe_module_type_expr mt
127	\| <:str_item< type $list:ssltl$ >> ->	129	\| <:str_item< type $list:ssltl$ >> ->
128	List.iter (fun ((loc,s),_,c,_) -> T.add s (kludge loc); pe_ctyp c) ssltl	130	(List.iter (fun ((loc,s),_,c,_) -> T.add s (kludge loc); pe_ctyp c) ssltl)
		131	List.iter (fun td ->
		132	let loc,s = td.MLast.tdNam in
		133	T.add s (kludge loc);
		134	pe_ctyp td.MLast.tdDef
		135	) ssltl
		136
129	\| <:str_item< value $opt:rf$ $list:pel$ >> -> List.iter (fun (p, _) -> pe_patt p) pel	137	\| <:str_item< value $opt:rf$ $list:pel$ >> -> List.iter (fun (p, _) -> pe_patt p) pel
130	\| <:str_item< class $list:cd$ >> ->	138	\| <:str_item< class $list:cd$ >> ->
131	List.iter (etag_class_info) cd	139	List.iter (etag_class_info) cd
Lines 179-185 Link Here
179	-> T.add i loc; pe_module_type_expr mt	187	-> T.add i loc; pe_module_type_expr mt
180	\| <:sig_item< open $sl$ >> -> ()	188	\| <:sig_item< open $sl$ >> -> ()
181	\| <:sig_item< type $list:ssltl$ >> ->	189	\| <:sig_item< type $list:ssltl$ >> ->
182	List.iter (fun ((loc,s),_,c,_) -> T.add s (kludge loc); pe_ctyp c) ssltl	190	(List.iter (fun ((loc,s),_,c,_) -> T.add s (kludge loc); pe_ctyp c) ssltl)
		191	List.iter
		192	(fun td ->
		193	let loc,s = td.MLast.tdNam in
		194	T.add s (kludge loc);
		195	pe_ctyp td.MLast.tdDef
		196	) ssltl
183	\| <:sig_item< value $s$ : $t$ >> -> T.add s loc	197	\| <:sig_item< value $s$ : $t$ >> -> T.add s loc
184	\| <:sig_item< class $list:cd$ >> -> List.iter (etag_class_type_info) cd	198	\| <:sig_item< class $list:cd$ >> -> List.iter (etag_class_type_info) cd
185	\| <:sig_item< class type $list:cd$ >> -> List.iter etag_class_type_info cd	199	\| <:sig_item< class type $list:cd$ >> -> List.iter etag_class_type_info cd