debian/0000755000000000000000000000000012256061124007165 5ustar debian/changelog0000644000000000000000000000651712256061124011050 0ustar ulex0.8 (0.8-10build3) trusty; urgency=medium * Rebuild for ocaml-4.01. -- Matthias Klose Mon, 23 Dec 2013 16:18:28 +0000 ulex0.8 (0.8-10build2) saucy; urgency=low * Rebuild for new OCaml ABIs. -- Colin Watson Thu, 09 May 2013 15:00:13 +0100 ulex0.8 (0.8-10build1) quantal; urgency=low * No change rebuild for new camlp5 ABI -- Adam Conrad Thu, 14 Jun 2012 21:55:15 -0600 ulex0.8 (0.8-10) unstable; urgency=low [ Stéphane Glondu ] * Team upload * Remove quilt from Build-Depends and debian/rules * Add compatibility patch with camlp5 strict [ Stefano Zacchiroli ] * set package section to "ocaml" (override is right) * remove myself from Uploaders -- Stéphane Glondu Sun, 04 Mar 2012 18:54:15 +0100 ulex0.8 (0.8-9) unstable; urgency=low [ Stéphane Glondu ] * Use dh-ocaml for dependency generation (Closes: #577311) [ Enrico Tassi ] * use quilt instead of dpatch * use source format 3.0 (quilt) -- Enrico Tassi Mon, 12 Apr 2010 18:05:02 +0200 ulex0.8 (0.8-8) unstable; urgency=low * upload to unstable * debian/rules: use ocaml.mk as a CDBS "rules" snippet * debian/*.in: use more abstract substitution variables to point to stdlib directories -- Stefano Zacchiroli Thu, 05 Mar 2009 20:07:45 +0100 ulex0.8 (0.8-7) experimental; urgency=low [ Stefano Zacchiroli] * Rebuild against OCaml 3.11: stricten build-deps, add build-dep on dh-ocaml * debian/control: bump standards version (no change needed) * bump debhelper level to 7 (debian/control and debian/compat updated) [ Stephane Glondu ] * Switching packaging to git -- Stefano Zacchiroli Tue, 10 Feb 2009 11:36:41 +0100 ulex0.8 (0.8-6) unstable; urgency=low * rebuild against ocaml 3.10.1 -- Enrico Tassi Sat, 09 Feb 2008 20:56:19 +0100 ulex0.8 (0.8-5) unstable; urgency=low * update standards-version, no changes needed * rebuild against camlp5 5.06 * moving myself to uploaders, setting d-o-m as the maintainer * add Vcs-Browser field to debian/control * add Homepage field to debian/control * fix vcs-svn field to point just above the debian/ dir * debian/patches/: add missing descriptions for patches: install_destdir, meta_version -- Stefano Zacchiroli Mon, 31 Dec 2007 17:05:25 +0100 ulex0.8 (0.8-4) unstable; urgency=low * Rebuilt against camlp5 5.04 * Added Enrico Tassi to the Uploaders control field -- Enrico Tassi Tue, 04 Dec 2007 16:24:21 +0100 ulex0.8 (0.8-3) unstable; urgency=low * rebuild against current camlp5 (otherwise pa_ulex loading would fail) * debian/control - bump camlp5 deps to the current camlp5 version -- Stefano Zacchiroli Mon, 19 Nov 2007 13:25:20 +0100 ulex0.8 (0.8-2) unstable; urgency=low * debian/control - bump ocaml-nox build-dep to >= 3.10.0-8 to ensure the fixed version of the CDBS class is used * debian/rules - enable generation of ocamldoc API reference (delegated to CDBS) -- Stefano Zacchiroli Mon, 03 Sep 2007 15:23:15 +0200 ulex0.8 (0.8-1) experimental; urgency=low * First release (closes: #436982). -- Stefano Zacchiroli Fri, 24 Aug 2007 22:27:08 +0200 debian/rules0000755000000000000000000000065111724403762010256 0ustar #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/makefile.mk include /usr/share/cdbs/1/rules/ocaml.mk PKGNAME = ocaml-ulex08 OCAML_OCAMLDOC_PACKAGES = $(PKGNAME) DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(CURDIR)/debian/$(PKGNAME)$(OCAML_STDLIB_DIR) OCAML_DHOCAML_FLAGS = --runtime-map=ocaml-ulex08 ifeq ($(OCAML_HAVE_OCAMLOPT),yes) build/$(PKGNAME):: $(MAKE) all.opt endif debian/README.Debian0000644000000000000000000000127011724403762011235 0ustar ulex 0.8 in Debian ================== This package (ocaml-ulex08) contains the latest version of ulex which is compatible with CamlP4 << 3.10 or, alternatively, CamlP5 (packages in Debian as "camlp5"). Q: When do you need to use this package? A: Mainly if you have to build code which works only with the old CamlP4 *and* you also has to use ulex. In this case mixing your code (built old CamlP4) and ulex (built with new CamlP4), which is shipped in Debian as "ocaml-ulex", won't work. Hence you will need a version of ulex which is built against the old CamlP4; this package gives you precisely that. -- Stefano Zacchiroli Thu, 09 Aug 2007 17:09:59 -0400 debian/gbp.conf0000644000000000000000000000003611724403762010612 0ustar [DEFAULT] pristine-tar = True debian/dirs.in0000644000000000000000000000002111724403762010456 0ustar @OCamlStdlibDir@ debian/control0000644000000000000000000000256311724403762010605 0ustar Source: ulex0.8 Section: ocaml Priority: optional Maintainer: Debian OCaml Maintainers Uploaders: Enrico Tassi Build-Depends: debhelper (>= 7.1.0~), ocaml-nox (>= 3.11), dh-ocaml, ocaml-findlib, cdbs, camlp5 (>= 5.10) Standards-Version: 3.8.0 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ulex0.8.git Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ulex0.8.git Homepage: http://www.cduce.org/download.html#side Package: ocaml-ulex08 Architecture: any Depends: ocaml-findlib, ${ocaml:Depends}, ${shlibs:Depends}, ${misc:Depends} Provides: ${ocaml:Provides} Description: OCaml lexer generator with Unicode support - CamlP5 version ulex is a lexer generator for the Objective Caml (OCaml) programming language. . It is implemented as a Camlp4 syntax extension: lexer specifications are embedded in regular OCaml code. . Generated lexers work with a new kind of "lexbuf" that supports Unicode; a single lexer can work with arbitrary encodings of the input stream. . This package ships the latest release of ulex compatible with Camlp4 pre OCaml 3.10 (now called CamlP5). Applications which need both ulex and the legacy version of Camlp4 might need to use this package instead of ocaml-ulex (the latter shipping the latest available ulex release which requires Camlp4 >= 3.10)). debian/copyright0000644000000000000000000000254511724403762011135 0ustar This package was debianized by Stefano Zacchiroli on Fri, 24 Aug 2007 22:23:30 +0200. It was downloaded from http://www.cduce.org/download/ Copyright (C) 2005 Alain Frisch License: ulex is distributed under the terms of an MIT-like license; its full text is reported below. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. debian/source/0000755000000000000000000000000011724403762010474 5ustar debian/source/format0000644000000000000000000000001411724403762011702 0ustar 3.0 (quilt) debian/patches/0000755000000000000000000000000011724404003010610 5ustar debian/patches/0002-Fix-version-in-META.patch0000644000000000000000000000110111724403762015555 0ustar From: Stefano Zacchiroli Date: Sat, 3 Mar 2012 12:23:28 +0100 Subject: Fix version in META Fix a typo in the findlib package version number specified in META. Signed-off-by: Stefano Zacchiroli Signed-off-by: Stephane Glondu --- META | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/META b/META index 1a3ce10..416de11 100644 --- a/META +++ b/META @@ -1,4 +1,4 @@ -version = "0.7" +version = "0.8" requires = "camlp4" description = "Runtime support for ulex" archive(byte) = "ulexing.cma" -- debian/patches/0004-Use-camlp5.patch0000644000000000000000000000543311724403762014145 0ustar From: Stefano Zacchiroli Date: Sat, 3 Mar 2012 12:25:40 +0100 Subject: Use camlp5 Build (and install) using camlp5 instead of camlp4. Signed-off-by: Stefano Zacchiroli Signed-off-by: Stephane Glondu --- META | 2 +- Makefile | 8 ++++---- README | 2 +- mk_pa_ulex.ml | 6 ------ pa_ulex.ml.src | 2 +- 5 files changed, 7 insertions(+), 13 deletions(-) diff --git a/META b/META index 416de11..b2f25ef 100644 --- a/META +++ b/META @@ -1,5 +1,5 @@ version = "0.8" -requires = "camlp4" +requires = "camlp5" description = "Runtime support for ulex" archive(byte) = "ulexing.cma" archive(native) = "ulexing.cmxa" diff --git a/Makefile b/Makefile index aa29315..86c5e43 100644 --- a/Makefile +++ b/Makefile @@ -20,7 +20,7 @@ ulexing.cmxa: $(ULEXING) ocamlopt -a -o ulexing.cmxa $(ULEXING) pa_ulex.cma: $(ULEX) - ocamlc -a -o pa_ulex.cma -pp 'camlp4o pa_extend.cmo q_MLast.cmo' -I +camlp4 $(ULEX) + ocamlc -a -o pa_ulex.cma -pp 'camlp5o pa_extend.cmo q_MLast.cmo' -I +camlp5 $(ULEX) pa_ulex.ml: pa_ulex.ml.src ocaml mk_pa_ulex.ml @@ -29,14 +29,14 @@ clean: rm -f *.cm* *~ test custom_ulexing *.o *.a *.html *.css pa_ulex.ml view_test: pa_ulex.cma - camlp4o ./pa_ulex.cma pr_o.cmo -sep "\n" test.ml + camlp5o ./pa_ulex.cma pr_o.cmo -sep "\n" test.ml run_test: ulexing.cma pa_ulex.cma - ocamlc -o test -pp 'camlp4o ./pa_ulex.cma' ulexing.cma test.ml + ocamlc -o test -pp 'camlp5o ./pa_ulex.cma' ulexing.cma test.ml ./test custom_ulexing: ulexing.cma pa_ulex.cma - ocamlc -o custom_ulexing -pp 'camlp4o ./pa_ulex.cma' ulexing.cma custom_ulexing.ml + ocamlc -o custom_ulexing -pp 'camlp5o ./pa_ulex.cma' ulexing.cma custom_ulexing.ml doc: diff --git a/README b/README index f5eee7b..52080e0 100644 --- a/README +++ b/README @@ -142,7 +142,7 @@ Installation: Compilation of OCaml files with lexer specifications: - ocamlfind ocamlc -c -package ulex -syntax camlp4o my_file.ml + ocamlfind ocamlc -c -package ulex -syntax camlp5o my_file.ml When linking, you must also include the ulex package: ocamlfind ocamlc -o my_prog -linkpkg -package ulex my_file.cmo diff --git a/mk_pa_ulex.ml b/mk_pa_ulex.ml index e9d7159..c36c84c 100644 --- a/mk_pa_ulex.ml +++ b/mk_pa_ulex.ml @@ -1,10 +1,4 @@ let s = float_of_string (String.sub (Sys.ocaml_version) 0 4) in -if (s < 3.09) then ( print_endline "Old camlp4 (loc)"; Sys.command "sed s/_loc/loc/ < pa_ulex.ml.src > pa_ulex.ml" -) -else ( - print_endline "New camlp4 (_loc)"; - Sys.command "cp pa_ulex.ml.src pa_ulex.ml" -) diff --git a/pa_ulex.ml.src b/pa_ulex.ml.src index a56bd01..b8e1cd6 100644 --- a/pa_ulex.ml.src +++ b/pa_ulex.ml.src @@ -1,4 +1,4 @@ -let _loc = (Lexing.dummy_pos,Lexing.dummy_pos) +let _loc = Stdpp.dummy_loc (* Named regexp *) -- debian/patches/0003-Install-with-META-name-ulex08.patch0000644000000000000000000000144211724403762017371 0ustar From: Stefano Zacchiroli Date: Sat, 3 Mar 2012 12:24:43 +0100 Subject: Install with META name "ulex08" Signed-off-by: Stefano Zacchiroli Signed-off-by: Stephane Glondu --- Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index b95ce09..aa29315 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ all.opt: ulexing.cma ulexing.cmxa pa_ulex.cma DESTDIR= install: all - ocamlfind install -destdir $(DESTDIR) ulex META $(wildcard *.mli) $(wildcard *.cmi) $(wildcard *.a) $(wildcard *.cma) $(wildcard *.cmxa) + ocamlfind install -destdir $(DESTDIR) ulex08 META $(wildcard *.mli) $(wildcard *.cmi) $(wildcard *.a) $(wildcard *.cma) $(wildcard *.cmxa) uninstall: ocamlfind remove ulex -- debian/patches/series0000644000000000000000000000024111724403762012035 0ustar 0001-Add-DESTDIR.patch 0002-Fix-version-in-META.patch 0003-Install-with-META-name-ulex08.patch 0004-Use-camlp5.patch 0005-Compatibility-with-camlp5-strict.patch debian/patches/0001-Add-DESTDIR.patch0000644000000000000000000000153411724403762014011 0ustar From: Stefano Zacchiroli Date: Sat, 3 Mar 2012 12:22:03 +0100 Subject: Add DESTDIR Enable installing to a target directory passed from debian/rules. Signed-off-by: Stefano Zacchiroli Signed-off-by: Stephane Glondu --- Makefile | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index 44ddf92..b95ce09 100644 --- a/Makefile +++ b/Makefile @@ -4,8 +4,9 @@ all: ulexing.cma pa_ulex.cma all.opt: ulexing.cma ulexing.cmxa pa_ulex.cma +DESTDIR= install: all - ocamlfind install ulex META $(wildcard *.mli) $(wildcard *.cmi) $(wildcard *.a) $(wildcard *.cma) $(wildcard *.cmxa) + ocamlfind install -destdir $(DESTDIR) ulex META $(wildcard *.mli) $(wildcard *.cmi) $(wildcard *.a) $(wildcard *.cma) $(wildcard *.cmxa) uninstall: ocamlfind remove ulex -- debian/patches/0005-Compatibility-with-camlp5-strict.patch0000644000000000000000000000445011724404003020465 0ustar From: Stephane Glondu Date: Sat, 3 Mar 2012 12:31:53 +0100 Subject: Compatibility with camlp5 strict Signed-off-by: Stephane Glondu --- Makefile | 2 +- pa_ulex.ml.src | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 86c5e43..283f8bb 100644 --- a/Makefile +++ b/Makefile @@ -20,7 +20,7 @@ ulexing.cmxa: $(ULEXING) ocamlopt -a -o ulexing.cmxa $(ULEXING) pa_ulex.cma: $(ULEX) - ocamlc -a -o pa_ulex.cma -pp 'camlp5o pa_extend.cmo q_MLast.cmo' -I +camlp5 $(ULEX) + ocamlc -a -o pa_ulex.cma -pp 'camlp5o pa_macro.cmo pa_extend.cmo q_MLast.cmo' -I +camlp5 $(ULEX) pa_ulex.ml: pa_ulex.ml.src ocaml mk_pa_ulex.ml diff --git a/pa_ulex.ml.src b/pa_ulex.ml.src index b8e1cd6..643fcad 100644 --- a/pa_ulex.ml.src +++ b/pa_ulex.ml.src @@ -135,6 +135,8 @@ let call_state auto state = <:expr< $lid:f$ lexbuf >> +let vala_None = IFDEF STRICT THEN Ploc.VaVal None ELSE None END + let gen_state auto _loc i (part,trans,final) = let f = Printf.sprintf "__ulex_state_%i" i in let p = partition_name part in @@ -142,11 +144,11 @@ let gen_state auto _loc i (part,trans,final) = Array.mapi (fun i j -> <:patt< $int:string_of_int i$ >>, - None, + vala_None, call_state auto j ) trans in let cases = Array.to_list cases in - let cases = cases @ [<:patt< _ >>, None, <:expr< Ulexing.backtrack lexbuf >>] in + let cases = cases @ [<:patt< _ >>, vala_None, <:expr< Ulexing.backtrack lexbuf >>] in let body = <:expr< match ($lid:p$ (Ulexing.next lexbuf)) with [ $list:cases$ ] >> in @@ -165,9 +167,9 @@ let gen_definition _loc l = let rs = Array.map fst brs in let auto = Ulex.compile rs in - let cases = Array.mapi (fun i (_,e) -> <:patt< $int:string_of_int i$ >>, None, e) brs in + let cases = Array.mapi (fun i (_,e) -> <:patt< $int:string_of_int i$ >>, vala_None, e) brs in let cases = Array.to_list cases in - let cases = cases @ [<:patt< _ >>, None, <:expr< raise Ulexing.Error >>] in + let cases = cases @ [<:patt< _ >>, vala_None, <:expr< raise Ulexing.Error >>] in let actions = <:expr< match __ulex_state_0 lexbuf with [ $list:cases$ ] >> in let states = Array.mapi (gen_state auto _loc) auto in let states = List.flatten (Array.to_list states) in -- debian/compat0000644000000000000000000000000211724403762010372 0ustar 7 debian/docs0000644000000000000000000000000711724403762010044 0ustar README