diff options
| author | Michi Henning <michi@zeroc.com> | 2006-02-22 02:32:59 +0000 |
|---|---|---|
| committer | Michi Henning <michi@zeroc.com> | 2006-02-22 02:32:59 +0000 |
| commit | 3bef7ec6b914afd1b244ea6dc67cb2efad278c7a (patch) | |
| tree | bfdfeab934b688d89f48847fe43fcdef40447757 /cpp/src | |
| parent | adding Ice::Connection, new proxy connection mgmt methods, binding test (diff) | |
| download | ice-3bef7ec6b914afd1b244ea6dc67cb2efad278c7a.tar.bz2 ice-3bef7ec6b914afd1b244ea6dc67cb2efad278c7a.tar.xz ice-3bef7ec6b914afd1b244ea6dc67cb2efad278c7a.zip | |
Backed out previous change--was barking up the wrong tree.
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/Slice/Scanner.l | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/cpp/src/Slice/Scanner.l b/cpp/src/Slice/Scanner.l index cb7ef274978..48e0e75dbed 100644 --- a/cpp/src/Slice/Scanner.l +++ b/cpp/src/Slice/Scanner.l @@ -432,31 +432,10 @@ checkIdentifier(const string& id) } // - // Apparently on some platforms, [:alpha:] includes characters outside - // the ASCII range (such as the copyright sign). We add an extra scan - // here to print a meaningful error message for such platforms. - // - static const string legalChars = "0123456789abcdefghijklmnopqrstuvwxyz"; // Sorted in increasing ASCII order. - - size_t i; - - for(i = 0; i < id.size(); ++i) - { - if(!binary_search(legalChars.begin(), legalChars.end(), ::tolower(id[i]))) - { - stringstream s; - s.width(3); - s.fill('0'); - s << oct << static_cast<unsigned int>(static_cast<unsigned char>(id[i])); - unit->error("illegal character in identifier: '\\" + s.str() + "'"); - } - } - - // // Weed out identifiers with reserved suffixes. // static const string suffixBlacklist[] = { "Helper", "Holder", "Prx", "Ptr" }; - for(i = 0; i < sizeof(suffixBlacklist) / sizeof(*suffixBlacklist); ++i) + for(size_t i = 0; i < sizeof(suffixBlacklist) / sizeof(*suffixBlacklist); ++i) { if(id.find(suffixBlacklist[i], id.size() - suffixBlacklist[i].size()) != string::npos) { |