Changeset 824 for trunk

Timestamp:

Sep 26, 2009, 12:57:46 AM (14 years ago)

Author:

Peter Johansson

Message:

adding missing file Exception.h.diff

Location:

trunk/lib/yat

Files:

• CommandLine.cc (modified) (2 diffs)
• CommandLine.h (modified) (5 diffs)
• Exception.h.diff (added)
• Option.h (modified) (3 diffs)
• OptionArg.h (modified) (2 diffs)
• OptionHelp.cc (modified) (2 diffs)
• deprecate.h (modified) (2 diffs)
• utility.h (modified) (3 diffs)

trunk/lib/yat/CommandLine.cc

@@ -1 @@
-// $Id: CommandLine.cc 1874 2009-03-17 22:09:01Z peter $
+// $Id: CommandLine.cc 2046 2009-09-02 21:42:32Z peter $
 
 /*
@@ -33 +33 @@
 #include <functional>
 #include <fstream>
-#include <iostream>
+#include <ostream>
 #include <sstream>
 #include <stdexcept>

trunk/lib/yat/CommandLine.h

@@ -2 +2 @@
 #define _theplu_yat_utility_commandline_
 
-//$Id: CommandLine.h 1954 2009-05-07 15:30:58Z jari $
+//$Id: CommandLine.h 2054 2009-09-06 18:25:06Z peter $
 
 /*
@@ -26 +26 @@
 #include <cctype>
 #include <map>
-#include <iostream>
+#include <iosfwd>
 #include <sstream>
 #include <stdexcept>
@@ -52 +52 @@
      CommandLine cmd;
      OptionHelp help(cmd);
-     OptionInFile in(cmd, "i,in", 
-                     "Read input from file (rather than standard input)");
-     OptionOutFile out(cmd, "o,out", "Place the output to file");
+     OptionFile in(cmd, "i,in", 
+                   "Read input from file (rather than standard input)",
+                   false, true, "r");
+     OptionFile out(cmd, "o,out", "Place the output to file", false, false, "w");
      OptionSwitch target(cmd, "T,target", "treat DEST as a normal file", true);
      OptionSwitch verbose(cmd, "v,verbose", "explain what is being done");
@@ -79 +80 @@
        return EXIT_SUCCESS;
      }
+     StreamRedirect sr_out(std::cout, out.value(), out.present());
+     StreamRedirect sr_in(std::cin, in.value(), in.present());
      ...
      \endcode
@@ -129 +132 @@
     /**
        \brief parse the commandline
+
+       First the commandline is parsed to detect which options are
+       present, then each Option parses the its relevant part of
+       commandline (Option::parse()), and finally each Option is
+       validated (Option::validate()).
 
        throw cmd_error if an error is detected.

trunk/lib/yat/Option.h

@@ -2 +2 @@
 #define _theplu_yat_utility_option_
 
-// $Id: Option.h 1797 2009-02-12 18:07:10Z peter $
+// $Id: Option.h 2046 2009-09-02 21:42:32Z peter $
 
 /*
   Copyright (C) 2007, 2008 Jari Häkkinen, Peter Johansson
+  Copyright (C) 2009 Peter Johansson
 
   This file is part of the yat library, http://dev.thep.lu.se/yat
@@ -23 +24 @@
 */
 
-#include <iostream>
 #include <string>
 #include <vector>
@@ -104 +104 @@
        \brief Validate the Option
 
-       This function is called after commandline is parsed.
+       This function is called by CommandLine::parse() after all
+       options have been detected and parsed (see Option::parse()).
      */
     void validate(void);

trunk/lib/yat/OptionArg.h

@@ -2 +2 @@
 #define _theplu_yat_utility_option_arg_
 
-// $Id: OptionArg.h 1797 2009-02-12 18:07:10Z peter $
+// $Id: OptionArg.h 2046 2009-09-02 21:42:32Z peter $
 
 /*
@@ -45 +45 @@
      "--support-gnu=value", POSIX-like "--support-posix value", as
      well as shorter "-s value". The argument of an parameter is
-     retrived by the value() function
+     retrived by the value() function. The type \c T should be either
+     a string or a type supported by function convert().
    */
   template<typename T>

trunk/lib/yat/OptionHelp.cc

@@ -1 @@
-// $Id: OptionHelp.cc 1797 2009-02-12 18:07:10Z peter $
+// $Id: OptionHelp.cc 2055 2009-09-08 18:23:43Z peter $
 
 /*
@@ -24 +24 @@
 
 #include <cstdlib>
-#include <sstream>
+#include <iostream>
 #include <string>
 

trunk/lib/yat/deprecate.h

@@ -2 +2 @@
 #define _theplu_yat_utility_deprecate_ 
 
-// $Id: deprecate.h 1707 2009-01-12 22:51:35Z peter $
+// $Id: deprecate.h 2062 2009-09-14 20:19:17Z peter $
 
 /*
@@ -41 +41 @@
 #endif
 
+// With GCC version < 4.3 deprecation of classes yields no
+// warning. Therefore, we deprecate the constructors of those classes
+// with this macro YAT_DEPRECATE_GCC_PRE4_3, which is mute for
+// compiler GCC 4.3 and newer and for others compilers than GCC.
+#ifndef YAT_DEPRECATE_GCC_PRE4_3
+#if defined(__GNUC__) && ((__GNUC__<4) || (__GNUC__==4 && __GNUC_MINOR__<3)) 
+/// if GCC version before 4.3 define as YAT_DEPRECATE defined above
+#define YAT_DEPRECATE_GCC_PRE4_3 YAT_DEPRECATE
+#else
+/// with GCC 4.3 and newer (or other compilers) define it as empty
+#define YAT_DEPRECATE_GCC_PRE4_3
 #endif
+#endif
+
+#endif

trunk/lib/yat/utility.h

@@ -2 +2 @@
 #define _theplu_yat_utility_utility_ 
 
-// $Id: utility.h 1971 2009-05-11 20:42:16Z peter $
+// $Id: utility.h 2055 2009-09-08 18:23:43Z peter $
 
 /*
@@ -205 +205 @@
     if (is_equal(s, "inf"))
       return std::numeric_limits<T>::infinity();
-    if (is_equal(s, "-inf"))
+    if (is_equal(s, "-inf")) {
       if (std::numeric_limits<T>::is_signed)
         return -std::numeric_limits<T>::infinity();
@@ -211 +211 @@
         throw std::runtime_error(std::string("yat::utility::convert(\"")+s+
                                  std::string("\"): type is unsigned") );
+    }
     std::stringstream ss(s);
     T a;