diff options
| author | Anthony Ramine <[email protected]> | 2010-12-07 23:31:34 +0100 |
|---|---|---|
| committer | Lars Thorsen <[email protected]> | 2011-11-11 11:58:43 +0100 |
| commit | 6d841684ff63ff8cc6295ea4c4461385ab594136 (patch) | |
| tree | c53c7bd780ff6208a13d4868d78a6f270536849d /lib/xmerl/src/xmerl_scan.erl | |
| parent | fcf6b58a1f7a2eafa0db79f1715db1c193c3f346 (diff) | |
| download | otp-6d841684ff63ff8cc6295ea4c4461385ab594136.tar.gz otp-6d841684ff63ff8cc6295ea4c4461385ab594136.tar.bz2 otp-6d841684ff63ff8cc6295ea4c4461385ab594136.zip | |
Accumulate comments in element nodes
Diffstat (limited to 'lib/xmerl/src/xmerl_scan.erl')
| -rw-r--r-- | lib/xmerl/src/xmerl_scan.erl | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/xmerl/src/xmerl_scan.erl b/lib/xmerl/src/xmerl_scan.erl index 9e3e6ee728..5f61fe2bb1 100644 --- a/lib/xmerl/src/xmerl_scan.erl +++ b/lib/xmerl/src/xmerl_scan.erl @@ -2553,9 +2553,6 @@ scan_content("&" ++ T, S0, Pos, Name, Attrs, Space, Lang, Parents, NS, Acc,[]) - _ -> scan_content(string_to_char_set(S1#xmerl_scanner.encoding,ExpRef)++T1,S1,Pos,Name,Attrs,Space,Lang,Parents,NS,Acc,[]) end; -scan_content("<!--" ++ T, S, Pos, Name, Attrs, Space, Lang, Parents, NS, Acc,[]) -> - {_, T1, S1} = scan_comment(T, S, Pos, Parents, Lang), - scan_content(T1, S1, Pos+1, Name, Attrs, Space, Lang, Parents, NS, Acc,[]); scan_content("<" ++ T, S0, Pos, Name, Attrs, Space, Lang, Parents, NS, Acc,[]) -> ?bump_col(1), {Markup, T1, S1} = @@ -2615,6 +2612,10 @@ scan_content_markup("![CDATA[" ++ T, S0, Pos, _Name, _Attrs, scan_content_markup("?"++T,S0,Pos,_Name,_Attrs,_Space,_Lang,Parents,_NS) -> ?bump_col(1), scan_pi(T, S, Pos, Parents); +scan_content_markup("!--" ++ T, S0, Pos, _Name, _Attrs, + _Space, Lang, Parents, _NS) -> + ?bump_col(1), + scan_comment(T, S, Pos, Parents, Lang); scan_content_markup(T, S, Pos, _Name, _Attrs, Space, Lang, Parents, NS) -> scan_element(T, S, Pos, Space, Lang, Parents, NS). |