Subject: [Boost-commit] svn:boost r74359 - in branches/release: . boost boost/spirit boost/spirit/home boost/spirit/home/classic/core/composite boost/spirit/home/karma boost/spirit/home/karma/binary boost/spirit/home/qi/binary boost/spirit/home/support boost/spirit/home/support/algorithm boost/spirit/home/support/detail boost/spirit/home/support/detail/endian boost/spirit/home/support/detail/integer boost/spirit/include libs libs/spirit libs/spirit/example libs/spirit/example/qi/compiler_tutorial libs/spirit/example/qi/compiler_tutorial/conjure3 libs/spirit/repository/doc libs/spirit/repository/doc/karma libs/spirit/repository/doc/qi libs/spirit/test libs/spirit/test/karma libs/spirit/test/lex libs/spirit/test/qi libs/spirit/test/support
From: hartmut.kaiser_at_[hidden]
Date: 2011-09-12 12:53:25
Author: hkaiser
Date: 2011-09-12 12:53:22 EDT (Mon, 12 Sep 2011)
New Revision: 74359
URL: http://svn.boost.org/trac/boost/changeset/74359
Log:
Spirit: Merging from trunk
Added:
branches/release/boost/spirit/home/support/detail/endian/ (props changed)
- copied from r74246, /trunk/boost/spirit/home/support/detail/endian/
Removed:
branches/release/boost/spirit/home/support/detail/integer/
Properties modified:
branches/release/ (props changed)
branches/release/boost/ (props changed)
branches/release/boost/spirit/ (props changed)
branches/release/boost/spirit/home/ (props changed)
branches/release/boost/spirit/home/karma/ (props changed)
branches/release/libs/ (props changed)
branches/release/libs/spirit/ (props changed)
branches/release/libs/spirit/example/ (props changed)
branches/release/libs/spirit/test/ (props changed)
Text files modified:
branches/release/boost/spirit/home/classic/core/composite/actions.hpp | 4 ++
branches/release/boost/spirit/home/classic/core/composite/composite.hpp | 4 ++
branches/release/boost/spirit/home/karma/binary/binary.hpp | 26 ++++++------
branches/release/boost/spirit/home/qi/binary/binary.hpp | 26 ++++++------
branches/release/boost/spirit/home/support/adapt_adt_attributes.hpp | 2
branches/release/boost/spirit/home/support/algorithm/any_if.hpp | 7 ++-
branches/release/boost/spirit/home/support/detail/endian.hpp | 12 ++++-
branches/release/boost/spirit/include/qi_as_string.hpp | 4 +-
branches/release/libs/spirit/example/qi/compiler_tutorial/Jamfile | 79 +++++++++++++++++++++++++++++++++++++--
branches/release/libs/spirit/example/qi/compiler_tutorial/conjure3/compiler.cpp | 12 +++---
branches/release/libs/spirit/repository/doc/Jamfile | 4 +-
branches/release/libs/spirit/repository/doc/karma/subrule.qbk | 4 +-
branches/release/libs/spirit/repository/doc/qi/nonterminals.qbk | 4 +-
branches/release/libs/spirit/repository/doc/qi/subrule.qbk | 4 +-
branches/release/libs/spirit/test/karma/auto1.cpp | 2
branches/release/libs/spirit/test/karma/binary1.cpp | 2
branches/release/libs/spirit/test/karma/binary2.cpp | 2
branches/release/libs/spirit/test/karma/binary3.cpp | 2
branches/release/libs/spirit/test/karma/repeat1.cpp | 2
branches/release/libs/spirit/test/karma/repeat2.cpp | 2
branches/release/libs/spirit/test/karma/sequence1.cpp | 2
branches/release/libs/spirit/test/karma/sequence2.cpp | 2
branches/release/libs/spirit/test/karma/wstream.cpp | 2
branches/release/libs/spirit/test/lex/regression_basic_lexer.cpp | 2
branches/release/libs/spirit/test/lex/regression_file_iterator1.cpp | 2
branches/release/libs/spirit/test/lex/regression_file_iterator3.cpp | 2
branches/release/libs/spirit/test/lex/regression_matlib_dynamic.cpp | 2
branches/release/libs/spirit/test/lex/regression_matlib_generate.cpp | 2
branches/release/libs/spirit/test/lex/regression_matlib_generate_switch.cpp | 2
branches/release/libs/spirit/test/lex/regression_syntax_error.cpp | 2
branches/release/libs/spirit/test/lex/state_switcher.cpp | 2
branches/release/libs/spirit/test/qi/attribute1.cpp | 4 +-
branches/release/libs/spirit/test/qi/attribute2.cpp | 4 +-
branches/release/libs/spirit/test/qi/repeat.cpp | 2
branches/release/libs/spirit/test/support/utree.cpp | 4 +-
35 files changed, 163 insertions(+), 77 deletions(-)
Modified: branches/release/boost/spirit/home/classic/core/composite/actions.hpp
==============================================================================
--- branches/release/boost/spirit/home/classic/core/composite/actions.hpp (original)
+++ branches/release/boost/spirit/home/classic/core/composite/actions.hpp 2011-09-12 12:53:22 EDT (Mon, 12 Sep 2011)
@@ -125,6 +125,10 @@
ActionT actor;
};
+#if BOOST_WORKAROUND(BOOST_MSVC, >= 1400)
+#pragma warning(pop)
+#endif
+
BOOST_SPIRIT_CLASSIC_NAMESPACE_END
}} // namespace BOOST_SPIRIT_CLASSIC_NS
Modified: branches/release/boost/spirit/home/classic/core/composite/composite.hpp
==============================================================================
--- branches/release/boost/spirit/home/classic/core/composite/composite.hpp (original)
+++ branches/release/boost/spirit/home/classic/core/composite/composite.hpp 2011-09-12 12:53:22 EDT (Mon, 12 Sep 2011)
@@ -140,6 +140,10 @@
boost::compressed_pair<left_embed_t, right_embed_t> subj;
};
+#if BOOST_WORKAROUND(BOOST_MSVC, >= 1400)
+#pragma warning(pop)
+#endif
+
BOOST_SPIRIT_CLASSIC_NAMESPACE_END
}} // namespace BOOST_SPIRIT_CLASSIC_NS
Modified: branches/release/boost/spirit/home/karma/binary/binary.hpp
==============================================================================
--- branches/release/boost/spirit/home/karma/binary/binary.hpp (original)
+++ branches/release/boost/spirit/home/karma/binary/binary.hpp 2011-09-12 12:53:22 EDT (Mon, 12 Sep 2011)
@@ -142,11 +142,11 @@
#endif
///////////////////////////////////////////////////////////////////////
- template <BOOST_SCOPED_ENUM(boost::integer::endianness) bits>
+ template <BOOST_SCOPED_ENUM(boost::endian::endianness) bits>
struct what;
template <>
- struct what<boost::integer::endianness::native>
+ struct what<boost::endian::endianness::native>
{
static info is()
{
@@ -155,7 +155,7 @@
};
template <>
- struct what<boost::integer::endianness::little>
+ struct what<boost::endian::endianness::little>
{
static info is()
{
@@ -164,7 +164,7 @@
};
template <>
- struct what<boost::integer::endianness::big>
+ struct what<boost::endian::endianness::big>
{
static info is()
{
@@ -174,7 +174,7 @@
}
///////////////////////////////////////////////////////////////////////////
- template <BOOST_SCOPED_ENUM(boost::integer::endianness) endian, int bits>
+ template <BOOST_SCOPED_ENUM(boost::endian::endianness) endian, int bits>
struct any_binary_generator
: primitive_generator<any_binary_generator<endian, bits> >
{
@@ -195,7 +195,7 @@
// Even if the endian types are not pod's (at least not in the
// definition of C++03) it seems to be safe to assume they are.
// This allows us to treat them as a sequence of consecutive bytes.
- boost::integer::endian<
+ boost::endian::endian<
endian, typename karma::detail::integer<bits>::type, bits
> p;
@@ -245,7 +245,7 @@
};
///////////////////////////////////////////////////////////////////////////
- template <BOOST_SCOPED_ENUM(boost::integer::endianness) endian, int bits>
+ template <BOOST_SCOPED_ENUM(boost::endian::endianness) endian, int bits>
struct literal_binary_generator
: primitive_generator<literal_binary_generator<endian, bits> >
{
@@ -296,7 +296,7 @@
return karma::detail::what<endian>::is();
}
- typedef boost::integer::endian<
+ typedef boost::endian::endian<
endian, typename karma::detail::integer<bits>::type, bits
> data_type;
@@ -308,7 +308,7 @@
///////////////////////////////////////////////////////////////////////////
namespace detail
{
- template <BOOST_SCOPED_ENUM(boost::integer::endianness) endian
+ template <BOOST_SCOPED_ENUM(boost::endian::endianness) endian
, int bits>
struct basic_binary
{
@@ -321,7 +321,7 @@
};
template <typename Modifiers
- , BOOST_SCOPED_ENUM(boost::integer::endianness) endian, int bits>
+ , BOOST_SCOPED_ENUM(boost::endian::endianness) endian, int bits>
struct basic_binary_literal
{
typedef literal_binary_generator<endian, bits> result_type;
@@ -334,16 +334,16 @@
};
}
-#define BOOST_SPIRIT_MAKE_BINARY_PRIMITIVE(name, endian, bits) \
+#define BOOST_SPIRIT_MAKE_BINARY_PRIMITIVE(name, endiantype, bits) \
template <typename Modifiers> \
struct make_primitive<tag::name, Modifiers> \
- : detail::basic_binary<boost::integer::endianness::endian, bits> {}; \
+ : detail::basic_binary<boost::endian::endianness::endiantype, bits> {}; \
\
template <typename Modifiers, typename A0> \
struct make_primitive<terminal_ex<tag::name, fusion::vector1<A0> > \
, Modifiers> \
: detail::basic_binary_literal<Modifiers \
- , boost::integer::endianness::endian, bits> {}; \
+ , boost::endian::endianness::endiantype, bits> {}; \
\
/***/
Modified: branches/release/boost/spirit/home/qi/binary/binary.hpp
==============================================================================
--- branches/release/boost/spirit/home/qi/binary/binary.hpp (original)
+++ branches/release/boost/spirit/home/qi/binary/binary.hpp 2011-09-12 12:53:22 EDT (Mon, 12 Sep 2011)
@@ -136,11 +136,11 @@
#endif
///////////////////////////////////////////////////////////////////////
- template <BOOST_SCOPED_ENUM(boost::integer::endianness) bits>
+ template <BOOST_SCOPED_ENUM(boost::endian::endianness) bits>
struct what;
template <>
- struct what<boost::integer::endianness::native>
+ struct what<boost::endian::endianness::native>
{
static std::string is()
{
@@ -149,7 +149,7 @@
};
template <>
- struct what<boost::integer::endianness::little>
+ struct what<boost::endian::endianness::little>
{
static char const* is()
{
@@ -158,7 +158,7 @@
};
template <>
- struct what<boost::integer::endianness::big>
+ struct what<boost::endian::endianness::big>
{
static char const* is()
{
@@ -168,13 +168,13 @@
}
///////////////////////////////////////////////////////////////////////////
- template <BOOST_SCOPED_ENUM(boost::integer::endianness) endian, int bits>
+ template <BOOST_SCOPED_ENUM(boost::endian::endianness) endian, int bits>
struct any_binary_parser : primitive_parser<any_binary_parser<endian, bits> >
{
template <typename Context, typename Iterator>
struct attribute
{
- typedef boost::integer::endian<
+ typedef boost::endian::endian<
endian, typename qi::detail::integer<bits>::type, bits
> type;
};
@@ -212,7 +212,7 @@
///////////////////////////////////////////////////////////////////////////
template <typename Int
- , BOOST_SCOPED_ENUM(boost::integer::endianness) endian, int bits>
+ , BOOST_SCOPED_ENUM(boost::endian::endianness) endian, int bits>
struct binary_lit_parser
: primitive_parser<binary_lit_parser<Int, endian, bits> >
{
@@ -237,7 +237,7 @@
// definition of C++03) it seems to be safe to assume they are
// (but in C++0x the endian types _are_ PODs).
// This allows us to treat them as a sequence of consecutive bytes.
- boost::integer::endian<
+ boost::endian::endian<
endian, typename qi::detail::integer<bits>::type, bits> attr_;
#if defined(BOOST_MSVC)
@@ -276,7 +276,7 @@
///////////////////////////////////////////////////////////////////////////
// Parser generators: make_xxx function (objects)
///////////////////////////////////////////////////////////////////////////
- template <BOOST_SCOPED_ENUM(boost::integer::endianness) endian, int bits>
+ template <BOOST_SCOPED_ENUM(boost::endian::endianness) endian, int bits>
struct make_binary_parser
{
typedef any_binary_parser<endian, bits> result_type;
@@ -287,7 +287,7 @@
};
template <typename Int
- , BOOST_SCOPED_ENUM(boost::integer::endianness) endian, int bits>
+ , BOOST_SCOPED_ENUM(boost::endian::endianness) endian, int bits>
struct make_binary_lit_parser
{
typedef binary_lit_parser<Int, endian, bits> result_type;
@@ -298,15 +298,15 @@
}
};
-#define BOOST_SPIRIT_MAKE_BINARY_PRIMITIVE(name, endian, bits) \
+#define BOOST_SPIRIT_MAKE_BINARY_PRIMITIVE(name, endiantype, bits) \
template <typename Modifiers> \
struct make_primitive<tag::name, Modifiers> \
- : make_binary_parser<boost::integer::endianness::endian, bits> {}; \
+ : make_binary_parser<boost::endian::endianness::endiantype, bits> {}; \
\
template <typename Modifiers, typename A0> \
struct make_primitive< \
terminal_ex<tag::name, fusion::vector1<A0> > , Modifiers> \
- : make_binary_lit_parser<A0, boost::integer::endianness::endian, bits> {};\
+ : make_binary_lit_parser<A0, boost::endian::endianness::endiantype, bits> {};\
\
/***/
Modified: branches/release/boost/spirit/home/support/adapt_adt_attributes.hpp
==============================================================================
--- branches/release/boost/spirit/home/support/adapt_adt_attributes.hpp (original)
+++ branches/release/boost/spirit/home/support/adapt_adt_attributes.hpp 2011-09-12 12:53:22 EDT (Mon, 12 Sep 2011)
@@ -1,4 +1,4 @@
-// Copyright (c) 2001-2010 Hartmut Kaiser
+// Copyright (c) 2001-2011 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)
Modified: branches/release/boost/spirit/home/support/algorithm/any_if.hpp
==============================================================================
--- branches/release/boost/spirit/home/support/algorithm/any_if.hpp (original)
+++ branches/release/boost/spirit/home/support/algorithm/any_if.hpp 2011-09-12 12:53:22 EDT (Mon, 12 Sep 2011)
@@ -42,7 +42,7 @@
{
///////////////////////////////////////////////////////////////////////
template <typename Iterator, typename Pred>
- struct apply_predicate
+ struct apply_predicate
: mpl::apply1<Pred, typename fusion::result_of::value_of<Iterator>::type>
{};
@@ -180,7 +180,10 @@
any_if (First1 const& first1, First2 const& first2, Last1 const& last1
, Last2 const& last2, F& f, mpl::false_)
{
- return f(*first1, attribute_value<Pred, First1, Last2>(first2)) ||
+ typename result_of::attribute_value<First1, First2, Last2, Pred>::type
+ attribute = attribute_value<Pred, First1, Last2>(first2);
+
+ return f(*first1, attribute) ||
detail::any_if<Pred>(
fusion::next(first1)
, attribute_next<Pred, First1, Last2>(first2)
Modified: branches/release/boost/spirit/home/support/detail/endian.hpp
==============================================================================
--- branches/release/boost/spirit/home/support/detail/endian.hpp (original)
+++ branches/release/boost/spirit/home/support/detail/endian.hpp 2011-09-12 12:53:22 EDT (Mon, 12 Sep 2011)
@@ -14,14 +14,20 @@
#include <boost/version.hpp>
// We need to treat the endian number types as PODs
-#define BOOST_ENDIAN_FORCE_PODNESS
+#if !defined(BOOST_ENDIAN_FORCE_PODNESS)
+#define BOOST_ENDIAN_FORCE_PODNESS 1
+#endif
// If Boost has the endian library, use it, otherwise use an adapted version
// included with Spirit
#if BOOST_VERSION >= 104900
-#include <boost/integer/endian.hpp>
+#include <boost/endian/integers.hpp>
#else
-#include <boost/spirit/home/support/detail/integer/endian.hpp>
+#include <boost/spirit/home/support/detail/endian/endian.hpp>
+namespace boost { namespace endian
+{
+ using namespace boost::spirit::endian;
+}}
#endif
#endif
Modified: branches/release/boost/spirit/include/qi_as_string.hpp
==============================================================================
--- branches/release/boost/spirit/include/qi_as_string.hpp (original)
+++ branches/release/boost/spirit/include/qi_as_string.hpp 2011-09-12 12:53:22 EDT (Mon, 12 Sep 2011)
@@ -1,6 +1,6 @@
/*=============================================================================
- Copyright (c) 2001-2010 Joel de Guzman
- Copyright (c) 2001-2010 Hartmut Kaiser
+ Copyright (c) 2001-2011 Joel de Guzman
+ Copyright (c) 2001-2011 Hartmut Kaiser
http://spirit.sourceforge.net/
Distributed under the Boost Software License, Version 1.0. (See accompanying
Modified: branches/release/libs/spirit/example/qi/compiler_tutorial/Jamfile
==============================================================================
--- branches/release/libs/spirit/example/qi/compiler_tutorial/Jamfile (original)
+++ branches/release/libs/spirit/example/qi/compiler_tutorial/Jamfile 2011-09-12 12:53:22 EDT (Mon, 12 Sep 2011)
@@ -8,10 +8,13 @@
: requirements
<toolset>gcc:<c++-template-depth>300
<toolset>darwin:<cxxflags>-ftemplate-depth-300
- :
+ <variant>release:<location>"bin/release"
+ <variant>debug:<location>"bin/debug"
:
;
+import modules ;
+
exe calc1 : calc1.cpp ;
exe calc2 : calc2.cpp ;
exe calc3 : calc3.cpp ;
@@ -25,7 +28,7 @@
calc7/expression.cpp
calc7/statement.cpp
calc7/main.cpp
- ;
+;
exe calc8 :
calc8/vm.cpp
@@ -33,7 +36,7 @@
calc8/expression.cpp
calc8/statement.cpp
calc8/main.cpp
- ;
+;
exe mini_c :
mini_c/vm.cpp
@@ -42,7 +45,7 @@
mini_c/statement.cpp
mini_c/function.cpp
mini_c/main.cpp
- ;
+;
exe conjure1 :
conjure1/vm.cpp
@@ -51,7 +54,7 @@
conjure1/statement.cpp
conjure1/function.cpp
conjure1/main.cpp
- ;
+;
exe conjure2 :
conjure2/compiler.cpp
@@ -61,6 +64,72 @@
conjure2/main.cpp
conjure2/statement.cpp
conjure2/vm.cpp
+;
+
+#==============================================================================
+# conjure3 and above require LLVM. Make sure you provide the
+# LLVM_PATH in your bjam invocation. E.g.:
+#
+# bjam -sLLVM_PATH=C:/dev/llvm conjure3
+#
+#==============================================================================
+
+if [ modules.peek : LLVM_PATH ]
+{
+ LLVM_PATH = [ modules.peek : LLVM_PATH ] ;
+}
+
+if $(LLVM_PATH)
+{
+ path-constant LLVM_LIB_DEBUG_PATH : $(LLVM_PATH)/lib/Debug ;
+ path-constant LLVM_LIB_RELEASE_PATH : $(LLVM_PATH)/lib/Release ;
+
+ llvm_linker_flags =
+ "advapi32.lib"
+ "shell32.lib"
+ ;
+
+ llvm_debug_libs = [ glob $(LLVM_LIB_DEBUG_PATH)/LLVM*.lib ] ;
+ llvm_release_libs = [ glob $(LLVM_LIB_RELEASE_PATH)/LLVM*.lib ] ;
+
+ rule build_exe_1 ( target-name : sources + : requirements * )
+ {
+ local llvm_lib ;
+ if <variant>debug in $(requirements)
+ {
+ llvm_lib = $(llvm_debug_libs) ;
+ }
+ else
+ {
+ llvm_lib = $(llvm_release_libs) ;
+ }
+
+ exe $(target-name)
+ : $(sources)
+ $(llvm_lib)
+ : $(requirements)
+ <toolset>msvc
+ <include>$(LLVM_PATH)/include
+ <linkflags>$(llvm_linker_flags)
+ ;
+ }
+
+ rule build_exe ( target-name : sources + )
+ {
+ build_exe_1 $(target-name) : $(sources) : <variant>debug ;
+ build_exe_1 $(target-name) : $(sources) : <variant>release ;
+ }
+
+ build_exe conjure3 :
+ conjure3/compiler.cpp
+ conjure3/expression.cpp
+ conjure3/function.cpp
+ conjure3/lexer.cpp
+ conjure3/main.cpp
+ conjure3/statement.cpp
+ conjure3/vm.cpp
;
+}
+
Modified: branches/release/libs/spirit/example/qi/compiler_tutorial/conjure3/compiler.cpp
==============================================================================
--- branches/release/libs/spirit/example/qi/compiler_tutorial/conjure3/compiler.cpp (original)
+++ branches/release/libs/spirit/example/qi/compiler_tutorial/conjure3/compiler.cpp 2011-09-12 12:53:22 EDT (Mon, 12 Sep 2011)
@@ -313,8 +313,8 @@
function::arg_range function::args() const
{
BOOST_ASSERT(c != 0);
- argval_iterator first(f->arg_begin(), to_value());
- argval_iterator last(f->arg_end(), to_value());
+ arg_val_iterator first(f->arg_begin(), to_value());
+ arg_val_iterator last(f->arg_end(), to_value());
return arg_range(first, last);
}
@@ -449,12 +449,12 @@
, std::string const& name
, std::size_t nargs)
{
- llvm::Type* int_type =
+ llvm::Type const* int_type =
llvm::Type::getIntNTy(context(), int_size);
- llvm::Type* void_type = llvm::Type::getVoidTy(context());
+ llvm::Type const* void_type = llvm::Type::getVoidTy(context());
- std::vector<llvm::Type*> ints(nargs, int_type);
- llvm::Type* return_type = void_return ? void_type : int_type;
+ std::vector<llvm::Type const*> ints(nargs, int_type);
+ llvm::Type const* return_type = void_return ? void_type : int_type;
llvm::FunctionType* function_type =
llvm::FunctionType::get(void_return ? void_type : int_type, ints, false);
Modified: branches/release/libs/spirit/repository/doc/Jamfile
==============================================================================
--- branches/release/libs/spirit/repository/doc/Jamfile (original)
+++ branches/release/libs/spirit/repository/doc/Jamfile 2011-09-12 12:53:22 EDT (Mon, 12 Sep 2011)
@@ -1,6 +1,6 @@
#==============================================================================
-# Copyright (c) 2001-2010 Joel de Guzman
-# Copyright (c) 2001-2010 Hartmut Kaiser
+# Copyright (c) 2001-2011 Joel de Guzman
+# Copyright (c) 2001-2011 Hartmut Kaiser
#
# Use, modification and distribution is subject to the Boost Software
# License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
Modified: branches/release/libs/spirit/repository/doc/karma/subrule.qbk
==============================================================================
--- branches/release/libs/spirit/repository/doc/karma/subrule.qbk (original)
+++ branches/release/libs/spirit/repository/doc/karma/subrule.qbk 2011-09-12 12:53:22 EDT (Mon, 12 Sep 2011)
@@ -1,6 +1,6 @@
[/==============================================================================
- Copyright (C) 2001-2010 Joel de Guzman
- Copyright (C) 2001-2010 Hartmut Kaiser
+ Copyright (C) 2001-2011 Joel de Guzman
+ Copyright (C) 2001-2011 Hartmut Kaiser
Copyright (C) 2009 Francois Barel
Distributed under the Boost Software License, Version 1.0. (See accompanying
Modified: branches/release/libs/spirit/repository/doc/qi/nonterminals.qbk
==============================================================================
--- branches/release/libs/spirit/repository/doc/qi/nonterminals.qbk (original)
+++ branches/release/libs/spirit/repository/doc/qi/nonterminals.qbk 2011-09-12 12:53:22 EDT (Mon, 12 Sep 2011)
@@ -1,6 +1,6 @@
[/==============================================================================
- Copyright (C) 2001-2010 Joel de Guzman
- Copyright (C) 2001-2010 Hartmut Kaiser
+ Copyright (C) 2001-2011 Joel de Guzman
+ Copyright (C) 2001-2011 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)
Modified: branches/release/libs/spirit/repository/doc/qi/subrule.qbk
==============================================================================
--- branches/release/libs/spirit/repository/doc/qi/subrule.qbk (original)
+++ branches/release/libs/spirit/repository/doc/qi/subrule.qbk 2011-09-12 12:53:22 EDT (Mon, 12 Sep 2011)
@@ -1,6 +1,6 @@
[/==============================================================================
- Copyright (C) 2001-2010 Joel de Guzman
- Copyright (C) 2001-2010 Hartmut Kaiser
+ Copyright (C) 2001-2011 Joel de Guzman
+ Copyright (C) 2001-2011 Hartmut Kaiser
Copyright (C) 2009 Francois Barel
Distributed under the Boost Software License, Version 1.0. (See accompanying
Modified: branches/release/libs/spirit/test/karma/auto1.cpp
==============================================================================
--- branches/release/libs/spirit/test/karma/auto1.cpp (original)
+++ branches/release/libs/spirit/test/karma/auto1.cpp 2011-09-12 12:53:22 EDT (Mon, 12 Sep 2011)
@@ -1,4 +1,4 @@
-// Copyright (c) 2001-2010 Hartmut Kaiser
+// Copyright (c) 2001-2011 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)
Modified: branches/release/libs/spirit/test/karma/binary1.cpp
==============================================================================
--- branches/release/libs/spirit/test/karma/binary1.cpp (original)
+++ branches/release/libs/spirit/test/karma/binary1.cpp 2011-09-12 12:53:22 EDT (Mon, 12 Sep 2011)
@@ -1,4 +1,4 @@
-// Copyright (c) 2001-2010 Hartmut Kaiser
+// Copyright (c) 2001-2011 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)
Modified: branches/release/libs/spirit/test/karma/binary2.cpp
==============================================================================
--- branches/release/libs/spirit/test/karma/binary2.cpp (original)
+++ branches/release/libs/spirit/test/karma/binary2.cpp 2011-09-12 12:53:22 EDT (Mon, 12 Sep 2011)
@@ -1,4 +1,4 @@
-// Copyright (c) 2001-2010 Hartmut Kaiser
+// Copyright (c) 2001-2011 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)
Modified: branches/release/libs/spirit/test/karma/binary3.cpp
==============================================================================
--- branches/release/libs/spirit/test/karma/binary3.cpp (original)
+++ branches/release/libs/spirit/test/karma/binary3.cpp 2011-09-12 12:53:22 EDT (Mon, 12 Sep 2011)
@@ -1,4 +1,4 @@
-// Copyright (c) 2001-2010 Hartmut Kaiser
+// Copyright (c) 2001-2011 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)
Modified: branches/release/libs/spirit/test/karma/repeat1.cpp
==============================================================================
--- branches/release/libs/spirit/test/karma/repeat1.cpp (original)
+++ branches/release/libs/spirit/test/karma/repeat1.cpp 2011-09-12 12:53:22 EDT (Mon, 12 Sep 2011)
@@ -1,4 +1,4 @@
-// Copyright (c) 2001-2010 Hartmut Kaiser
+// Copyright (c) 2001-2011 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)
Modified: branches/release/libs/spirit/test/karma/repeat2.cpp
==============================================================================
--- branches/release/libs/spirit/test/karma/repeat2.cpp (original)
+++ branches/release/libs/spirit/test/karma/repeat2.cpp 2011-09-12 12:53:22 EDT (Mon, 12 Sep 2011)
@@ -1,4 +1,4 @@
-// Copyright (c) 2001-2010 Hartmut Kaiser
+// Copyright (c) 2001-2011 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)
Modified: branches/release/libs/spirit/test/karma/sequence1.cpp
==============================================================================
--- branches/release/libs/spirit/test/karma/sequence1.cpp (original)
+++ branches/release/libs/spirit/test/karma/sequence1.cpp 2011-09-12 12:53:22 EDT (Mon, 12 Sep 2011)
@@ -1,4 +1,4 @@
-// Copyright (c) 2001-2010 Hartmut Kaiser
+// Copyright (c) 2001-2011 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)
Modified: branches/release/libs/spirit/test/karma/sequence2.cpp
==============================================================================
--- branches/release/libs/spirit/test/karma/sequence2.cpp (original)
+++ branches/release/libs/spirit/test/karma/sequence2.cpp 2011-09-12 12:53:22 EDT (Mon, 12 Sep 2011)
@@ -1,4 +1,4 @@
-// Copyright (c) 2001-2010 Hartmut Kaiser
+// Copyright (c) 2001-2011 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)
Modified: branches/release/libs/spirit/test/karma/wstream.cpp
==============================================================================
--- branches/release/libs/spirit/test/karma/wstream.cpp (original)
+++ branches/release/libs/spirit/test/karma/wstream.cpp 2011-09-12 12:53:22 EDT (Mon, 12 Sep 2011)
@@ -1,4 +1,4 @@
-// Copyright (c) 2001-2010 Hartmut Kaiser
+// Copyright (c) 2001-2011 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)
Modified: branches/release/libs/spirit/test/lex/regression_basic_lexer.cpp
==============================================================================
--- branches/release/libs/spirit/test/lex/regression_basic_lexer.cpp (original)
+++ branches/release/libs/spirit/test/lex/regression_basic_lexer.cpp 2011-09-12 12:53:22 EDT (Mon, 12 Sep 2011)
@@ -1,4 +1,4 @@
-// Copyright (c) 2001-2010 Hartmut Kaiser
+// Copyright (c) 2001-2011 Hartmut Kaiser
// Copyright (c) 2009 Pavel Baranov
//
// Distributed under the Boost Software License, Version 1.0. (See accompanying
Modified: branches/release/libs/spirit/test/lex/regression_file_iterator1.cpp
==============================================================================
--- branches/release/libs/spirit/test/lex/regression_file_iterator1.cpp (original)
+++ branches/release/libs/spirit/test/lex/regression_file_iterator1.cpp 2011-09-12 12:53:22 EDT (Mon, 12 Sep 2011)
@@ -1,4 +1,4 @@
-// Copyright (c) 2001-2010 Hartmut Kaiser
+// Copyright (c) 2001-2011 Hartmut Kaiser
// Copyright (c) 2010 Mathias Gaunard
//
// Distributed under the Boost Software License, Version 1.0. (See accompanying
Modified: branches/release/libs/spirit/test/lex/regression_file_iterator3.cpp
==============================================================================
--- branches/release/libs/spirit/test/lex/regression_file_iterator3.cpp (original)
+++ branches/release/libs/spirit/test/lex/regression_file_iterator3.cpp 2011-09-12 12:53:22 EDT (Mon, 12 Sep 2011)
@@ -1,4 +1,4 @@
-// Copyright (c) 2001-2010 Hartmut Kaiser
+// Copyright (c) 2001-2011 Hartmut Kaiser
// Copyright (c) 2010 Mathias Gaunard
//
// Distributed under the Boost Software License, Version 1.0. (See accompanying
Modified: branches/release/libs/spirit/test/lex/regression_matlib_dynamic.cpp
==============================================================================
--- branches/release/libs/spirit/test/lex/regression_matlib_dynamic.cpp (original)
+++ branches/release/libs/spirit/test/lex/regression_matlib_dynamic.cpp 2011-09-12 12:53:22 EDT (Mon, 12 Sep 2011)
@@ -1,4 +1,4 @@
-// Copyright (c) 2001-2010 Hartmut Kaiser
+// Copyright (c) 2001-2011 Hartmut Kaiser
// Copyright (c) 2009 Carl Barron
//
// Distributed under the Boost Software License, Version 1.0. (See accompanying
Modified: branches/release/libs/spirit/test/lex/regression_matlib_generate.cpp
==============================================================================
--- branches/release/libs/spirit/test/lex/regression_matlib_generate.cpp (original)
+++ branches/release/libs/spirit/test/lex/regression_matlib_generate.cpp 2011-09-12 12:53:22 EDT (Mon, 12 Sep 2011)
@@ -1,4 +1,4 @@
-// Copyright (c) 2001-2010 Hartmut Kaiser
+// Copyright (c) 2001-2011 Hartmut Kaiser
// Copyright (c) 2009 Carl Barron
//
// Distributed under the Boost Software License, Version 1.0. (See accompanying
Modified: branches/release/libs/spirit/test/lex/regression_matlib_generate_switch.cpp
==============================================================================
--- branches/release/libs/spirit/test/lex/regression_matlib_generate_switch.cpp (original)
+++ branches/release/libs/spirit/test/lex/regression_matlib_generate_switch.cpp 2011-09-12 12:53:22 EDT (Mon, 12 Sep 2011)
@@ -1,4 +1,4 @@
-// Copyright (c) 2001-2010 Hartmut Kaiser
+// Copyright (c) 2001-2011 Hartmut Kaiser
// Copyright (c) 2009 Carl Barron
//
// Distributed under the Boost Software License, Version 1.0. (See accompanying
Modified: branches/release/libs/spirit/test/lex/regression_syntax_error.cpp
==============================================================================
--- branches/release/libs/spirit/test/lex/regression_syntax_error.cpp (original)
+++ branches/release/libs/spirit/test/lex/regression_syntax_error.cpp 2011-09-12 12:53:22 EDT (Mon, 12 Sep 2011)
@@ -1,4 +1,4 @@
-// Copyright (c) 2001-2010 Hartmut Kaiser
+// Copyright (c) 2001-2011 Hartmut Kaiser
// Copyright (c) 2009 Jean-Francois Ostiguy
//
// Distributed under the Boost Software License, Version 1.0. (See accompanying
Modified: branches/release/libs/spirit/test/lex/state_switcher.cpp
==============================================================================
--- branches/release/libs/spirit/test/lex/state_switcher.cpp (original)
+++ branches/release/libs/spirit/test/lex/state_switcher.cpp 2011-09-12 12:53:22 EDT (Mon, 12 Sep 2011)
@@ -1,4 +1,4 @@
-// Copyright (c) 2001-2010 Hartmut Kaiser
+// Copyright (c) 2001-2011 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)
Modified: branches/release/libs/spirit/test/qi/attribute1.cpp
==============================================================================
--- branches/release/libs/spirit/test/qi/attribute1.cpp (original)
+++ branches/release/libs/spirit/test/qi/attribute1.cpp 2011-09-12 12:53:22 EDT (Mon, 12 Sep 2011)
@@ -1,6 +1,6 @@
/*=============================================================================
- Copyright (c) 2001-2010 Hartmut Kaiser
- Copyright (c) 2001-2010 Joel de Guzman
+ Copyright (c) 2001-2011 Hartmut Kaiser
+ Copyright (c) 2001-2011 Joel de Guzman
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)
Modified: branches/release/libs/spirit/test/qi/attribute2.cpp
==============================================================================
--- branches/release/libs/spirit/test/qi/attribute2.cpp (original)
+++ branches/release/libs/spirit/test/qi/attribute2.cpp 2011-09-12 12:53:22 EDT (Mon, 12 Sep 2011)
@@ -1,6 +1,6 @@
/*=============================================================================
- Copyright (c) 2001-2010 Hartmut Kaiser
- Copyright (c) 2001-2010 Joel de Guzman
+ Copyright (c) 2001-2011 Hartmut Kaiser
+ Copyright (c) 2001-2011 Joel de Guzman
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)
Modified: branches/release/libs/spirit/test/qi/repeat.cpp
==============================================================================
--- branches/release/libs/spirit/test/qi/repeat.cpp (original)
+++ branches/release/libs/spirit/test/qi/repeat.cpp 2011-09-12 12:53:22 EDT (Mon, 12 Sep 2011)
@@ -1,5 +1,5 @@
/*=============================================================================
- Copyright (c) 2001-2010 Joel de Guzman
+ Copyright (c) 2001-2011 Joel de Guzman
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)
Modified: branches/release/libs/spirit/test/support/utree.cpp
==============================================================================
--- branches/release/libs/spirit/test/support/utree.cpp (original)
+++ branches/release/libs/spirit/test/support/utree.cpp 2011-09-12 12:53:22 EDT (Mon, 12 Sep 2011)
@@ -1,6 +1,6 @@
/*=============================================================================
- Copyright (c) 2001-2010 Joel de Guzman
- Copyright (c) 2001-2010 Hartmut Kaiser
+ Copyright (c) 2001-2011 Joel de Guzman
+ Copyright (c) 2001-2011 Hartmut Kaiser
Copyright (c) 2010 Bryce Lelbach
Distributed under the Boost Software License, Version 1.0. (See accompanying