Update of /cvsroot/boost/boost/boost/spirit/tree
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv536
Modified Files:
ast.hpp ast_fwd.hpp common.hpp common_fwd.hpp parse_tree.hpp
parse_tree_fwd.hpp parse_tree_utils.hpp parsetree.dtd
tree_to_xml.hpp
Log Message:
Fixed compilation problem in CLiPP.
Index: ast.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/spirit/tree/ast.hpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- ast.hpp 4 Jan 2007 13:10:28 -0000 1.19
+++ ast.hpp 14 Mar 2007 20:48:54 -0000 1.20
@@ -1,5 +1,6 @@
/*=============================================================================
Copyright (c) 2001-2003 Daniel Nuffer
+ Copyright (c) 2001-2007 Hartmut Kaiser
http://spirit.sourceforge.net/
Use, modification and distribution is subject to the Boost Software
@@ -23,31 +24,34 @@
// tree_policy can be found.
template <
typename IteratorT,
- typename NodeFactoryT
+ typename NodeFactoryT,
+ typename T
>
struct ast_match_policy :
public common_tree_match_policy<
- ast_match_policy<IteratorT, NodeFactoryT>,
+ ast_match_policy<IteratorT, NodeFactoryT, T>,
IteratorT,
NodeFactoryT,
ast_tree_policy<
- ast_match_policy<IteratorT, NodeFactoryT>,
+ ast_match_policy<IteratorT, NodeFactoryT, T>,
NodeFactoryT
- >
+ >,
+ T
>
{
typedef
common_tree_match_policy<
- ast_match_policy<IteratorT, NodeFactoryT>,
+ ast_match_policy<IteratorT, NodeFactoryT, T>,
IteratorT,
NodeFactoryT,
ast_tree_policy<
- ast_match_policy<IteratorT, NodeFactoryT>,
+ ast_match_policy<IteratorT, NodeFactoryT, T>,
NodeFactoryT
- >
+ >,
+ T
>
common_tree_match_policy_;
-
+
ast_match_policy()
{
}
@@ -181,8 +185,8 @@
}
}
- template <typename FunctorT>
- static void apply_op_to_match(FunctorT const& op, match_t& m)
+ template <typename FunctorT, typename MatchT>
+ static void apply_op_to_match(FunctorT const& op, MatchT& m)
{
op(m);
}
@@ -190,11 +194,11 @@
namespace impl {
- template <typename IteratorT, typename NodeFactoryT>
- struct tree_policy_selector<ast_match_policy<IteratorT, NodeFactoryT> >
+ template <typename IteratorT, typename NodeFactoryT, typename T>
+ struct tree_policy_selector<ast_match_policy<IteratorT, NodeFactoryT, T> >
{
typedef ast_tree_policy<
- ast_match_policy<IteratorT, NodeFactoryT>, NodeFactoryT> type;
+ ast_match_policy<IteratorT, NodeFactoryT, T>, NodeFactoryT> type;
};
} // namespace impl
@@ -210,7 +214,6 @@
typedef gen_ast_node_parser<T> self_t;
typedef gen_ast_node_parser_gen parser_generator_t;
typedef unary_parser_category parser_category_t;
-// typedef gen_ast_node_parser<T> const &embed_t;
gen_ast_node_parser(T const& a)
: unary<T, parser<gen_ast_node_parser<T> > >(a) {}
Index: ast_fwd.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/spirit/tree/ast_fwd.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ast_fwd.hpp 9 Feb 2006 23:10:00 -0000 1.1
+++ ast_fwd.hpp 14 Mar 2007 20:48:54 -0000 1.2
@@ -18,7 +18,8 @@
template <
typename IteratorT,
- typename NodeFactoryT = node_val_data_factory<nil_t>
+ typename NodeFactoryT = node_val_data_factory<nil_t>,
+ typename T = nil_t
>
struct ast_match_policy;
Index: common.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/spirit/tree/common.hpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- common.hpp 30 Jan 2007 23:08:04 -0000 1.25
+++ common.hpp 14 Mar 2007 20:48:54 -0000 1.26
@@ -1,5 +1,6 @@
/*=============================================================================
Copyright (c) 2001-2003 Daniel Nuffer
+ Copyright (c) 2001-2007 Hartmut Kaiser
Revised 2007, Copyright (c) Tobias Schwinger
http://spirit.sourceforge.net/
@@ -677,7 +678,8 @@
typename MatchPolicyT,
typename IteratorT,
typename NodeFactoryT,
- typename TreePolicyT
+ typename TreePolicyT,
+ typename T
>
struct common_tree_match_policy : public match_policy
{
@@ -694,7 +696,7 @@
template <typename T>
struct result { typedef tree_match<IteratorT, NodeFactoryT, T> type; };
- typedef tree_match<IteratorT, NodeFactoryT> match_t;
+ typedef tree_match<IteratorT, NodeFactoryT, T> match_t;
typedef IteratorT iterator_t;
typedef TreePolicyT tree_policy_t;
typedef NodeFactoryT factory_t;
@@ -825,7 +827,6 @@
typedef no_tree_gen_node_parser<T> self_t;
typedef no_tree_gen_node_parser_gen parser_generator_t;
typedef unary_parser_category parser_category_t;
-// typedef no_tree_gen_node_parser<T> const &embed_t;
no_tree_gen_node_parser(T const& a)
: unary<T, parser<no_tree_gen_node_parser<T> > >(a) {}
@@ -959,12 +960,17 @@
typedef node_parser<T, NodeParserT> self_t;
typedef node_parser_gen<NodeParserT> parser_generator_t;
typedef unary_parser_category parser_category_t;
-// typedef node_parser<T, NodeParserT> const &embed_t;
node_parser(T const& a)
: unary<T, parser<node_parser<T, NodeParserT> > >(a) {}
template <typename ScannerT>
+ struct result
+ {
+ typedef typename parser_result<T, ScannerT>::type type;
+ };
+
+ template <typename ScannerT>
typename parser_result<self_t, ScannerT>::type
parse(ScannerT const& scanner) const
{
@@ -1289,12 +1295,17 @@
typedef action_directive_parser<T, ActionParserT> self_t;
typedef action_directive_parser_gen<ActionParserT> parser_generator_t;
typedef unary_parser_category parser_category_t;
-// typedef action_directive_parser<T, ActionParserT> const &embed_t;
action_directive_parser(T const& a)
: unary<T, parser<action_directive_parser<T, ActionParserT> > >(a) {}
template <typename ScannerT>
+ struct result
+ {
+ typedef typename parser_result<T, ScannerT>::type type;
+ };
+
+ template <typename ScannerT>
typename parser_result<self_t, ScannerT>::type
parse(ScannerT const& scanner) const
{
@@ -1348,6 +1359,12 @@
{
typedef action_parser_category parser_category;
typedef action<ParserT, ActionT> self_t;
+
+ template <typename ScannerT>
+ struct result
+ {
+ typedef typename parser_result<ParserT, ScannerT>::type type;
+ };
action( ParserT const& subject,
ActionT const& actor_);
@@ -1414,6 +1431,12 @@
{
typedef action_parser_category parser_category;
typedef action<ParserT, ActionT> self_t;
+
+ template <typename ScannerT>
+ struct result
+ {
+ typedef typename parser_result<ParserT, ScannerT>::type type;
+ };
action( ParserT const& subject,
ActionT const& actor_);
Index: common_fwd.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/spirit/tree/common_fwd.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- common_fwd.hpp 25 Jan 2007 11:27:32 -0000 1.2
+++ common_fwd.hpp 14 Mar 2007 20:48:54 -0000 1.3
@@ -41,7 +41,8 @@
typename MatchPolicyT,
typename IteratorT,
typename NodeFactoryT,
- typename TreePolicyT
+ typename TreePolicyT,
+ typename T = nil_t
>
struct common_tree_match_policy;
Index: parse_tree.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/spirit/tree/parse_tree.hpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- parse_tree.hpp 9 Feb 2006 23:10:00 -0000 1.15
+++ parse_tree.hpp 14 Mar 2007 20:48:54 -0000 1.16
@@ -1,5 +1,6 @@
/*=============================================================================
Copyright (c) 2001-2003 Daniel Nuffer
+ Copyright (c) 2001-2007 Hartmut Kaiser
http://spirit.sourceforge.net/
Use, modification and distribution is subject to the Boost Software
@@ -22,28 +23,31 @@
// pt_match_policy is simply an id so the correct specialization of
tree_policy can be found.
template <
typename IteratorT,
- typename NodeFactoryT
+ typename NodeFactoryT,
+ typename T
>
struct pt_match_policy :
public common_tree_match_policy<
- pt_match_policy<IteratorT, NodeFactoryT>,
+ pt_match_policy<IteratorT, NodeFactoryT, T>,
IteratorT,
NodeFactoryT,
pt_tree_policy<
- pt_match_policy<IteratorT, NodeFactoryT>,
+ pt_match_policy<IteratorT, NodeFactoryT, T>,
NodeFactoryT
- >
+ >,
+ T
>
{
typedef
common_tree_match_policy<
- pt_match_policy<IteratorT, NodeFactoryT>,
+ pt_match_policy<IteratorT, NodeFactoryT, T>,
IteratorT,
NodeFactoryT,
pt_tree_policy<
- pt_match_policy<IteratorT, NodeFactoryT>,
+ pt_match_policy<IteratorT, NodeFactoryT, T>,
NodeFactoryT
- >
+ >,
+ T
>
common_tree_match_policy_;
@@ -105,8 +109,8 @@
m = newmatch;
}
- template <typename FunctorT>
- static void apply_op_to_match(FunctorT const& op, match_t& m)
+ template <typename FunctorT, typename MatchT>
+ static void apply_op_to_match(FunctorT const& op, MatchT& m)
{
op(m);
}
@@ -114,11 +118,11 @@
namespace impl {
- template <typename IteratorT, typename NodeFactoryT>
- struct tree_policy_selector<pt_match_policy<IteratorT, NodeFactoryT> >
+ template <typename IteratorT, typename NodeFactoryT, typename T>
+ struct tree_policy_selector<pt_match_policy<IteratorT, NodeFactoryT, T> >
{
typedef pt_tree_policy<
- pt_match_policy<IteratorT, NodeFactoryT>, NodeFactoryT> type;
+ pt_match_policy<IteratorT, NodeFactoryT, T>, NodeFactoryT> type;
};
} // namespace impl
@@ -134,7 +138,6 @@
typedef gen_pt_node_parser<T> self_t;
typedef gen_pt_node_parser_gen parser_generator_t;
typedef unary_parser_category parser_category_t;
-// typedef gen_pt_node_parser<T> const &embed_t;
gen_pt_node_parser(T const& a)
: unary<T, parser<gen_pt_node_parser<T> > >(a) {}
Index: parse_tree_fwd.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/spirit/tree/parse_tree_fwd.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- parse_tree_fwd.hpp 9 Feb 2006 23:10:00 -0000 1.1
+++ parse_tree_fwd.hpp 14 Mar 2007 20:48:54 -0000 1.2
@@ -16,7 +16,8 @@
template <
typename IteratorT,
- typename NodeFactoryT = node_val_data_factory<nil_t>
+ typename NodeFactoryT = node_val_data_factory<nil_t>,
+ typename T = nil_t
>
struct pt_match_policy;
Index: parse_tree_utils.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/spirit/tree/parse_tree_utils.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- parse_tree_utils.hpp 15 May 2005 06:32:18 -0000 1.8
+++ parse_tree_utils.hpp 14 Mar 2007 20:48:54 -0000 1.9
@@ -1,6 +1,6 @@
/*=============================================================================
Copyright (c) 2001-2003 Daniel Nuffer
- Copyright (c) 2001-2003 Hartmut Kaiser
+ Copyright (c) 2001-2007 Hartmut Kaiser
http://spirit.sourceforge.net/
Use, modification and distribution is subject to the Boost Software
Index: parsetree.dtd
===================================================================
RCS file: /cvsroot/boost/boost/boost/spirit/tree/parsetree.dtd,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- parsetree.dtd 9 Jul 2004 08:28:05 -0000 1.7
+++ parsetree.dtd 14 Mar 2007 20:48:54 -0000 1.8
@@ -1,6 +1,10 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- This DTD is used for the output of Spirit parse tree's through -->
-<!-- the boost::spirit::tree_to_xml functions. -->
+<!-- This DTD is used for the output of Spirit parse tree's through
-->
+<!-- the boost::spirit::tree_to_xml functions.
-->
+<!-- Copyright (c) 2001-2007 Hartmut Kaiser
-->
+<!-- Distribution 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)
-->
<!ELEMENT parsetree (parsenode)>
<!ATTLIST parsetree
version CDATA "1.0"
Index: tree_to_xml.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/spirit/tree/tree_to_xml.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- tree_to_xml.hpp 10 Mar 2006 17:02:25 -0000 1.7
+++ tree_to_xml.hpp 14 Mar 2007 20:48:54 -0000 1.8
@@ -1,6 +1,6 @@
/*=============================================================================
+ Copyright (c) 2001-2007 Hartmut Kaiser
Copyright (c) 2001-2003 Daniel Nuffer
- Copyright (c) 2001-2003 Hartmut Kaiser
http://spirit.sourceforge.net/
Use, modification and distribution is subject to the Boost Software
-------------------------------------------------------------------------
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
