More warnings

This commit is contained in:
Daniel James
2017-09-02 21:09:45 +01:00
parent 570f64f5b2
commit 62f4b4fcf3
16 changed files with 129 additions and 125 deletions

View File

@@ -63,7 +63,7 @@ namespace quickbook
std::string id;
bool start_code;
string_iterator source_pos;
mapped_file_builder::pos start_pos;
mapped_file_builder::pos_type start_pos;
boost::shared_ptr<snippet_data> next;
};
@@ -114,9 +114,7 @@ namespace quickbook
definition(python_code_snippet_grammar const& self)
{
actions_type& actions = self.actions;
start_ = (*code_elements) [boost::bind(&actions_type::end_file, &actions, _1, _2)]
start_ = (*code_elements) [boost::bind(&actions_type::end_file, &self.actions, _1, _2)]
;
identifier =
@@ -124,11 +122,11 @@ namespace quickbook
;
code_elements =
start_snippet [boost::bind(&actions_type::start_snippet, &actions, _1, _2)]
| end_snippet [boost::bind(&actions_type::end_snippet, &actions, _1, _2)]
| escaped_comment [boost::bind(&actions_type::escaped_comment, &actions, _1, _2)]
| pass_thru_comment [boost::bind(&actions_type::pass_thru, &actions, _1, _2)]
| ignore [boost::bind(&actions_type::append_code, &actions, _1, _2)]
start_snippet [boost::bind(&actions_type::start_snippet, &self.actions, _1, _2)]
| end_snippet [boost::bind(&actions_type::end_snippet, &self.actions, _1, _2)]
| escaped_comment [boost::bind(&actions_type::escaped_comment, &self.actions, _1, _2)]
| pass_thru_comment [boost::bind(&actions_type::pass_thru, &self.actions, _1, _2)]
| ignore [boost::bind(&actions_type::append_code, &self.actions, _1, _2)]
| cl::anychar_p
;
@@ -137,7 +135,7 @@ namespace quickbook
>> !(cl::eol_p >> *cl::blank_p)
>> "#["
>> *cl::blank_p
>> identifier [boost::bind(&actions_type::mark, &actions, _1, _2)]
>> identifier [boost::bind(&actions_type::mark, &self.actions, _1, _2)]
>> *(cl::anychar_p - cl::eol_p)
;
@@ -169,12 +167,12 @@ namespace quickbook
escaped_comment =
cl::confix_p(
*cl::space_p >> "#`",
(*cl::anychar_p) [boost::bind(&actions_type::mark, &actions, _1, _2)],
(*cl::anychar_p) [boost::bind(&actions_type::mark, &self.actions, _1, _2)],
(cl::eol_p | cl::end_p)
)
| cl::confix_p(
*cl::space_p >> "\"\"\"`",
(*cl::anychar_p) [boost::bind(&actions_type::mark, &actions, _1, _2)],
(*cl::anychar_p) [boost::bind(&actions_type::mark, &self.actions, _1, _2)],
"\"\"\""
)
;
@@ -185,10 +183,10 @@ namespace quickbook
= "#=" >> (cl::eps_p - '=')
>> ( *(cl::anychar_p - cl::eol_p)
>> (cl::eol_p | cl::end_p)
) [boost::bind(&actions_type::mark, &actions, _1, _2)]
) [boost::bind(&actions_type::mark, &self.actions, _1, _2)]
| cl::confix_p(
"\"\"\"=" >> (cl::eps_p - '='),
(*cl::anychar_p) [boost::bind(&actions_type::mark, &actions, _1, _2)],
(*cl::anychar_p) [boost::bind(&actions_type::mark, &self.actions, _1, _2)],
"\"\"\""
)
;
@@ -219,9 +217,7 @@ namespace quickbook
{
definition(cpp_code_snippet_grammar const& self)
{
actions_type& actions = self.actions;
start_ = (*code_elements) [boost::bind(&actions_type::end_file, &actions, _1, _2)]
start_ = (*code_elements) [boost::bind(&actions_type::end_file, &self.actions, _1, _2)]
;
identifier =
@@ -229,11 +225,11 @@ namespace quickbook
;
code_elements =
start_snippet [boost::bind(&actions_type::start_snippet, &actions, _1, _2)]
| end_snippet [boost::bind(&actions_type::end_snippet, &actions, _1, _2)]
| escaped_comment [boost::bind(&actions_type::escaped_comment, &actions, _1, _2)]
| ignore [boost::bind(&actions_type::append_code, &actions, _1, _2)]
| pass_thru_comment [boost::bind(&actions_type::pass_thru, &actions, _1, _2)]
start_snippet [boost::bind(&actions_type::start_snippet, &self.actions, _1, _2)]
| end_snippet [boost::bind(&actions_type::end_snippet, &self.actions, _1, _2)]
| escaped_comment [boost::bind(&actions_type::escaped_comment, &self.actions, _1, _2)]
| ignore [boost::bind(&actions_type::append_code, &self.actions, _1, _2)]
| pass_thru_comment [boost::bind(&actions_type::pass_thru, &self.actions, _1, _2)]
| cl::anychar_p
;
@@ -242,7 +238,7 @@ namespace quickbook
>> !(cl::eol_p >> *cl::blank_p)
>> "//["
>> *cl::blank_p
>> identifier [boost::bind(&actions_type::mark, &actions, _1, _2)]
>> identifier [boost::bind(&actions_type::mark, &self.actions, _1, _2)]
>> *(cl::anychar_p - cl::eol_p)
|
*cl::blank_p
@@ -250,7 +246,7 @@ namespace quickbook
>> *cl::blank_p
>> "/*["
>> *cl::space_p
>> identifier [boost::bind(&actions_type::mark, &actions, _1, _2)]
>> identifier [boost::bind(&actions_type::mark, &self.actions, _1, _2)]
>> *cl::space_p
>> "*/"
>> *cl::blank_p
@@ -258,7 +254,7 @@ namespace quickbook
|
"/*["
>> *cl::space_p
>> identifier [boost::bind(&actions_type::mark, &actions, _1, _2)]
>> identifier [boost::bind(&actions_type::mark, &self.actions, _1, _2)]
>> *cl::space_p
>> "*/"
;
@@ -302,12 +298,12 @@ namespace quickbook
escaped_comment
= cl::confix_p(
*cl::space_p >> "//`",
(*cl::anychar_p) [boost::bind(&actions_type::mark, &actions, _1, _2)],
(*cl::anychar_p) [boost::bind(&actions_type::mark, &self.actions, _1, _2)],
(cl::eol_p | cl::end_p)
)
| cl::confix_p(
*cl::space_p >> "/*`",
(*cl::anychar_p) [boost::bind(&actions_type::mark, &actions, _1, _2)],
(*cl::anychar_p) [boost::bind(&actions_type::mark, &self.actions, _1, _2)],
"*/"
)
;
@@ -318,10 +314,10 @@ namespace quickbook
= "//=" >> (cl::eps_p - '=')
>> ( *(cl::anychar_p - cl::eol_p)
>> (cl::eol_p | cl::end_p)
) [boost::bind(&actions_type::mark, &actions, _1, _2)]
) [boost::bind(&actions_type::mark, &self.actions, _1, _2)]
| cl::confix_p(
"/*=" >> (cl::eps_p - '='),
(*cl::anychar_p) [boost::bind(&actions_type::mark, &actions, _1, _2)],
(*cl::anychar_p) [boost::bind(&actions_type::mark, &self.actions, _1, _2)],
"*/"
)
;