Changeset 1178

Timestamp:

Feb 27, 2008, 8:24:31 PM (16 years ago)

Author:

Peter

Message:

fixes #344

Location:

trunk

Files:

• test/commandline_test.cc (modified) (2 diffs)
• yat/utility/CommandLine.cc (modified) (4 diffs)
• yat/utility/CommandLine.h (modified) (3 diffs)
• yat/utility/Exception.h (modified) (1 diff)
• yat/utility/Option.cc (modified) (2 diffs)
• yat/utility/OptionArg.h (modified) (6 diffs)
• yat/utility/OptionFile.cc (modified) (4 diffs)

trunk/test/commandline_test.cc

@@ -369 +369 @@
   OptionFile inclones(cmd, "clones", "file containing clones");
   OptionFile indata(cmd, "data", "data to merge");
+  OptionFile out(cmd, "o,out", "data to merge", true, false, "w");
   OptionSwitch help(cmd, "h,help", "display this help and exit");
 
@@ -374 +375 @@
   {
     int ac = 2;
-    char* av[] = { "test_prog", "-h" };
+    char* av[] = { "test_prog", "--clones", "commandline_test.cc" 
+                   "--data", "commandline_test.cc", "-o", 
+                   "commandline_test.cc"};
     cmd.parse(ac,av);
     error << "ok\n";

trunk/yat/utility/CommandLine.cc

@@ -25 +25 @@
 
 #include "ColumnStream.h"
+#include "Exception.h"
 #include "Option.h"
 #include "OptionSwitch.h"
@@ -115 +116 @@
             ss << ": unrecognized option `" << key << "'\n"
                << try_help();
-            throw std::runtime_error(ss.str());
+            throw cmd_error(ss.str());
           }
           else 
@@ -129 +130 @@
               ss << ": invalid option -- " << (*arg)[i] << "\n"
                  << try_help() << "\n";
-              throw std::runtime_error(ss.str());
+              throw cmd_error(ss.str());
             }       
             else 
@@ -139 +140 @@
                std::mem_fun(&Option::validate)); 
     }
-    catch (std::runtime_error& e){
+    catch (cmd_error& e){
       std::stringstream ss;
       ss << program_name_ << ": " << e.what();
-      throw std::runtime_error(ss.str());
+      throw cmd_error(ss.str());
     }
       

trunk/yat/utility/CommandLine.h

@@ -24 +24 @@
   02111-1307, USA.
 */
-
-#include "TypeInfo.h"
 
 #include <cctype>
@@ -62 +60 @@
        cmd.parse(argc, argv);
      }
-     catch (std::runtime_error e){
+     catch (cmd_error e){
        std::cout << e.what() << std::endl;
        return 1;
@@ -112 +110 @@
        \brief parse the commandline
 
-       throw std::runtime_error if an error is detected.
+       throw cmd_error if an error is detected.
     */
     void parse(int argc, char* argv[]);

trunk/yat/utility/Exception.h

@@ -34 +34 @@
 namespace yat {
 namespace utility {
+
+  /**
+     \brief Class used for error reported from Commandline or Option.
+   */
+  class cmd_error : public std::runtime_error
+  {
+  public:
+    inline cmd_error(std::string message)
+      : std::runtime_error(message) {}
+  };
+
 
   /**

trunk/yat/utility/Option.cc

@@ -84 +84 @@
     present_=true;
     do_parse(first, last);
+    std::cerr << "parsed " << long_name() << std::endl;
   }
 
@@ -147 +148 @@
   void Option::validate()
   {
+    std::cerr << "validate: " << long_name() << std::endl;
     do_validate();
   }

trunk/yat/utility/OptionArg.h

@@ -27 +27 @@
 #include "Option.h"
 #include "CommandLine.h"
+#include "Exception.h"
 
-#include <stdexcept>
 #include <string>
 #include <sstream>
@@ -87 +87 @@
         ss << "option requires an argument -- " << short_name() << "\n"
            << cmd().try_help();
-        throw std::runtime_error(ss.str());
+        throw cmd_error(ss.str());
       }
       if (first+1==last ) {
@@ -94 +94 @@
           ss << "option `--" << long_name() << "' requires an argument\n"
              << cmd().try_help();
-          throw std::runtime_error(ss.str());
+          throw cmd_error(ss.str());
         }
         else {
@@ -100 +100 @@
           ss << "option requires an argument -- " << short_name() << "\n"
              << cmd().try_help();
-          throw std::runtime_error(ss.str());
+          throw cmd_error(ss.str());
         }
       }       
@@ -125 +125 @@
         std::stringstream sstr(rhs);
         sstr << ": invalid argument";
-        throw std::runtime_error(sstr.str());
+        throw cmd_error(sstr.str());
       }
     }
@@ -142 +142 @@
         ss << "' not given\n";
         ss << cmd().try_help();
-        throw std::runtime_error(ss.str());
+        throw cmd_error(ss.str());
       }
       do_validate2();

trunk/yat/utility/OptionFile.cc

@@ -23 +23 @@
 
 #include "OptionFile.h"
+#include "Exception.h"
 #include "FileUtil.h"
 
-#include <stdexcept>
 #include <string>
 
@@ -46 +46 @@
   void OptionFile::do_validate2() const
   {   
+    std::cerr << "OptionFile:: do_validate2 " << std::endl;
     if (!present())
       return;
     FileUtil fu(value().c_str());
+    std::cerr << "check exist" << std::endl;
     if (exist_ && !fu.exists()){
       std::stringstream ss;
       ss << "cannot stat `" << value() << "': No such file or directory";
-      throw std::runtime_error(ss.str());
+      throw cmd_error(ss.str());
     }
+    std::cerr << "check perm" << std::endl;
     if (fu.permissions(bits_)) {
       // Peter, this loop is stupid but I wanna differentiate the error message
@@ -60 +63 @@
           std::stringstream ss;
           ss << "cannot stat `" << value() << "': No such file or directory";
-          throw std::runtime_error(ss.str());
+          throw cmd_error(ss.str());
         }
         else if (*iter=='w' && fu.permissions("w")){
@@ -66 +69 @@
           ss << "cannot create file `" << value() 
              << "': Permission denied";
-          throw std::runtime_error(ss.str());
+          throw cmd_error(ss.str());
         }
       }
       std::stringstream ss;
       ss << value() << ": Permission denied";
-      throw std::runtime_error(ss.str());
+      throw cmd_error(ss.str());
     }
   }