[Boost-commit] svn:boost r69309 - in branches/quickbook-filenames/tools/quickbook: src test

Subject: [Boost-commit] svn:boost r69309 - in branches/quickbook-filenames/tools/quickbook: src test
From: dnljms_at_[hidden]
Date: 2011-02-26 13:31:59

Author: danieljames
Date: 2011-02-26 13:31:58 EST (Sat, 26 Feb 2011)
New Revision: 69309
URL: http://svn.boost.org/trac/boost/changeset/69309

Log:
Fail if boostbook escape isn't closed.
Added:
   branches/quickbook-filenames/tools/quickbook/test/fail-mismatched-boostbook-escape.quickbook   (contents, props changed)
Text files modified: 
   branches/quickbook-filenames/tools/quickbook/src/main_grammar.cpp |     4 +++-                                    
   branches/quickbook-filenames/tools/quickbook/test/Jamfile.v2      |     1 +                                       
   2 files changed, 4 insertions(+), 1 deletions(-)

Modified: branches/quickbook-filenames/tools/quickbook/src/main_grammar.cpp
==============================================================================
--- branches/quickbook-filenames/tools/quickbook/src/main_grammar.cpp	(original)
+++ branches/quickbook-filenames/tools/quickbook/src/main_grammar.cpp	2011-02-26 13:31:58 EST (Sat, 26 Feb 2011)
@@ -479,7 +479,9 @@
             |   (
                     ("'''" >> !eol)             [actions.escape_pre]
                 >>  *(cl::anychar_p - "'''")    [actions.raw_char]
-                >>  cl::str_p("'''")            [actions.escape_post]
+                >>  (   cl::str_p("'''")        [actions.escape_post]
+                    |   cl::eps_p               [actions.error("Unclosed boostbook escape.")]
+                    )
                 )
             ;
 

Modified: branches/quickbook-filenames/tools/quickbook/test/Jamfile.v2
==============================================================================
--- branches/quickbook-filenames/tools/quickbook/test/Jamfile.v2	(original)
+++ branches/quickbook-filenames/tools/quickbook/test/Jamfile.v2	2011-02-26 13:31:58 EST (Sat, 26 Feb 2011)
@@ -79,6 +79,7 @@
     [ quickbook-error-test fail-unknown-quickbook-1 ]
     [ quickbook-error-test fail-unknown-quickbook-2 ]
     [ quickbook-error-test fail-unknown-quickbook-3 ]
+    [ quickbook-error-test fail-mismatched-boostbook-escape ]
     [ quickbook-test utf-8 ]
     [ quickbook-test utf-8-bom ]
     [ quickbook-test unicode-escape ]

Added: branches/quickbook-filenames/tools/quickbook/test/fail-mismatched-boostbook-escape.quickbook
==============================================================================
--- (empty file)
+++ branches/quickbook-filenames/tools/quickbook/test/fail-mismatched-boostbook-escape.quickbook	2011-02-26 13:31:58 EST (Sat, 26 Feb 2011)
@@ -0,0 +1,5 @@
+[article Badly escaped boostbook
+[quickbook 1.5]
+]
+
+'''<emphasis>something</emphasis>
\ No newline at end of file