Don't append '_' to the end of prefix in long name mapping if the original name starts with '_'

Otherwise we will have '__' which is illegal. Review URL: https://codereview.appspot.com/5978058 git-svn-id: https://angleproject.googlecode.com/svn/trunk@1044 736b8ea6-26fd-11df-bfd4-992fa37f6226

Don't append '_' to the end of prefix in long name mapping if the original name starts with '_'
571fe348 · zmo@google.com · 1023bb55 · 571fe348 · 571fe348
Commit 571fe348 authored Apr 17, 2012 by zmo@google.com
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

version.h src/common/version.h +1 -1

MapLongVariableNames.cpp src/compiler/MapLongVariableNames.cpp +3 -1

No files found.
--- a/src/common/version.h
+++ b/src/common/version.h
 #define MAJOR_VERSION 1
 #define MINOR_VERSION 0
 #define BUILD_VERSION 0
-#define BUILD_REVISION 1041
+#define BUILD_REVISION 1044

 #define STRINGIFY(x) #x
 #define MACRO_STRINGIFY(x) STRINGIFY(x)

--- a/src/compiler/MapLongVariableNames.cpp
+++ b/src/compiler/MapLongVariableNames.cpp
@@ -15,7 +15,9 @@ TString mapLongName(int id, const TString& name, bool isGlobal)
    stream << "webgl_";
    if (isGlobal)
        stream << "g";
-    stream << id << "_";
+    stream << id;
+    if (name[0] != '_')
+        stream << "_";
    stream << name.substr(0, MAX_SHORTENED_IDENTIFIER_SIZE - stream.str().size());
    return stream.str();
 }