diff options
| author | Lars Thorsen <[email protected]> | 2017-02-16 10:35:48 +0100 |
|---|---|---|
| committer | Lars Thorsen <[email protected]> | 2017-02-16 10:35:48 +0100 |
| commit | ec84b5f05e3daa633c98b00243a52acd9620d586 (patch) | |
| tree | 7bf3a5b6256434ae2d086300aaa40cf630b0f009 /lib/xmerl/src | |
| parent | 4c2f4dd8e6682fe1557852c45961897d41f7a9c1 (diff) | |
| parent | 381f97b30092624b238a68909855692929d6f8bf (diff) | |
| download | otp-ec84b5f05e3daa633c98b00243a52acd9620d586.tar.gz otp-ec84b5f05e3daa633c98b00243a52acd9620d586.tar.bz2 otp-ec84b5f05e3daa633c98b00243a52acd9620d586.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/xmerl/src')
| -rw-r--r-- | lib/xmerl/src/xmerl_scan.erl | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/xmerl/src/xmerl_scan.erl b/lib/xmerl/src/xmerl_scan.erl index 9f6b27113e..95dc82e5c9 100644 --- a/lib/xmerl/src/xmerl_scan.erl +++ b/lib/xmerl/src/xmerl_scan.erl @@ -2309,7 +2309,9 @@ expanded_name(Name, [], #xmlNamespace{default = URI}, S) -> expanded_name(Name, N = {"xmlns", Local}, #xmlNamespace{nodes = Ns}, S) -> {_, Value} = lists:keyfind(Local, 1, Ns), case Name of - 'xmlns:xml' when Value =/= 'http://www.w3.org/XML/1998/namespace' -> + 'xmlns:xml' when Value =:= 'http://www.w3.org/XML/1998/namespace' -> + N; + 'xmlns:xml' when Value =/= 'http://www.w3.org/XML/1998/namespace' -> ?fatal({xml_prefix_cannot_be_redeclared, Value}, S); 'xmlns:xmlns' -> ?fatal({xmlns_prefix_cannot_be_declared, Value}, S); @@ -2323,6 +2325,8 @@ expanded_name(Name, N = {"xmlns", Local}, #xmlNamespace{nodes = Ns}, S) -> N end end; +expanded_name(_Name, {"xml", Local}, _NS, _S) -> + {'http://www.w3.org/XML/1998/namespace', list_to_atom(Local)}; expanded_name(_Name, {Prefix, Local}, #xmlNamespace{nodes = Ns}, S) -> case lists:keysearch(Prefix, 1, Ns) of {value, {_, URI}} -> @@ -2333,9 +2337,6 @@ expanded_name(_Name, {Prefix, Local}, #xmlNamespace{nodes = Ns}, S) -> ?fatal({namespace_prefix_not_declared, Prefix}, S) end. - - - keyreplaceadd(K, Pos, [H|T], Obj) when K == element(Pos, H) -> [Obj|T]; keyreplaceadd(K, Pos, [H|T], Obj) -> |