Bug 1991, improved grammar to provide better error reporting and allow

    keywords to be used as arguments

1 files changed, 87 insertions, 12 deletions

diff --git a/cpp/src/IceGrid/Parser.cpp b/cpp/src/IceGrid/Parser.cpp
index 98a27828054..44c6a92b47b 100644
--- a/cpp/src/IceGrid/Parser.cpp
+++ b/cpp/src/IceGrid/Parser.cpp
@@ -220,7 +220,7 @@ Parser::usage(const string& category, const string& command)
 {
     if(_helpCommands.find(category) == _helpCommands.end())
     {
-        invalidCommand("unknown category `" + category + "'");
+        invalidCommand("unknown command `" + category + "'");
     }
     else if(_helpCommands[category].find(command) == _helpCommands[category].end())
     {
@@ -559,8 +559,14 @@ Parser::patchApplication(const list<string>& origArgs)
 }
 
 void
-Parser::listAllApplications()
+Parser::listAllApplications(const list<string>& args)
 {
+    if(!args.empty())
+    {
+        invalidCommand("application list", "doesn't require any argument");
+        return;
+    }
+
     try
     {
         Ice::StringSeq names = _admin->getAllApplicationNames();
@@ -801,8 +807,14 @@ Parser::shutdownNode(const list<string>& args)
 }
 
 void
-Parser::listAllNodes()
+Parser::listAllNodes(const list<string>& args)
 {
+    if(!args.empty())
+    {
+        invalidCommand("node list", "doesn't require any argument");
+        return;
+    }
+
     try
     {
         Ice::StringSeq names = _admin->getAllNodeNames();
@@ -892,8 +904,14 @@ Parser::shutdownRegistry(const list<string>& args)
 }
 
 void
-Parser::listAllRegistries()
+Parser::listAllRegistries(const list<string>& args)
 {
+    if(!args.empty())
+    {
+        invalidCommand("registry list", "doesn't require any argument");
+        return;
+    }
+
     try
     {
         Ice::StringSeq names = _admin->getAllRegistryNames();
@@ -1205,8 +1223,14 @@ Parser::enableServer(const list<string>& args, bool enable)
 }
 
 void
-Parser::listAllServers()
+Parser::listAllServers(const list<string>& args)
 {
+    if(!args.empty())
+    {
+        invalidCommand("server list", "doesn't require any argument");
+        return;
+    }
+
     try
     {
         Ice::StringSeq ids = _admin->getAllServerIds();
@@ -1272,8 +1296,14 @@ Parser::removeAdapter(const list<string>& args)
 }
 
 void
-Parser::listAllAdapters()
+Parser::listAllAdapters(const list<string>& args)
 {
+    if(!args.empty())
+    {
+        invalidCommand("adapter list", "doesn't require any argument");
+        return;
+    }
+
     try
     {
         Ice::StringSeq ids = _admin->getAllAdapterIds();
@@ -1288,9 +1318,9 @@ Parser::listAllAdapters()
 void
 Parser::addObject(const list<string>& args)
 {
-    if(args.size() < 1)
+    if(args.size() != 1 && args.size() != 2)
     {
-        invalidCommand("object add", "requires at least one argument");
+        invalidCommand("object add", "requires one or two arguments");
         return;
     }
 
@@ -1361,6 +1391,12 @@ Parser::findObject(const list<string>& args)
 void
 Parser::describeObject(const list<string>& args)
 {
+    if(args.size() > 1)
+    {
+        invalidCommand("object find", "requires at most one argument");
+        return;
+    }
+
     try
     {
         ObjectInfoSeq objects;
@@ -1399,6 +1435,12 @@ Parser::describeObject(const list<string>& args)
 void
 Parser::listObject(const list<string>& args)
 {
+    if(args.size() > 1)
+    {
+        invalidCommand("object find", "requires at most one argument");
+        return;
+    }
+
     try
     {
         ObjectInfoSeq objects;
@@ -1816,19 +1858,52 @@ Parser::scanPosition(const char* s)
 void
 Parser::invalidCommand(const char* s)
 {
-    error(string(s) + "\n(`help' for more info)");
+    error(s);
 }
 
 void
 Parser::invalidCommand(const string& s)
 {
-    invalidCommand(s.c_str());
+    error(s.c_str());
 }
 
 void
-Parser::invalidCommand(const string& command, const string& s)
+Parser::invalidCommand(const string& command, const string& msg)
 {
-    error("`" + command + "'\n(`" + command + " help' for more info)");
+    error("`" + command + "' " + msg + "\n(`" + command + " help' for more info)");
+}
+
+void
+Parser::invalidCommand(const list<string>& s)
+{
+    if(s.empty())
+    {
+        return;
+    }
+    
+    string cat = *s.begin();
+    if(_helpCommands.find(cat) == _helpCommands.end())
+    {
+        cerr << "unknown `" << cat << "' command (see `help' for more info)" << endl;
+    }
+    else if(s.size() == 1)
+    {
+        cerr << "invalid `" << cat << "' command (see `" << cat << " help' for more info)" << endl;
+    }
+    else
+    {
+        string cmd = *(++s.begin());
+        if(_helpCommands[cat].find(cmd) == _helpCommands[cat].end())
+        {
+            cmd = cat + " " + cmd;
+            cerr << "unknown `" << cmd << "' command (see `" << cat << " help' for more info)" << endl;
+        }
+        else
+        {
+            cmd = cat + " " + cmd;
+            cerr << "invalid `" << cmd << "' command (see `" << cmd << " help' for more info)" << endl;
+        }
+    }
 }
 
 void