Handle Scala reserved name

Author: mrRosset

TreeVisitor.cpp

@@ -16,10 +16,11 @@ bool TreeVisitor::VisitFunctionDecl(clang::FunctionDecl *func) {
 
     for (const clang::ParmVarDecl* parm : func->parameters()){
         //Handle default values
-        std::string pname = parm->getNameAsString();
+        std::string pname = handleReservedWords(parm->getNameAsString());
         if(pname == ""){
             pname = "anonymous";
         }
+
         params += pname;
         params += ": ";
         params += typeTranslator.Translate(parm->getType());
@@ -58,10 +59,12 @@ bool TreeVisitor::VisitEnumDecl(clang::EnumDecl *enumdecl){
 
     int i = 0;
     for (const clang::EnumConstantDecl* en : enumdecl->enumerators()){
+        std::string ename = handleReservedWords(en->getNameAsString());
+
         if(name != ""){
-            enums += "\tfinal val enum_" + name + "_" + en->getNameAsString() + " = " + std::to_string(i++) + "\n";
+            enums += "\tfinal val enum_" + name + "_" + ename + " = " + std::to_string(i++) + "\n";
         } else {
-            enums += "\tfinal val enum_" + en->getNameAsString() + " = " + std::to_string(i++) + "\n";
+            enums += "\tfinal val enum_" + ename + " = " + std::to_string(i++) + "\n";
         }
     }
 
@@ -103,7 +106,7 @@ bool TreeVisitor::VisitRecordDecl(clang::RecordDecl *record){
         std::string helpersFunc = "";
 
         for(const clang::FieldDecl* field : record->fields()){
-            std::string fname = field->getNameAsString();
+            std::string fname = handleReservedWords(field->getNameAsString());
             std::string ftype = typeTranslator.Translate(field->getType(), &name);
 
             fields += ftype + ", ";

Utils.h

@@ -59,4 +59,19 @@ inline bool typeEquals(const clang::Type* tpe1, const std::string* tpe2){
     return false;
 }
 
+static std::array<std::string, 39> reserved_words = {"abstract", "case", "catch", "class", "def", "do", "else", "extends",
+                                      "false", "final", "finally", "for", "forSome", "if", "implicit", "import",
+                                      "lazy", "match", "new", "null", "object", "override", "package", "private",
+                                      "protected", "return", "sealed", "super", "this", "throw", "trait", "try",
+                                      "true", "type", "val", "var", "while", "with", "yield"};
+
+inline std::string handleReservedWords(std::string name){
+    auto found = std::find(reserved_words.begin(), reserved_words.end(), name);
+    if(found != reserved_words.end()){
+        return "`" + name + "`";
+    } else{
+        return name;
+    }
+}
+
 #endif // UTILS_H