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

Starting to add support for STL containers in wrap

release/4.3a0
Andrew Melim 2012-09-18 18:36:42 +00:00
parent c6f7fa8fb7
commit a2474ef354
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wrap/Module.cpp
View File

@ -115,7 +115,10 @@ Module::Module(const string& interfacePath,
Rule eigenType_p = Rule eigenType_p =
(str_p("Vector") | "Matrix"); (str_p("Vector") | "Matrix");
Rule className_p = (lexeme_d[upper_p >> *(alnum_p | '_')] - eigenType_p - keywords_p); //Rule for STL Containers (class names are lowercase)
Rule stlType_p = (str_p("vector") | "list");
Rule className_p = (lexeme_d[upper_p >> *(alnum_p | '_')] - eigenType_p - keywords_p) | stlType_p;
Rule namespace_name_p = lexeme_d[lower_p >> *(alnum_p | '_')] - keywords_p; Rule namespace_name_p = lexeme_d[lower_p >> *(alnum_p | '_')] - keywords_p;
@ -491,14 +494,12 @@ map<string, Method> Module::appendInheretedMethods(const Class& cls, const vecto
map<string, Method> methods; map<string, Method> methods;
if(!cls.qualifiedParent.empty()) if(!cls.qualifiedParent.empty())
{ {
cout << "Class: " << cls.name << " Parent Name: " << cls.qualifiedParent.back() << endl;
//Find Class //Find Class
BOOST_FOREACH(const Class& parent, classes) BOOST_FOREACH(const Class& parent, classes)
{ {
//We found the class for our parent //We found the class for our parent
if(parent.name == cls.qualifiedParent.back()) if(parent.name == cls.qualifiedParent.back())
{ {
cout << "Inner class: " << cls.qualifiedParent.back() << endl;
Methods inhereted = appendInheretedMethods(parent, classes); Methods inhereted = appendInheretedMethods(parent, classes);
methods.insert(inhereted.begin(), inhereted.end()); methods.insert(inhereted.begin(), inhereted.end());
} }
@ -506,7 +507,6 @@ map<string, Method> Module::appendInheretedMethods(const Class& cls, const vecto
} }
else else
{ {
cout << "Dead end: " << cls.name << endl;
methods.insert(cls.methods.begin(), cls.methods.end()); methods.insert(cls.methods.begin(), cls.methods.end());
} }