roast_xml/rule_xml.hpp: コメント開始のフォーマットエラーチェック対応

diff --git a/roast/include/roast/lexical/string_rule.hpp b/roast/include/roast/lexical/string_rule.hpp
index ddd73de..82ea904 100644 (file)
--- a/roast/include/roast/lexical/string_rule.hpp
+++ b/roast/include/roast/lexical/string_rule.hpp
@@ -27,14 +27,14 @@ namespace roast
                                bool analyze(_It& it, _Param& param)
                                {
                                        _asm nop;
-                                       _It it_backup=it;
+                                       char c=*it;
                                        T t;
                                        bool b = t.analyze(it, param);
                                        
                                        if ( b ){
-                                               if ( *it_backup == '\r' )
+                                               if ( c == '\r' )
                                                        param << _cr_t;
-                                               else if ( *it_backup == '\n' )
+                                               else if ( c == '\n' )
                                                        param << _lf_t;
                                        }
                                        return b;

diff --git a/roast/include/roast/xml/roast_xml/rule_xml.hpp b/roast/include/roast/xml/roast_xml/rule_xml.hpp
index a7d755a..2588d1a 100644 (file)
--- a/roast/include/roast/xml/roast_xml/rule_xml.hpp
+++ b/roast/include/roast/xml/roast_xml/rule_xml.hpp
@@ -39,8 +39,11 @@ namespace roast
                        struct angle_bracket_invalid : public xml_parse_exception{
                                angle_bracket_invalid() : xml_parse_exception("Angle bracket Invalid.") {} };
 
-                       struct comment_invalid_hyphyp : public xml_parse_exception{
-                               comment_invalid_hyphyp() : xml_parse_exception("The thing including \"--\" cannot be done in the Comment except the terminal.") {} };
+                       struct comment_invalid_start : public xml_parse_exception{
+                               comment_invalid_start() : xml_parse_exception("Comment Format Invalid. (Need Start \"<!--\")") {} };
+
+                       struct comment_invalid_end : public xml_parse_exception{
+                               comment_invalid_end() : xml_parse_exception("The thing including \"--\" cannot be done in the Comment except the terminal.") {} };
 
                        //////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -112,11 +115,15 @@ namespace roast
                        > comment_str;
        
                        typedef seq<
-                               lesser, exclamation, hyphen, hyphen,    //      <!--
+                               lesser, exclamation,                                            //      <!
+                               false_ret_to_exception<seq<hyphen, hyphen>,     //      --
+                                       comment_invalid_start>,
+
                                comment_str,
+
                                skip<2>, //hyphen, hyphen                               //      --
                                false_ret_to_exception<greater,                 //      >
-                                       comment_invalid_hyphyp>
+                                       comment_invalid_end>
                        > comment;
 
                        //typedef opt_repeat<comment> opt_comments;

diff --git a/roast/test/lexical_test/temp.xml b/roast/test/lexical_test/temp.xml
index be77db5..c46bbc1 100644 (file)
--- a/roast/test/lexical_test/temp.xml
+++ b/roast/test/lexical_test/temp.xml
@@ -1,16 +1,18 @@
-  <!-- aaaa -->
 
-<?xml
-version
-= "1.0"
 
- encoding =
-  "UTF-8"
-?>
-<hoge>
-<hoge>aaaa</hosge>
-<hoge></hoge>
-<hoge>bbbb</hoge>
-<hoge>
-</hoge>
-</hoge>
\ No newline at end of file
+<! --dd 
+ ddd--
+ -->
+ <!--dd 
+ 
+ -->
+ 
+ <?xml 
+ 
+ version="1.0"
+ encoding=
+ "UTF-8" ?>
+ <!--dd --> <hoge>
+</hogde>
+
+ <!--dd -->
\ No newline at end of file