Improve compatibility with Type_conv >= 113.00

Do this by renaming some of the syntax parser modules to be less generically named. Bump to 1.4.0
mirage · Sep 24, 2015 · ad02a1e · ad02a1e
1 parent e9544e7
commit ad02a1e
Show file tree

Hide file tree

Showing 12 changed files with 13 additions and 11 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,7 @@
+1.4.0 (trunk):
+* Improve compatability with Type_conv >= 113.00 by renaming some of the
+  syntax parser modules to be less generically named.
+
 1.3.0 (02-Aug-2015)
 * Add `Css.of_string`, `Css.set_prop`, `Css.get_prop`, `Css.polygradient`.
   `Css.gradient` (#74, by @chrismamo1)

diff --git a/_vars b/_vars
@@ -1,5 +1,5 @@
 NAME=cow
-VERSION=1.3.0
+VERSION=1.4.0
 LIB=cow
 SYNTAX="pa_cow"
 DEPS="dyntype.syntax dyntype ulex uri xmlm omd ezjsonm"
diff --git a/cmd b/cmd
@@ -31,11 +31,9 @@ configure() {
   ${OCAMLFIND} query -r -a-format -predicates native ${DEPS} > _config/archives.native
   ${OCAMLFIND} query -r -a-format -predicates byte ${DEPS} > _config/archives.byte
   # _config/pp has camlp4 flags for the library and binaries
-  ${OCAMLFIND} query -r -predicates syntax,preprocessor -format '-I %d %A' ${DEPS} ${SYNTAX_DEPS} > _config/syntax.deps
   # specially needed for syntax TODO merge with _vars
-  ${OCAMLFIND} query -r -predicates byte -format '-I %d %A' str >> _config/syntax.deps
-  ${OCAMLFIND} query -r -predicates byte -format '-I %d %A' xmlm >> _config/syntax.deps
-  ${OCAMLFIND} query -r -predicates byte -format '-I %d %A' ezjsonm >> _config/syntax.deps
+  ${OCAMLFIND} query -r -predicates byte -format '-I %d %A' compiler-libs.common str xmlm ezjsonm >> _config/syntax.deps
+  ${OCAMLFIND} query -r -predicates syntax,preprocessor -format '-I %d %A' ${DEPS} ${SYNTAX_DEPS} >> _config/syntax.deps
   # _config/syntax has flags to build p4 extensions in syntax/
   ${OCAMLFIND} query -r -predicates syntax,preprocessor -format '-I %d' camlp4.quotations.o camlp4.lib camlp4.extend > _config/syntax.build
   ${OCAMLFIND} query -r -predicates syntax,preprocessor -format '-I %d' camlp4.quotations.r camlp4.lib camlp4.extend ${SYNTAX_DEPS} > _config/syntax.build.r

diff --git a/syntax/css/parser.ml → syntax/css/css_parser.ml b/syntax/css/parser.ml → syntax/css/css_parser.ml
diff --git a/syntax/css/parser.mli → syntax/css/css_parser.mli b/syntax/css/parser.mli → syntax/css/css_parser.mli
diff --git a/syntax/css/qLexer.mll b/syntax/css/qLexer.mll
@@ -15,7 +15,7 @@
  *)
 
 {
-  open Parser
+  open Css_parser
 
   let debug = ref false
 

diff --git a/syntax/css/quotations.ml b/syntax/css/quotations.ml
@@ -72,5 +72,5 @@ let expand_str_item fn _loc _ s =
 
 ;;
 
-Q.add "css" Q.DynAst.expr_tag (expand_expr Parser.main);
-Q.add "css" Q.DynAst.str_item_tag (expand_str_item Parser.main)
+Q.add "css" Q.DynAst.expr_tag (expand_expr Css_parser.main);
+Q.add "css" Q.DynAst.str_item_tag (expand_str_item Css_parser.main)
diff --git a/syntax/pa_css.mlpack b/syntax/pa_css.mlpack
@@ -1,7 +1,7 @@
 css/Options
 css/Qast
 css/Css_location
-css/Parser
+css/Css_parser
 css/QLexer
 css/Printer
 css/Quotations
diff --git a/syntax/pa_xml.mlpack b/syntax/pa_xml.mlpack
@@ -1,7 +1,7 @@
 xml/Options
 xml/Qast
 xml/Xml_location
-xml/Parser
+xml/Xml_parser
 xml/Printer
 xml/Xml
 xml/Quotation

diff --git a/syntax/xml/quotation.ml b/syntax/xml/quotation.ml
@@ -30,7 +30,7 @@ let destruct_aq s =
     "", s
 
 let parse_quot_string entity _loc s =
-  let ast = Parser.parse ?enc:(Parser.get_encoding ()) ?entity _loc s in
+  let ast = Xml_parser.parse ?enc:(Xml_parser.get_encoding ()) ?entity _loc s in
   let meta_ast = Qast.meta_t _loc ast in
   meta_ast
 

diff --git a/syntax/xml/parser.ml → syntax/xml/xml_parser.ml b/syntax/xml/parser.ml → syntax/xml/xml_parser.ml
diff --git a/syntax/xml/parser.mli → syntax/xml/xml_parser.mli b/syntax/xml/parser.mli → syntax/xml/xml_parser.mli