From f2e72e7b5bcc3c56d28e504d6301f3b6f0352774 Mon Sep 17 00:00:00 2001 From: Anton Bachin Date: Tue, 15 Mar 2016 13:18:37 -0500 Subject: [PATCH] Prefixed internal module Xml_parser. It is now Markup__xml_parser. This is done to avoid conflict with Xml-Light's internal module Xml_parser. In principle, all Markup.ml modules should get prefixed names, but I am putting this off until Markup.ml is converted to Namespaces (or I abandon the attempt). Namespaces prefixes modules automatically. --- src/markup.ml | 2 +- src/{xml_parser.ml => markup__xml_parser.ml} | 0 src/{xml_parser.mli => markup__xml_parser.mli} | 0 test/test_xml_parser.ml | 2 +- 4 files changed, 2 insertions(+), 2 deletions(-) rename src/{xml_parser.ml => markup__xml_parser.ml} (100%) rename src/{xml_parser.mli => markup__xml_parser.mli} (100%) diff --git a/src/markup.ml b/src/markup.ml index 1800137..58f20b7 100644 --- a/src/markup.ml +++ b/src/markup.ml @@ -96,7 +96,7 @@ struct |> encoding ~report |> Input.preprocess Common.is_valid_xml_char report |> Xml_tokenizer.tokenize report entity - |> Xml_parser.parse context namespace report + |> Markup__xml_parser.parse context namespace report |> k in diff --git a/src/xml_parser.ml b/src/markup__xml_parser.ml similarity index 100% rename from src/xml_parser.ml rename to src/markup__xml_parser.ml diff --git a/src/xml_parser.mli b/src/markup__xml_parser.mli similarity index 100% rename from src/xml_parser.mli rename to src/markup__xml_parser.mli diff --git a/test/test_xml_parser.ml b/test/test_xml_parser.ml index 087c9cb..55acf96 100644 --- a/test/test_xml_parser.ml +++ b/test/test_xml_parser.ml @@ -23,7 +23,7 @@ let expect ?context ?(namespace = no_top_level_namespaces) text signals = |> Encoding.utf_8 |> Input.preprocess is_valid_xml_char Error.ignore_errors |> Xml_tokenizer.tokenize Error.ignore_errors no_custom_entities - |> Xml_parser.parse context namespace report + |> Markup__xml_parser.parse context namespace report |> iter iterate; ended ()