Merge pull request #158 from mkantor/objc-safe-var-names

Prevent ObjC generator from producing invalid var names.
This commit is contained in:
Tony Tam 2014-02-21 13:41:26 -08:00
commit 87b5c43166

View File

@ -82,10 +82,11 @@ class BasicObjcGenerator extends BasicGenerator {
// objective c doesn't like variables starting with "new" // objective c doesn't like variables starting with "new"
override def toVarName(name: String): String = { override def toVarName(name: String): String = {
if(name.startsWith("new") || reservedWords.contains(name)) { val paramName = name.replaceAll("[^a-zA-Z0-9_]","")
escapeReservedWord(name) if(paramName.startsWith("new") || reservedWords.contains(paramName)) {
escapeReservedWord(paramName)
} }
else name else paramName
} }
// naming for the apis // naming for the apis