Src/DllPlugInTester/makefile.

src/DllPlugInTester/makefile.am: removed ld.so from LDADD flags.

* src/DllPlugInTester/CommandLineParser.h:
* src/DllPlugInTester/CommandLineParser.cpp: rewrote, fixed problem
with double quotes in command line...

* src/DllPlugInTester/CommandLineParserTest.h:
* src/DllPlugInTester/CommandLineParserTest.cpp:
* src/DllPlugInTester/DllPlugInTesterTest.cpp: added, unit tests for
CommandLineParser.

* src/msvc6/TestPlugIn/*: removed.

1 files changed, 21 insertions, 18 deletions

diff --git a/src/DllPlugInTester/CommandLineParser.h b/src/DllPlugInTester/CommandLineParser.h
index 9fd5c5d..ed1b1f6 100644
--- a/src/DllPlugInTester/CommandLineParser.h
+++ b/src/DllPlugInTester/CommandLineParser.h
@@ -77,31 +77,28 @@ protected:
   /// Prevents the use of the copy operator.
   void operator =( const CommandLineParser &copy );
 
+  void readNonOptionCommands();
+
+  bool hasNextArgument() const;
+
+  std::string getNextArgument();
+
+  std::string getCurrentArgument() const;
+
+  bool argumentStartsWith( const std::string &expected ) const;
+
+  void getNextOption();
+
   bool isOption( const std::string &shortName,
                  const std::string &longName );
 
-  bool hasNext() const;
-  bool startsWith( const std::string &expected ) const;
-  char next();
-  void skipNext( int count =1 );
-  bool isSpace() const;
+  std::string getNextParameter();
 
-  std::string getParameter();
-  std::string getQuotedParameter();
-  std::string getUnquotedParameter();
-  std::string getOptionalParameter();
-  void fail( std::string message );
-  void getNextOption();
-  void skipSpaces();
-  static bool isSpace( unsigned char c );
+  std::string getNextOptionalParameter();
 
-  void readNonOptionCommands();
+  void fail( std::string message );
 
 protected:
-  std::string m_line;
-  int m_currentIndex;
-  std::string m_option;
-
   bool m_useCompiler;
   bool m_useXml;
   std::string m_xmlFileName;
@@ -115,6 +112,12 @@ protected:
 
   typedef std::deque<CommandLinePlugInInfo> PlugIns;
   PlugIns m_plugIns;
+
+  typedef std::deque<std::string> Arguments;
+  Arguments m_arguments;
+  int m_currentArgument;
+
+  std::string m_option;
 };