casa-mp-base

--- files/META.in   2012-12-07 16:15:22.000000000 +0100

+++ files/META.in   2013-07-03 00:30:43.705255131 +0200

@@ -2,7 +2,7 @@

 description = "XHTML and HTML5 pages typed with polymorphic variants"

 version = "dev"

-requires = "netstring"

+requires = "netstring pcre"

 archive(byte) = "_LIBNAME_.cma"

 archive(native) = "_LIBNAME_.cmxa"

@@ -38,4 +38,4 @@

     version = "(distributed with _PACKAGENAME_)"

     archive(byte) = "_LIBNAME__duce.cma"

     archive(native) = "_LIBNAME__duce.cmxa"

-)

\ No newline at end of file

+)

--- lib/Makefile    2012-12-07 16:15:22.000000000 +0100

+++ lib/Makefile    2013-07-03 00:31:01.395255118 +0200

@@ -13,7 +13,7 @@

 DUCE_FILES := xml_print_duce.ml xhtml_duce.ml

-LIBS     := -package netstring

+LIBS     := -package netstring -package pcre

 # SYNTAX := -ppopt ../syntax/pa_include.cmo -package camlp4 -syntax camlp4o

--- lib/xml.ml  2012-12-07 16:15:22.000000000 +0100

+++ lib/xml.ml  2013-07-03 00:23:21.658588803 +0200

@@ -83,8 +83,7 @@

      (as this string is to be considered as the end of the cdata)

   *)

     let s' = "\n<![CDATA[\n"^

-      (Netstring_pcre.global_replace

-    (Netstring_pcre.regexp_string "]]>") "" s)

+      (Pcre.replace ~rex:(Pcre.regexp(Pcre.quote "]]>")) s)

       ^"\n]]>\n" in

     encodedpcdata s'

@@ -93,8 +92,7 @@

      (as this string is to be considered as the end of the cdata)

   *)

     let s' = "\n//<![CDATA[\n"^

-      (Netstring_pcre.global_replace

-    (Netstring_pcre.regexp_string "]]>") "" s)

+      (Pcre.replace ~rex:(Pcre.regexp(Pcre.quote "]]>")) s)

       ^"\n//]]>\n" in

     encodedpcdata s'

@@ -103,8 +101,7 @@

      (as this string is to be considered as the end of the cdata)

   *)

     let s' = "\n/* <![CDATA[ */\n"^

-      (Netstring_pcre.global_replace

-    (Netstring_pcre.regexp_string "]]>") "" s)

+      (Pcre.replace ~rex:(Pcre.regexp (Pcre.quote "]]>")) s)

       ^"\n/* ]]> */\n" in

     encodedpcdata s'