Changed Slice parser to disallow leading underscore for identifiers.

    Changed Slice parser to reject identifiers beginning with "Ice", unless
    the --ice option is used. Changed Slice parser to disallow identifiers
    that have a trailing "Operations", "Holder", "Helper", "Prx", or "Ptr",
    to avoid clashes with language mappings. Fixed tests and remaining code
    base to work correctly with the changed rules.

1 files changed, 12 insertions, 1 deletions

diff --git a/cpp/src/slice2docbook/Main.cpp b/cpp/src/slice2docbook/Main.cpp
index 4eb55e53690..4d8e2cd6112 100644
--- a/cpp/src/slice2docbook/Main.cpp
+++ b/cpp/src/slice2docbook/Main.cpp
@@ -32,6 +32,7 @@ usage(const char* n)
         "--chapter            Use \"chapter\" instead of \"section\" as\n"
         "                     top-level element.\n"
         "-d, --debug          Print debug messages.\n"
+        "--ice                Permit `Ice' prefix (for building Ice source code only)\n"
         ;
 }
 
@@ -40,6 +41,7 @@ main(int argc, char* argv[])
 {
     string cpp("cpp -C");
     bool debug = false;
+    bool ice = false;
     bool standAlone = false;
     bool noGlobals = false;
     bool chapter = false;
@@ -115,6 +117,15 @@ main(int argc, char* argv[])
 	    }
 	    --argc;
 	}
+	else if(strcmp(argv[idx], "--ice") == 0)
+	{
+	    ice = true;
+	    for(int i = idx ; i + 1 < argc ; ++i)
+	    {
+		argv[i] = argv[i + 1];
+	    }
+	    --argc;
+	}
 	else if(argv[idx][0] == '-')
 	{
 	    cerr << argv[0] << ": unknown option `" << argv[idx] << "'" << endl;
@@ -155,7 +166,7 @@ main(int argc, char* argv[])
 	return EXIT_FAILURE;
     }
 
-    UnitPtr unit = Unit::createUnit(true, false);
+    UnitPtr unit = Unit::createUnit(true, false, ice);
 
     int status = EXIT_SUCCESS;