Update of /cvsroot/boost/boost/boost/wave/cpplexer
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv30735/boost/wave/cpplexer
Modified Files:
cpp_lex_interface.hpp cpp_lex_iterator.hpp
Added Files:
cpp_lex_interface_generator.hpp
Log Message:
Factored out the pure lex_input_interface to simplify writing different lexer
types for Wave.
--- NEW FILE: cpp_lex_interface_generator.hpp ---
/*=============================================================================
Boost.Wave: A Standard compliant C++ preprocessor library
Definition of the abstract lexer interface
http://www.boost.org/
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)
=============================================================================*/
#if !defined(BOOST_WAVE_LEX_INTERFACE_GENERATOR_HPP_INCLUDED)
#define BOOST_WAVE_LEX_INTERFACE_GENERATOR_HPP_INCLUDED
#include <boost/wave/wave_config.hpp>
#include <boost/wave/util/file_position.hpp>
#include <boost/wave/language_support.hpp>
#include <boost/wave/cpplexer/cpp_lex_interface.hpp>
// this must occur after all of the includes and before any code appears
#ifdef BOOST_HAS_ABI_HEADERS
#include BOOST_ABI_PREFIX
#endif
// suppress warnings about dependent classes not being exported from the dll
#ifdef BOOST_MSVC
#pragma warning(push)
#pragma warning(disable : 4251 4231 4660)
#endif
///////////////////////////////////////////////////////////////////////////////
namespace boost {
namespace wave {
namespace cpplexer {
#if BOOST_WAVE_SEPARATE_LEXER_INSTANTIATION != 0
#define BOOST_WAVE_NEW_LEXER_DECL BOOST_WAVE_DECL
#else
#define BOOST_WAVE_NEW_LEXER_DECL
#endif
///////////////////////////////////////////////////////////////////////////////
//
// new_lexer_gen: generates a new instance of the required C++ lexer
//
///////////////////////////////////////////////////////////////////////////////
template <
typename IteratorT,
typename PositionT = boost::wave::util::file_position_type
>
struct BOOST_WAVE_NEW_LEXER_DECL new_lexer_gen
{
// The NewLexer function allows the opaque generation of a new lexer object.
// It is coupled to the token type to allow to decouple the lexer/token
// configurations at compile time.
static lex_input_interface<lex_token<PositionT> > *
new_lexer(IteratorT const &first, IteratorT const &last,
PositionT const &pos, boost::wave::language_support language);
};
#undef BOOST_WAVE_NEW_LEXER_DECL
///////////////////////////////////////////////////////////////////////////////
//
// The lex_input_interface_generator helps to instantiate a concrete lexer
// to be used by the Wave preprocessor module.
// This is done to allow compile time reduction.
//
///////////////////////////////////////////////////////////////////////////////
template <typename TokenT>
struct lex_input_interface_generator
: lex_input_interface<TokenT>
{
typedef typename lex_input_interface<TokenT>::position_type position_type;
~lex_input_interface_generator() {}
// The new_lexer function allows the opaque generation of a new lexer object.
// It is coupled to the token type to allow to distinguish different
// lexer/token configurations at compile time.
template <typename IteratorT>
static lex_input_interface<TokenT> *
new_lexer(IteratorT const &first, IteratorT const &last,
position_type const &pos, boost::wave::language_support language)
{
return new_lexer_gen<IteratorT, position_type>::new_lexer (first, last,
pos, language);
}
};
///////////////////////////////////////////////////////////////////////////////
} // namespace cpplexer
} // namespace wave
} // namespace boost
#ifdef BOOST_MSVC
#pragma warning(pop)
#endif
// the suffix header occurs after all of the code
#ifdef BOOST_HAS_ABI_HEADERS
#include BOOST_ABI_SUFFIX
#endif
#endif // !defined(BOOST_WAVE_LEX_INTERFACE_GENERATOR_HPP_INCLUDED)
Index: cpp_lex_interface.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/wave/cpplexer/cpp_lex_interface.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- cpp_lex_interface.hpp 17 Mar 2006 22:40:01 -0000 1.7
+++ cpp_lex_interface.hpp 22 Nov 2006 02:33:44 -0000 1.8
@@ -33,35 +33,6 @@
namespace wave {
namespace cpplexer {
-#if BOOST_WAVE_SEPARATE_LEXER_INSTANTIATION != 0
-#define BOOST_WAVE_NEW_LEXER_DECL BOOST_WAVE_DECL
-#else
-#define BOOST_WAVE_NEW_LEXER_DECL
-#endif
-
-///////////////////////////////////////////////////////////////////////////////
-//
-// new_lexer_gen: generates a new instance of the required C++ lexer
-//
-///////////////////////////////////////////////////////////////////////////////
-template <typename TokenT> struct lex_input_interface;
-
-template <
- typename IteratorT,
- typename PositionT = boost::wave::util::file_position_type
->
-struct BOOST_WAVE_NEW_LEXER_DECL new_lexer_gen
-{
-// The NewLexer function allows the opaque generation of a new lexer object.
-// It is coupled to the token type to allow to decouple the lexer/token
-// configurations at compile time.
- static lex_input_interface<lex_token<PositionT> > *
- new_lexer(IteratorT const &first, IteratorT const &last,
- PositionT const &pos, boost::wave::language_support language);
-};
-
-#undef BOOST_WAVE_NEW_LEXER_DECL
-
///////////////////////////////////////////////////////////////////////////////
//
// The lex_input_interface decouples the lex_iterator_shim from the actual
@@ -75,25 +46,13 @@
{
typedef typename TokenT::position_type position_type;
- virtual TokenT get() = 0;
- virtual void set_position(position_type const &pos) = 0;
virtual ~lex_input_interface() {}
+ virtual TokenT get() = 0;
+ virtual void set_position(position_type const &pos) = 0;
#if BOOST_WAVE_SUPPORT_PRAGMA_ONCE != 0
virtual bool has_include_guards(std::string& guard_name) const = 0;
#endif
-
-// The new_lexer function allows the opaque generation of a new lexer object.
-// It is coupled to the token type to allow to distinguish different
-// lexer/token configurations at compile time.
- template <typename IteratorT>
- static lex_input_interface *
- new_lexer(IteratorT const &first, IteratorT const &last,
- position_type const &pos, boost::wave::language_support language)
- {
- return new_lexer_gen<IteratorT, position_type>::new_lexer (first,
last,
- pos, language);
- }
};
///////////////////////////////////////////////////////////////////////////////
Index: cpp_lex_iterator.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/wave/cpplexer/cpp_lex_iterator.hpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- cpp_lex_iterator.hpp 18 Sep 2006 23:24:30 -0000 1.10
+++ cpp_lex_iterator.hpp 22 Nov 2006 02:33:44 -0000 1.11
@@ -23,7 +23,7 @@
#include <boost/wave/wave_config.hpp>
#include <boost/wave/util/file_position.hpp>
#include <boost/wave/util/functor_input.hpp>
-#include <boost/wave/cpplexer/cpp_lex_interface.hpp>
+#include <boost/wave/cpplexer/cpp_lex_interface_generator.hpp>
#include <boost/wave/language_support.hpp>
@@ -59,7 +59,7 @@
template <typename IteratorT>
lex_iterator_functor_shim(IteratorT const &first, IteratorT const &last,
position_type const &pos, boost::wave::language_support language)
- : functor_ptr(lex_input_interface<TokenT>
+ : functor_ptr(lex_input_interface_generator<TokenT>
::new_lexer(first, last, pos, language))
#if 0 != __DECCXX_VER
, eof()
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Boost-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/boost-cvs
