Merge remote-tracking branch 'origin/master' into read-s3

PDAL · Apr 13, 2016 · 0663829 · 0663829
2 parents 37818c3 + 756cffd
commit 0663829
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 0 deletions.
diff --git a/include/pdal/util/ProgramArgs.hpp b/include/pdal/util/ProgramArgs.hpp
@@ -271,6 +271,13 @@ class TArg : public Arg
     */
     virtual void setValue(const std::string& s)
     {
+        if (m_set)
+        {
+            std::ostringstream oss;
+            oss << "Attempted to set value twice for argument '" <<
+                m_longname << "'.";
+            throw arg_error(oss.str());
+        }
         if (s.size() && s[0] == '-')
         {
             std::stringstream oss;

diff --git a/src/Kernel.cpp b/src/Kernel.cpp
@@ -170,7 +170,10 @@ void Kernel::doSwitches(int argc, const char *argv[], ProgramArgs& args)
         args.parseSimple(stringArgs);
         addSwitches(args);
         if (!m_showHelp)
+        {
+            args.reset();
             args.parse(stringArgs);
+        }
     }
     catch (arg_error& e)
     {

diff --git a/test/unit/ProgramArgsTest.cpp b/test/unit/ProgramArgsTest.cpp
@@ -84,20 +84,25 @@ TEST(ProgramArgsTest, t1)
     EXPECT_THROW(args.parse(s), arg_error);
 
     s = toStringList("--foo=TestFoo");
+    args.reset();
     args.parse(s);
     EXPECT_EQ(m_foo, "TestFoo");
 
     s = toStringList("--foo TestBar");
+    args.reset();
     args.parse(s);
     EXPECT_EQ(m_foo, "TestBar");
 
     s = toStringList("-f");
+    args.reset();
     EXPECT_THROW(args.parse(s), arg_error);
 
     s = toStringList("-f -g");
+    args.reset();
     EXPECT_THROW(args.parse(s), arg_error);
 
     s = toStringList("-f Gah");
+    args.reset();
     args.parse(s);
     EXPECT_EQ(m_foo, "Gah");
 }