bug 4752 - allow underscores in Slice identifiers

1 files changed, 7 insertions, 3 deletions

diff --git a/cpp/src/slice2php/Main.cpp b/cpp/src/slice2php/Main.cpp
index d66a791af51..4e05affbaf7 100644
--- a/cpp/src/slice2php/Main.cpp
+++ b/cpp/src/slice2php/Main.cpp
@@ -1526,7 +1526,8 @@ usage(const char* n)
         "--output-dir DIR     Create files in the directory DIR.\n"
         "--depend             Generate Makefile dependencies.\n"
         "-d, --debug          Print debug messages.\n"
-        "--ice                Permit `Ice' prefix (for building Ice source code only)\n"
+        "--ice                Permit `Ice' prefix (for building Ice source code only).\n"
+        "--underscore         Permit underscores in Slice identifiers.\n"
         "--all                Generate code for Slice definitions in included files.\n"
         "--checksum           Generate checksums for Slice definitions.\n"
         "-n, --namespace      Use PHP namespaces (requires PHP 5.3.0 or later).\n"
@@ -1547,6 +1548,7 @@ compile(int argc, char* argv[])
     opts.addOpt("", "depend");
     opts.addOpt("d", "debug");
     opts.addOpt("", "ice");
+    opts.addOpt("", "underscore");
     opts.addOpt("", "all");
     opts.addOpt("", "checksum");
     opts.addOpt("n", "namespace");
@@ -1605,6 +1607,8 @@ compile(int argc, char* argv[])
 
     bool ice = opts.isSet("ice");
 
+    bool underscore = opts.isSet("underscore");
+
     bool all = opts.isSet("all");
 
     bool checksum = opts.isSet("checksum");
@@ -1644,7 +1648,7 @@ compile(int argc, char* argv[])
                 return EXIT_FAILURE;
             }
 
-            UnitPtr u = Unit::createUnit(false, false, ice);
+            UnitPtr u = Unit::createUnit(false, false, ice, underscore);
             int parseStatus = u->parse(*i, cppHandle, debug);
             u->destroy();
 
@@ -1690,7 +1694,7 @@ compile(int argc, char* argv[])
             }
             else
             {
-                UnitPtr u = Unit::createUnit(false, all, ice);
+                UnitPtr u = Unit::createUnit(false, all, ice, underscore);
                 int parseStatus = u->parse(*i, cppHandle, debug);
 
                 if(!icecpp->close())