Updated the Wave copyright notice to include the year 2006.

[SVN r32154]
malickf · Dec 24, 2005 · 5115faf · 5115faf
1 parent ec34f70
commit 5115faf
Show file tree

Hide file tree

Showing 345 changed files with 537 additions and 370 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,7 +1,7 @@
 Boost.Wave: A Standard compliant C++ preprocessor library
 http://www.boost.org/
 
-Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+Copyright (c) 2001-2006 Hartmut Kaiser. Distributed under the Boost
 Software License, Version 1.0. (See accompanying file
 LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 -------------------------------------------------------------------------------
@@ -22,13 +22,13 @@ TODO (known issues):
 
 CHANGELOG
 
+Sat Dec 24 13:33:53 CST 2005
 - Version 1.2.2
 - Added three new preprocessing hooks: 'found_directive', 'skipped_token' and 
   'evaluated_conditional_expression' (thanks to Andreas S�bj�rnsen for the 
   suggestions).
 - Removed hook forwarding functions in the context_type.
 - Added missing include_next case branches for get_directivename() function.
-- Switched to Re2C V0.9.10
 - Added new sample: advanced_hooks.
 - Fixed a possible buffer overflow in the cpplexer and cpp exception classes.
 - Made the cpp_grammar thread safe.
@@ -84,6 +84,14 @@ CHANGELOG
   sample.
 - Fixed a (Windows specific) bug which triggered a boost::file_system exception
   under certain conditions.
+- Switched to Re2C V0.9.11
+- Fixed a problem with the new '-E' (--autooutput) option.
+- Added better error reporting for duplicate macro definitions to the Wave 
+  tool. Added the macro_handling_exception type containing the corresponding 
+  macro name via the new (virtual) get_related_name() function.
+- Added the get_severity() function to the exceptions thrown by the Wave
+  library.
+- Extended the copyright notice to 2006.
 
 Mon Dec  5 22:05:22 CST 2005
 Boost V1.33.1

diff --git a/build/Jamfile b/build/Jamfile
@@ -4,7 +4,7 @@
 #
 # http://www.boost.org/
 #
-# Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost 
+# Copyright (c) 2001-2006 Hartmut Kaiser. Distributed under the Boost 
 # Software License, Version 1.0. (See accompanying file 
 # LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 

diff --git a/build/Jamfile.v2 b/build/Jamfile.v2
@@ -4,7 +4,7 @@
 #
 # http://www.boost.org/
 #
-# Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost 
+# Copyright (c) 2001-2006 Hartmut Kaiser. Distributed under the Boost 
 # Software License, Version 1.0. (See accompanying file 
 # LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 

diff --git a/doc/acknowledgements.html b/doc/acknowledgements.html
@@ -79,7 +79,7 @@
   </tr>
 </table>
 <hr size="1">
-<p class="copyright">Copyright &copy; 2003-2005 Hartmut Kaiser<br>
+<p class="copyright">Copyright &copy; 2003-2006 Hartmut Kaiser<br>
   <br>
   <font size="2">Distributed under the Boost Software 
   License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) 

diff --git a/doc/class_reference_context.html b/doc/class_reference_context.html
@@ -441,7 +441,7 @@ <h3>Control extended options</h3>
   </tr>
 </table>
 <hr size="1">
-<p class="copyright">Copyright &copy; 2003-2005 Hartmut Kaiser<br>
+<p class="copyright">Copyright &copy; 2003-2006 Hartmut Kaiser<br>
   <br>
   <font size="2">Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) </font> </p>
 <span class="updated"></span>

diff --git a/doc/class_reference_ctxpolicy.html b/doc/class_reference_ctxpolicy.html
@@ -324,7 +324,7 @@ <h3>Macro definition </h3>
   </tr>
 </table>
 <hr size="1">
-<p class="copyright">Copyright &copy; 2003-2005 Hartmut Kaiser<br>
+<p class="copyright">Copyright &copy; 2003-2006 Hartmut Kaiser<br>
   <br>
 <font size="2">Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) </font> </p>
 <p class="copyright"><span class="updated">Last updated: 

diff --git a/doc/class_reference_filepos.html b/doc/class_reference_filepos.html
@@ -109,7 +109,7 @@ <h3><a name="constructors"></a>Constructors</h3>
   </tr>
 </table>
 <hr size="1">
-<p class="copyright">Copyright &copy; 2003-2005 Hartmut Kaiser<br>
+<p class="copyright">Copyright &copy; 2003-2006 Hartmut Kaiser<br>
   <br>
 <font size="2">Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) </font> </p>
 <p class="copyright"><span class="updated">Last updated: 

diff --git a/doc/class_reference_inptpolcy.html b/doc/class_reference_inptpolcy.html
@@ -121,7 +121,7 @@ <h3><a name="member_functions"></a>Member Functions</h3>
   </tr>
 </table>
 <hr size="1">
-<p class="copyright">Copyright &copy; 2003-2005 Hartmut Kaiser<br>
+<p class="copyright">Copyright &copy; 2003-2006 Hartmut Kaiser<br>
   <br>
   <font size="2">Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) </font> </p>
 <span class="updated"></span>

diff --git a/doc/class_reference_lexer.html b/doc/class_reference_lexer.html
@@ -93,7 +93,7 @@ <h2><a name="member_functions"></a>Member functions</h2>
   </tr>
 </table>
 <hr size="1">
-<p class="copyright">Copyright &copy; 2003-2005 Hartmut Kaiser<br>
+<p class="copyright">Copyright &copy; 2003-2006 Hartmut Kaiser<br>
   <br>
 <font size="2">Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) </font> </p>
 <p class="copyright"><span class="updated">Last updated: 

diff --git a/doc/class_reference_tokentype.html b/doc/class_reference_tokentype.html
@@ -165,7 +165,7 @@ <h2>Accessor functions</h2>
   </tr>
 </table>
 <hr size="1">
-<p class="copyright">Copyright &copy; 2003-2005 Hartmut Kaiser<br>
+<p class="copyright">Copyright &copy; 2003-2006 Hartmut Kaiser<br>
   <br>
   <font size="2">Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) </font> </p>
 <span class="updated"></span>

diff --git a/doc/compiletime_config.html b/doc/compiletime_config.html
@@ -204,7 +204,7 @@
   </tr>
 </table>
 <hr size="1">
-<p class="copyright">Copyright &copy; 2003-2005 Hartmut Kaiser<br>
+<p class="copyright">Copyright &copy; 2003-2006 Hartmut Kaiser<br>
   <br>
 <font size="2">Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) </font> </p>
 <span class="updated"></span>

diff --git a/doc/introduction.html b/doc/introduction.html
@@ -82,7 +82,7 @@
   </tr>
 </table>
 <hr size="1">
-<p class="copyright">Copyright &copy; 2003-2005 Hartmut Kaiser<br>
+<p class="copyright">Copyright &copy; 2003-2006 Hartmut Kaiser<br>
   <br>
 <font size="2">Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) </font> </p>
 <span class="updated"></span>

diff --git a/doc/macro_expansion_process.html b/doc/macro_expansion_process.html
@@ -88,7 +88,7 @@
   </tr>
 </table>
 <hr size="1">
-<p class="copyright">Copyright &copy; 2003-2005 Hartmut Kaiser<br>
+<p class="copyright">Copyright &copy; 2003-2006 Hartmut Kaiser<br>
   <br>
 <font size="2">Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) </font> </p>
 <span class="updated"></span>

diff --git a/doc/predefined_macros.html b/doc/predefined_macros.html
@@ -147,7 +147,7 @@
   </tr>
 </table>
 <hr size="1">
-<p class="copyright">Copyright &copy; 2003-2005 Hartmut Kaiser<br>
+<p class="copyright">Copyright &copy; 2003-2006 Hartmut Kaiser<br>
   <br>
   <font size="2">Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) </font> </p>
 <span class="updated"></span>

diff --git a/doc/preface.html b/doc/preface.html
@@ -99,7 +99,7 @@
   </tr>
 </table>
 <hr size="1">
-<p class="copyright">Copyright &copy; 2003-2005 Hartmut Kaiser<br>
+<p class="copyright">Copyright &copy; 2003-2006 Hartmut Kaiser<br>
   <br>
 <font size="2">Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) </font> </p>
 <span class="updated"></span>

diff --git a/doc/quickstart.html b/doc/quickstart.html
@@ -110,7 +110,7 @@
   </tr>
 </table>
 <hr size="1">
-<p class="copyright">Copyright &copy; 2003-2005 Hartmut Kaiser<br>
+<p class="copyright">Copyright &copy; 2003-2006 Hartmut Kaiser<br>
   <br>
 <font size="2">Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) </font> </p>
 <span class="updated"></span>

diff --git a/doc/references.html b/doc/references.html
@@ -89,7 +89,7 @@
   </tr>
 </table>
 <hr size="1">
-<p class="copyright">Copyright &copy; 2003-2005 Hartmut Kaiser<br>
+<p class="copyright">Copyright &copy; 2003-2006 Hartmut Kaiser<br>
   <br>
   <font size="2">Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) </font> </p>
 <span class="updated"></span>

diff --git a/doc/samples.html b/doc/samples.html
@@ -99,7 +99,7 @@ <h2 dir="ltr">The  waveidl sample </h2>
   </tr>
 </table>
 <hr size="1">
-<p class="copyright">Copyright &copy; 2003-2005 Hartmut Kaiser<br>
+<p class="copyright">Copyright &copy; 2003-2006 Hartmut Kaiser<br>
     <br>
 <font size="2">Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) </font> </p>
 <span class="updated"></span>

diff --git a/doc/supported_pragmas.html b/doc/supported_pragmas.html
@@ -115,7 +115,7 @@
   </tr>
 </table>
 <hr size="1">
-<p class="copyright">Copyright &copy; 2003-2005 Hartmut Kaiser<br>
+<p class="copyright">Copyright &copy; 2003-2006 Hartmut Kaiser<br>
   <br>
 <font size="2">Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) </font> </p>
 <span class="updated"></span>

diff --git a/doc/token_ids.html b/doc/token_ids.html
@@ -970,7 +970,7 @@
   </tr>
 </table>
 <hr size="1">
-<p class="copyright">Copyright &copy; 2003-2005 Hartmut Kaiser<br>
+<p class="copyright">Copyright &copy; 2003-2006 Hartmut Kaiser<br>
   <br>
   <font size="2">Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) </font> </p>
 <span class="updated"></span>

diff --git a/doc/tracing_facility.html b/doc/tracing_facility.html
@@ -149,7 +149,7 @@
   </tr>
 </table>
 <hr size="1">
-<p class="copyright">Copyright &copy; 2003-2005 Hartmut Kaiser<br>
+<p class="copyright">Copyright &copy; 2003-2006 Hartmut Kaiser<br>
   <br>
 <font size="2">Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) </font> </p>
 <p class="copyright"><span class="updated">Last updated: 

diff --git a/doc/wave_driver.html b/doc/wave_driver.html
@@ -231,7 +231,7 @@
   </tr>
 </table>
 <hr size="1">
-<p class="copyright">Copyright &copy; 2003-2005 Hartmut Kaiser<br>
+<p class="copyright">Copyright &copy; 2003-2006 Hartmut Kaiser<br>
   <br>
 <font size="2">Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) </font> </p>
 <span class="updated"></span>

diff --git a/include/boost/wave.hpp b/include/boost/wave.hpp
@@ -3,7 +3,7 @@
 
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See accompanying file
     LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/

diff --git a/include/boost/wave/cpp_context.hpp b/include/boost/wave/cpp_context.hpp
@@ -4,7 +4,7 @@
     
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See accompanying file
     LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
@@ -164,6 +164,13 @@ class context {
     template <typename IteratorT2>
     bool is_defined_macro(IteratorT2 const &begin, IteratorT2 const &end) 
         { return macros.is_defined(begin, end); }
+    bool get_macro_definition(typename token_type::string_type const &name, 
+            bool &has_params, bool &is_predefined, position_type &pos,
+            std::vector<token_type> &parameters, token_sequence_type &definition)
+        { 
+            return macros.get_macro(name, has_params, is_predefined, pos,
+                parameters, definition); 
+        }
     bool remove_macro_definition(typename token_type::string_type const &name, 
             bool even_predefined = false)
         { 

diff --git a/include/boost/wave/cpp_exceptions.hpp b/include/boost/wave/cpp_exceptions.hpp
@@ -3,7 +3,7 @@
 
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See accompanying file
     LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
@@ -62,6 +62,41 @@
 #endif // BOOST_NO_STRINGSTREAM
 #endif // BOOST_WAVE_THROW
 
+#if !defined(BOOST_WAVE_THROW_NAME)
+#ifdef BOOST_NO_STRINGSTREAM
+#include <strstream>
+#define BOOST_WAVE_THROW_NAME(cls, code, msg, act_pos, name)                  \
+    {                                                                         \
+        using namespace boost::wave;                                          \
+        std::strstream stream;                                                \
+            stream << cls::severity_text(cls::code) << ": "                   \
+            << cls::error_text(cls::code);                                    \
+        if ((msg)[0] != 0) stream << ": " << (msg);                           \
+        stream << std::ends;                                                  \
+        std::string throwmsg = stream.str(); stream.freeze(false);            \
+        boost::throw_exception(cls(throwmsg.c_str(), cls::code,               \
+            (act_pos).get_line(), (act_pos).get_column(),                     \
+            (act_pos).get_file().c_str(), (name)));                           \
+    }                                                                         \
+    /**/
+#else
+#include <sstream>
+#define BOOST_WAVE_THROW_NAME(cls, code, msg, act_pos, name)                  \
+    {                                                                         \
+        using namespace boost::wave;                                          \
+        std::stringstream stream;                                             \
+            stream << cls::severity_text(cls::code) << ": "                   \
+            << cls::error_text(cls::code);                                    \
+        if ((msg)[0] != 0) stream << ": " << (msg);                           \
+        stream << std::ends;                                                  \
+        boost::throw_exception(cls(stream.str().c_str(), cls::code,           \
+            (act_pos).get_line(), (act_pos).get_column(),                     \
+            (act_pos).get_file().c_str(), (name)));                           \
+    }                                                                         \
+    /**/
+#endif // BOOST_NO_STRINGSTREAM
+#endif // BOOST_WAVE_THROW
+
 ///////////////////////////////////////////////////////////////////////////////
 namespace boost {
 namespace wave {
@@ -79,7 +114,7 @@ namespace util {
     };
 
     inline char const *
-    get_severity(severity level) 
+    get_severity(int level) 
     {
         static char const *severity_text[] = 
         {
@@ -111,9 +146,11 @@ class cpp_exception
     }
     ~cpp_exception() throw() {}
 
-    virtual char const *what() const throw() = 0;   // to be overloaded
+    virtual char const *what() const throw() = 0;           // to be overloaded
     virtual char const *description() const throw() = 0;
-    virtual int get_errorcode() const = 0;
+    virtual int get_errorcode() const throw() = 0;
+    virtual int get_severity() const throw() = 0;
+    virtual char const* get_related_name() const throw() = 0;
 
     int line_no() const throw() { return line; }
     int column_no() const throw() { return column; }
@@ -192,14 +229,18 @@ class preprocess_exception :
     {
         return buffer;
     }
-    util::severity get_severity() const
+    virtual int get_severity() const throw()
     {
         return level;
     }
-    int get_errorcode() const
+    virtual int get_errorcode() const throw()
     {
         return code;
     }
+    virtual char const* get_related_name() const throw()
+    {
+        return "<unknown>";
+    }
 
     static char const *error_text(int code)
     {
@@ -312,6 +353,32 @@ class preprocess_exception :
     error_code code;
 };
 
+///////////////////////////////////////////////////////////////////////////////
+//  Error during macro handling, this exception contains the related macro name
+class macro_handling_exception :
+    public preprocess_exception
+{
+public:
+    macro_handling_exception(char const *what_, error_code code, int line_, 
+        int column_, char const *filename_, char const *macroname) throw() 
+    :   preprocess_exception(what_, code, line_, column_, filename_)
+    {
+        unsigned int off = 0;
+        while (off < sizeof(name) && *macroname)
+            name[off++] = *macroname++;
+        name[off] = 0;
+    }
+    ~macro_handling_exception() throw() {}
+
+    char const* get_related_name() const 
+    {
+        return name;
+    }
+
+private:
+    char name[512];
+};
+
 ///////////////////////////////////////////////////////////////////////////////
 //
 //  The is_recoverable() function allows to decide, whether it is possible 

diff --git a/include/boost/wave/cpp_iteration_context.hpp b/include/boost/wave/cpp_iteration_context.hpp
@@ -4,7 +4,7 @@
     
     http://www.boost.org/
 
-    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+    Copyright (c) 2001-2006 Hartmut Kaiser. Distributed under the Boost
     Software License, Version 1.0. (See accompanying file
     LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/