1 files changed, 37 insertions, 0 deletions
diff --git a/cpp/src/slice2java/Main.cpp b/cpp/src/slice2java/Main.cpp
index c146eb9c76a..22d0cd8c592 100644
--- a/cpp/src/slice2java/Main.cpp
+++ b/cpp/src/slice2java/Main.cpp
@@ -28,7 +28,9 @@ usage(const char* n)
         "-IDIR                   Put DIR in the include file search path.\n"
         "--output-dir DIR        Create files in the directory DIR.\n"
         "--package PKG           Generate everything in package PKG.\n"
+        "--tie                   Generate TIE classes.\n"
         "--impl                  Generate sample implementations.\n"
+        "--impl-tie              Generate sample TIE implementations.\n"
         "-d, --debug             Print debug messages.\n"
         ;
 }
@@ -40,7 +42,9 @@ main(int argc, char* argv[])
     vector<string> includePaths;
     string output;
     string package;
+    bool tie = false;
     bool impl = false;
+    bool implTie = false;
     bool debug = false;
 
     int idx = 1;
@@ -131,6 +135,15 @@ main(int argc, char* argv[])
             }
             argc -= 2;
         }
+        else if (strcmp(argv[idx], "--tie") == 0)
+        {
+            tie = true;
+            for (int i = idx ; i + 1 < argc ; ++i)
+            {
+                argv[i] = argv[i + 1];
+            }
+            --argc;
+        }
         else if (strcmp(argv[idx], "--impl") == 0)
         {
             impl = true;
@@ -140,6 +153,15 @@ main(int argc, char* argv[])
             }
             --argc;
         }
+        else if (strcmp(argv[idx], "--impl-tie") == 0)
+        {
+            implTie = 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] << "'"
@@ -160,6 +182,13 @@ main(int argc, char* argv[])
         return EXIT_FAILURE;
     }
 
+    if (impl && implTie)
+    {
+        cerr << argv[0] << ": cannot specify both --impl and --impl-tie" << endl;
+        usage(argv[0]);
+        return EXIT_FAILURE;
+    }
+
     int status = EXIT_SUCCESS;
 
     for (idx = 1 ; idx < argc ; ++idx)
@@ -223,10 +252,18 @@ main(int argc, char* argv[])
                 return EXIT_FAILURE;
             }
             gen.generate(unit);
+            if (tie)
+            {
+                gen.generateTie(unit);
+            }
             if (impl)
             {
                 gen.generateImpl(unit);
             }
+            if (implTie)
+            {
+                gen.generateImplTie(unit);
+            }
         }
 
         unit->destroy();