12345qiupeng
/
gtsam
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

boost::spirit assign_a fixes to use non-literials

release/4.3a0
Carl Morgan 2016-08-11 14:23:26 +12:00
parent 0de62ab879
commit 01b3bf4038
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wrap/Module.cpp
View File

@ -152,7 +152,7 @@ void Module::parseMarkup(const std::string& data) {
// parse forward declaration
ForwardDeclaration fwDec0, fwDec;
Rule forward_declaration_p =
!(str_p("virtual")[assign_a(fwDec.isVirtual, true)])
!(str_p("virtual")[assign_a(fwDec.isVirtual, T)])
>> str_p("class")
>> (*(basic.namespace_p >> str_p("::")) >> basic.className_p)[assign_a(fwDec.name)]
>> ch_p(';')

18
wrap/tests/testSpirit.cpp
View File

@ -102,9 +102,19 @@ TEST( spirit, constMethod_p ) {
EXPECT(parse("double norm() const;", constMethod_p, space_p).full);
}
/* ************************************************************************* */
/* See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=56665
GCC compiler issues with -O2 and -fno-strict-aliasing results in undefined
behaviour when spirit uses assign_a with a literal.
GCC versions 4.7.2 -> 5.4 inclusive */
TEST( spirit, return_value_p ) {
bool isEigen = true;
static const bool T = true;
static const bool F = false;
bool isEigen = T;
string actual_return_type;
string actual_function_name;
@ -119,9 +129,9 @@ TEST( spirit, return_value_p ) {
Rule funcName_p = lexeme_d[lower_p >> *(alnum_p | '_')];
Rule returnType_p =
(basisType_p[assign_a(actual_return_type)][assign_a(isEigen, true)]) |
(className_p[assign_a(actual_return_type)][assign_a(isEigen,false)]) |
(eigenType_p[assign_a(actual_return_type)][assign_a(isEigen, true)]);
(basisType_p[assign_a(actual_return_type)][assign_a(isEigen, T)]) |
(className_p[assign_a(actual_return_type)][assign_a(isEigen, F)]) |
(eigenType_p[assign_a(actual_return_type)][assign_a(isEigen, T)]);
Rule testFunc_p = returnType_p >> funcName_p[assign_a(actual_function_name)] >> str_p("();");