-std::string Mangler::makeNameProper(const std::string &x) {
- std::string tmp;
- for (std::string::const_iterator sI = x.begin(), sEnd = x.end();
- sI != sEnd; sI++)
- switch (*sI) {
- case '.': tmp += "d_"; break;
- case ' ': tmp += "s_"; break;
- case '-': tmp += "D_"; break;
- default: tmp += *sI;
- }
- return tmp;
+std::string Mangler::makeNameProper(const std::string &X) {
+ std::string Result;
+
+ // Mangle the first letter specially, don't allow numbers...
+ if ((X[0] < 'a' || X[0] > 'z') && (X[0] < 'A' || X[0] > 'Z') && X[0] != '_')
+ Result += MangleLetter(X[0]);
+ else
+ Result += X[0];
+
+ for (std::string::const_iterator I = X.begin()+1, E = X.end(); I != E; ++I)
+ if ((*I < 'a' || *I > 'z') && (*I < 'A' || *I > 'Z') &&
+ (*I < '0' || *I > '9') && *I != '_')
+ Result += MangleLetter(*I);
+ else
+ Result += *I;
+ return Result;