Commit a79e2d64 authored by gerd's avatar gerd

Fixing bug in namespace-aware parsing (normprefix incorrectly computed

because of incorrect ns_cache)


git-svn-id: https://godirepo.camlcity.org/svn/lib-pxp/trunk@759 dbe99aee-44db-0310-b2b3-d33182c8eb97
parent b2c480a3
......@@ -9,7 +9,7 @@ with_wlex_compat=1
with_ulex=1
with_pp=1
lexlist="utf8,iso88591,iso88592,iso88593,iso88594,iso88595,iso88596,iso88597,iso88598,iso88599,iso885910,iso885913,iso885914,iso885915,iso885916"
version="1.2.3"
version="1.2.4"
exec_suffix=""
help_lex="Enable/disable ocamllex-based lexical analyzer for the -lexlist encodings"
......
......@@ -185,10 +185,13 @@ same namespaces.</p></li>
<title>Recent Changes</title>
<ul>
<li>
<p><em>1.2.3:</em> Ported to OCaml-4.00 </p>
<p><em>1.2.4:</em> Fixed bug in namespace-aware parsing
(thanks to ygrek and Thomas Leonard)</p>
</li>
<li>
<p><em>1.2.3:</em> Ported to OCaml-4.00 </p>
</li>
<li>
<p><em>1.2.2:</em> Fixing the interaction of catalog and file
......@@ -196,8 +199,6 @@ same namespaces.</p></li>
<p>Fix because of a change in Ocamlnet-3.3.1</p>
</li>
<li>
<p><em>1.2.1:</em> Revised documentation</p>
<p>Addition: Pxp_event.unwrap_document</p>
......
......@@ -273,7 +273,17 @@ class virtual core_parser
else
Some(new namespace_scope_impl mng ns_scope !mapping) in
ns_scope <- scope;
(* Clear cache - otherwise the new declarations wouldn't have any
effect
*)
if !mapping <> [] then
ns_cache <- StringMap.empty;
(* NB. normalize_namespace_prefix uses the new values for
ns_scope and ns_cache, so these vars must already be updated
*)
(* Normalize the regular_attlist: *)
let norm_attlist =
List.map
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment