1 files changed, 2 insertions, 120 deletions
diff --git a/cpp/demo/Freeze/library/RunParser.cpp b/cpp/demo/Freeze/library/RunParser.cpp
index 034a708e745..4cb286f04cf 100644
--- a/cpp/demo/Freeze/library/RunParser.cpp
+++ b/cpp/demo/Freeze/library/RunParser.cpp
@@ -13,84 +13,9 @@
 using namespace std;
 using namespace Demo;
 
-void
-usage(const char* appName)
-{
-    cerr << "Usage: " << appName << " [options] [file...]\n";
-    cerr <<     
-        "Options:\n"
-        "-h, --help           Show this message.\n"
-        "-v, --version        Display the Ice version.\n"
-        "-e COMMANDS          Execute COMMANDS.\n"
-        "-d, --debug          Print debug messages.\n"
-        ;
-}
-
 int
 runParser(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
 {
-    string commands;
-    bool debug = false;
-
-    int idx = 1;
-    while(idx < argc)
-    {
-        if(strcmp(argv[idx], "-h") == 0 || strcmp(argv[idx], "--help") == 0)
-        {
-            usage(argv[0]);
-            return EXIT_SUCCESS;
-        }
-        else if(strcmp(argv[idx], "-v") == 0 || strcmp(argv[idx], "--version") == 0)
-        {
-            cout << ICE_STRING_VERSION << endl;
-            return EXIT_SUCCESS;
-        }
-        else if(strcmp(argv[idx], "-e") == 0)
-        {
-            if(idx + 1 >= argc)
-            {
-                cerr << argv[0] << ": argument expected for`" << argv[idx] << "'" << endl;
-                usage(argv[0]);
-                return EXIT_FAILURE;
-            }
-            
-            commands += argv[idx + 1];
-            commands += ';';
-
-            for(int i = idx ; i + 2 < argc ; ++i)
-            {
-                argv[i] = argv[i + 2];
-            }
-            argc -= 2;
-        }
-        else if(strcmp(argv[idx], "-d") == 0 || strcmp(argv[idx], "--debug") == 0)
-        {
-            debug = 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;
-            usage(argv[0]);
-            return EXIT_FAILURE;
-        }
-        else
-        {
-            ++idx;
-        }
-    }
-
-    if(argc >= 2 && !commands.empty())
-    {
-        cerr << argv[0] << ": `-e' option cannot be used if input files are given" << endl;
-        usage(argv[0]);
-        return EXIT_FAILURE;
-    }
-
     LibraryPrx library = LibraryPrx::checkedCast(communicator->propertyToProxy("Library.Proxy"));
     if(!library)
     {
@@ -98,49 +23,6 @@ runParser(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
         return EXIT_FAILURE;
     }
 
-    ParserPtr p = Parser::createParser(library);
-    int status = EXIT_SUCCESS;
-
-    if(argc < 2) // No files given
-    {
-        if(!commands.empty()) // Commands were given
-        {
-            int parseStatus = p->parse(commands, debug);
-            if(parseStatus == EXIT_FAILURE)
-            {
-                status = EXIT_FAILURE;
-            }
-        }
-        else // No commands, let's use standard input
-        {
-            int parseStatus = p->parse(stdin, debug);
-            if(parseStatus == EXIT_FAILURE)
-            {
-                status = EXIT_FAILURE;
-            }
-        }
-    }
-    else // Process files given on the command line
-    {
-        for(idx = 1 ; idx < argc ; ++idx)
-        {
-            FILE* file = fopen(argv[idx], "r");
-            if(file == NULL)
-            {
-                cerr << argv[0] << ": can't open file `" << argv[idx] << "': " << strerror(errno) << endl;
-                return EXIT_FAILURE;
-            }
-            
-            int parseStatus = p->parse(file, debug);
-
-            fclose(file);
-
-            if(parseStatus == EXIT_FAILURE)
-            {
-                status = EXIT_FAILURE;
-            }
-        }
-    }
-
-    return status;
+    ParserPtr p = new Parser(library);
+    return p->parse();
 }