Changeset 1741

Timestamp:

Jan 22, 2009, 11:36:42 PM (14 years ago)

Author:

Peter

Message:

fixes #481

Location:

trunk/yat/utility

Files:

• CommandLine.cc (modified) (4 diffs)
• CommandLine.h (modified) (3 diffs)
• Option.cc (modified) (2 diffs)
• OptionArg.h (modified) (3 diffs)

trunk/yat/utility/CommandLine.cc

@@ -3 +3 @@
 /*
   Copyright (C) 2007 Jari Häkkinen, Peter Johansson, Markus Ringnér
-  Copyright (C) 2008 Peter Johansson
+  Copyright (C) 2008, 2009 Peter Johansson
 
   This file is part of the yat library, http://dev.thep.lu.se/yat
@@ -43 +43 @@
 
   CommandLine::CommandLine(std::string str)
-    : description_(str), free_arg_max_(0)
+    : description_(str), free_arg_max_(0), parsed_(false)
   {}
 
@@ -103 +103 @@
   void CommandLine::parse(int argc, char* argv[])
   {   
+    parsed_=true;
     using namespace std;
     // just in case it is not pristine
@@ -182 +183 @@
 
 
+  bool CommandLine::parsed(void) const
+  {
+    return parsed_;
+  }
+
+
   std::string CommandLine::program_name(void) const
   {

trunk/yat/utility/CommandLine.h

@@ -6 +6 @@
 /*
   Copyright (C) 2007 Jari Häkkinen, Peter Johansson
-  Copyright (C) 2008 Peter Johansson
+  Copyright (C) 2008, 2009 Peter Johansson
 
   This file is part of the yat library, http://dev.thep.lu.se/yat
@@ -127 +127 @@
 
     /**
+       \brief has the commandline been parsed already
+
+       \return true if parse function has already been called
+
+       \since New in yat 0.5
+    */
+    bool parsed(void) const;
+
+    /**
        @return Name of more; more specifically argv[0] is
        stripped so only string after the last '/' remains.
@@ -151 +160 @@
     std::map<char, Option*> short_options_;
     std::map<std::string, Option*> long_options_;
+    bool parsed_;
     std::string program_name_;
   };

trunk/yat/utility/Option.cc

@@ -3 +3 @@
 /*
   Copyright (C) 2007 Jari Häkkinen, Peter Johansson
-  Copyright (C) 2008 Peter Johansson
+  Copyright (C) 2008, 2009 Peter Johansson
 
   This file is part of the yat library, http://dev.thep.lu.se/yat
@@ -88 +88 @@
   bool Option::present(void) const
   {
+    if (!cmd().parsed()) {
+      std::string s("Option::present called before Commandline was parsed");
+      throw std::logic_error(s);
+    }
     return present_;
   }

trunk/yat/utility/OptionArg.h

@@ -6 +6 @@
 /*
   Copyright (C) 2007 Jari Häkkinen, Peter Johansson
-  Copyright (C) 2008 Peter Johansson
+  Copyright (C) 2008, 2009 Peter Johansson
 
   This file is part of the yat library, http://dev.thep.lu.se/yat
@@ -29 +29 @@
 #include "utility.h"
 
+#include <stdexcept>
 #include <string>
 #include <sstream>
@@ -75 +76 @@
        \return value
     */
-    T value(void) const { return value_; }
+    T value(void) const 
+    { 
+      if (!cmd().parsed()) {
+        std::string s("OptionArg::value called before Commandline was parsed");
+        throw std::logic_error(s);
+      }
+      return value_; 
+    }
 
     /**