Menu
▾
▴
SF.net SVN: openvrml:[3925] trunk
|
From: <br...@us...> - 2009-06-22 21:12:14
|
Revision: 3925
http://openvrml.svn.sourceforge.net/openvrml/?rev=3925&view=rev
Author: braden
Date: 2009-06-22 21:11:18 +0000 (Mon, 22 Jun 2009)
Log Message:
-----------
Use Spirit Classic in the boost::spirit::classic namespace.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/libopenvrml/openvrml/basetypes.cpp
trunk/src/libopenvrml/openvrml/local/parse_vrml.cpp
trunk/src/libopenvrml/openvrml/local/uri.cpp
trunk/src/libopenvrml/openvrml/local/uri.h
trunk/src/libopenvrml/openvrml/node.cpp
trunk/src/libopenvrml/openvrml/vrml97_grammar.h
trunk/src/libopenvrml/openvrml/x3d_vrml_grammar.h
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2009-06-22 08:28:39 UTC (rev 3924)
+++ trunk/ChangeLog 2009-06-22 21:11:18 UTC (rev 3925)
@@ -1,5 +1,17 @@
2009-06-22 Braden McDaniel <br...@en...>
+ Use Spirit Classic in the boost::spirit::classic namespace.
+
+ * src/libopenvrml/openvrml/basetypes.cpp
+ * src/libopenvrml/openvrml/node.cpp
+ * src/libopenvrml/openvrml/vrml97_grammar.h
+ * src/libopenvrml/openvrml/x3d_vrml_grammar.h
+ * src/libopenvrml/openvrml/local/parse_vrml.cpp
+ * src/libopenvrml/openvrml/local/uri.cpp
+ * src/libopenvrml/openvrml/local/uri.h
+
+2009-06-22 Braden McDaniel <br...@en...>
+
Use GIO instead of GnomeVFS in openvrml-player.
* configure.ac: Check for GIO.
Modified: trunk/src/libopenvrml/openvrml/basetypes.cpp
===================================================================
--- trunk/src/libopenvrml/openvrml/basetypes.cpp 2009-06-22 08:28:39 UTC (rev 3924)
+++ trunk/src/libopenvrml/openvrml/basetypes.cpp 2009-06-22 21:11:18 UTC (rev 3925)
@@ -307,15 +307,15 @@
namespace {
typedef std::istream::char_type char_t;
- typedef boost::spirit::multi_pass<std::istreambuf_iterator<char_t> >
+ typedef boost::spirit::classic::multi_pass<std::istreambuf_iterator<char_t> >
iterator_t;
- typedef boost::spirit::skip_parser_iteration_policy<openvrml::vrml97_space_parser>
+ typedef boost::spirit::classic::skip_parser_iteration_policy<openvrml::vrml97_space_parser>
iter_policy_t;
- typedef boost::spirit::scanner_policies<iter_policy_t> scanner_policies_t;
- typedef boost::spirit::scanner<iterator_t, scanner_policies_t> scanner_t;
+ typedef boost::spirit::classic::scanner_policies<iter_policy_t> scanner_policies_t;
+ typedef boost::spirit::classic::scanner<iterator_t, scanner_policies_t> scanner_t;
- typedef boost::spirit::rule<scanner_t> rule_t;
+ typedef boost::spirit::classic::rule<scanner_t> rule_t;
}
/**
@@ -338,8 +338,8 @@
std::istream & openvrml::operator>>(std::istream & in, color & c)
{
using std::istreambuf_iterator;
- using boost::spirit::make_multi_pass;
- using boost::spirit::match;
+ using boost::spirit::classic::make_multi_pass;
+ using boost::spirit::classic::match;
using phoenix::arg1;
using phoenix::var;
@@ -620,8 +620,8 @@
std::istream & openvrml::operator>>(std::istream & in, color_rgba & c)
{
using std::istreambuf_iterator;
- using boost::spirit::make_multi_pass;
- using boost::spirit::match;
+ using boost::spirit::classic::make_multi_pass;
+ using boost::spirit::classic::match;
using phoenix::arg1;
using phoenix::var;
@@ -1036,8 +1036,8 @@
std::istream & openvrml::operator>>(std::istream & in, vec2f & v)
{
using std::istreambuf_iterator;
- using boost::spirit::make_multi_pass;
- using boost::spirit::match;
+ using boost::spirit::classic::make_multi_pass;
+ using boost::spirit::classic::match;
using phoenix::arg1;
using phoenix::var;
@@ -1451,9 +1451,9 @@
std::istream & openvrml::operator>>(std::istream & in, vec2d & v)
{
using std::istreambuf_iterator;
- using boost::spirit::make_multi_pass;
- using boost::spirit::match;
- using boost::spirit::real_p;
+ using boost::spirit::classic::make_multi_pass;
+ using boost::spirit::classic::match;
+ using boost::spirit::classic::real_p;
using phoenix::arg1;
using phoenix::var;
@@ -1995,8 +1995,8 @@
std::istream & openvrml::operator>>(std::istream & in, vec3f & v)
{
using std::istreambuf_iterator;
- using boost::spirit::make_multi_pass;
- using boost::spirit::match;
+ using boost::spirit::classic::make_multi_pass;
+ using boost::spirit::classic::match;
using phoenix::arg1;
using phoenix::var;
@@ -2538,9 +2538,9 @@
std::istream & openvrml::operator>>(std::istream & in, vec3d & v)
{
using std::istreambuf_iterator;
- using boost::spirit::make_multi_pass;
- using boost::spirit::match;
- using boost::spirit::real_p;
+ using boost::spirit::classic::make_multi_pass;
+ using boost::spirit::classic::match;
+ using boost::spirit::classic::real_p;
using phoenix::arg1;
using phoenix::var;
@@ -3058,14 +3058,14 @@
OPENVRML_LOCAL struct OPENVRML_LOCAL null_error_handler {
template <typename ScannerT, typename ErrorT>
- boost::spirit::error_status<> operator()(ScannerT, ErrorT) const
+ boost::spirit::classic::error_status<> operator()(ScannerT, ErrorT) const
{
- using boost::spirit::error_status;
+ using boost::spirit::classic::error_status;
return error_status<>(error_status<>::fail);
}
} error_handler;
- const boost::spirit::functor_parser<
+ const boost::spirit::classic::functor_parser<
openvrml::rotation_parser<null_error_handler> >
rotation_p(error_handler);
}
@@ -3090,10 +3090,10 @@
std::istream & openvrml::operator>>(std::istream & in, rotation & rot)
{
using std::istreambuf_iterator;
- using boost::spirit::make_multi_pass;
- using boost::spirit::match;
- using boost::spirit::eps_p;
- using boost::spirit::guard;
+ using boost::spirit::classic::make_multi_pass;
+ using boost::spirit::classic::match;
+ using boost::spirit::classic::eps_p;
+ using boost::spirit::classic::guard;
using phoenix::arg1;
using phoenix::var;
@@ -3980,8 +3980,8 @@
std::istream & openvrml::operator>>(std::istream & in, mat4f & m)
{
using std::istreambuf_iterator;
- using boost::spirit::make_multi_pass;
- using boost::spirit::ch_p;
+ using boost::spirit::classic::make_multi_pass;
+ using boost::spirit::classic::ch_p;
using phoenix::arg1;
using phoenix::var;
@@ -4023,7 +4023,7 @@
>> !ch_p(']')[var(row4_bracket_count) -= 1]
;
- boost::spirit::match<> match = r.parse(scan);
+ boost::spirit::classic::match<> match = r.parse(scan);
if (!match || row1_bracket_count != 0 || row2_bracket_count != 0
|| row3_bracket_count != 0 || row4_bracket_count != 0) {
@@ -4581,8 +4581,8 @@
std::istream & openvrml::operator>>(std::istream & in, quatf & q)
{
using std::istreambuf_iterator;
- using boost::spirit::make_multi_pass;
- using boost::spirit::match;
+ using boost::spirit::classic::make_multi_pass;
+ using boost::spirit::classic::match;
using phoenix::arg1;
using phoenix::var;
@@ -4993,10 +4993,10 @@
std::istream & openvrml::operator>>(std::istream & in, image & img)
{
using std::istreambuf_iterator;
- using boost::spirit::make_multi_pass;
- using boost::spirit::match;
- using boost::spirit::eps_p;
- using boost::spirit::guard;
+ using boost::spirit::classic::make_multi_pass;
+ using boost::spirit::classic::match;
+ using boost::spirit::classic::eps_p;
+ using boost::spirit::classic::guard;
using phoenix::arg1;
using phoenix::var;
Modified: trunk/src/libopenvrml/openvrml/local/parse_vrml.cpp
===================================================================
--- trunk/src/libopenvrml/openvrml/local/parse_vrml.cpp 2009-06-22 08:28:39 UTC (rev 3924)
+++ trunk/src/libopenvrml/openvrml/local/parse_vrml.cpp 2009-06-22 21:11:18 UTC (rev 3925)
@@ -47,13 +47,13 @@
{}
template <typename ScannerT, typename ErrorT>
- boost::spirit::error_status<> operator()(const ScannerT & scan,
+ boost::spirit::classic::error_status<> operator()(const ScannerT & scan,
const ErrorT & err) const
{
using std::endl;
using std::string;
- using boost::spirit::error_status;
- using boost::spirit::file_position;
+ using boost::spirit::classic::error_status;
+ using boost::spirit::classic::file_position;
const file_position fpos = err.where.get_position();
@@ -119,9 +119,9 @@
using std::istream;
using std::istreambuf_iterator;
using boost::algorithm::iequals;
- using boost::spirit::multi_pass;
- using boost::spirit::make_multi_pass;
- using boost::spirit::position_iterator;
+ using boost::spirit::classic::multi_pass;
+ using boost::spirit::classic::make_multi_pass;
+ using boost::spirit::classic::position_iterator;
typedef multi_pass<istreambuf_iterator<char> > multi_pass_iterator_t;
typedef istream::char_type char_t;
Modified: trunk/src/libopenvrml/openvrml/local/uri.cpp
===================================================================
--- trunk/src/libopenvrml/openvrml/local/uri.cpp 2009-06-22 08:28:39 UTC (rev 3924)
+++ trunk/src/libopenvrml/openvrml/local/uri.cpp 2009-06-22 21:11:18 UTC (rev 3925)
@@ -70,7 +70,7 @@
fragment_end(this->str_.begin())
{
using std::string;
- using namespace boost::spirit;
+ using namespace boost::spirit::classic;
actions a(*this);
uri_grammar<actions> g(a);
Modified: trunk/src/libopenvrml/openvrml/local/uri.h
===================================================================
--- trunk/src/libopenvrml/openvrml/local/uri.h 2009-06-22 08:28:39 UTC (rev 3924)
+++ trunk/src/libopenvrml/openvrml/local/uri.h 2009-06-22 21:11:18 UTC (rev 3925)
@@ -22,8 +22,8 @@
# define OPENVRML_LOCAL_URI_H
# include <openvrml/bad_url.h>
-# include <boost/spirit.hpp>
-# include <boost/spirit/phoenix.hpp>
+# include <boost/spirit/include/classic.hpp>
+# include <boost/spirit/include/phoenix1.hpp>
namespace openvrml {
@@ -88,7 +88,7 @@
struct OPENVRML_LOCAL uri_reserved_parser :
- public boost::spirit::char_parser<uri_reserved_parser> {
+ public boost::spirit::classic::char_parser<uri_reserved_parser> {
typedef uri_reserved_parser self_t;
@@ -112,7 +112,7 @@
struct OPENVRML_LOCAL uri_unreserved_parser :
- public boost::spirit::char_parser<uri_unreserved_parser> {
+ public boost::spirit::classic::char_parser<uri_unreserved_parser> {
typedef uri_unreserved_parser self_t;
@@ -137,24 +137,24 @@
struct OPENVRML_LOCAL uric_grammar :
- public boost::spirit::grammar<uric_grammar> {
+ public boost::spirit::classic::grammar<uric_grammar> {
template <typename ScannerT>
struct definition {
- typedef boost::spirit::rule<ScannerT> rule_type;
+ typedef boost::spirit::classic::rule<ScannerT> rule_type;
rule_type uric, escaped;
definition(const uric_grammar & self);
- const boost::spirit::rule<ScannerT> & start() const;
+ const boost::spirit::classic::rule<ScannerT> & start() const;
};
};
template <typename ScannerT>
uric_grammar::definition<ScannerT>::definition(const uric_grammar &)
{
- using namespace boost::spirit;
+ using namespace boost::spirit::classic;
uric
= uri_reserved_p
@@ -168,7 +168,7 @@
}
template <typename ScannerT>
- const boost::spirit::rule<ScannerT> &
+ const boost::spirit::classic::rule<ScannerT> &
uric_grammar::definition<ScannerT>::start() const
{
return this->uric;
@@ -177,20 +177,20 @@
template <typename Actions = null_actions>
struct uri_authority_grammar :
- public boost::spirit::grammar<uri_authority_grammar<Actions> > {
+ public boost::spirit::classic::grammar<uri_authority_grammar<Actions> > {
template <typename ScannerT>
struct definition {
struct server_closure :
- boost::spirit::closure<server_closure,
+ boost::spirit::classic::closure<server_closure,
typename ScannerT::iterator_t,
typename ScannerT::iterator_t> {
typename server_closure::member1 userinfo_begin;
typename server_closure::member2 userinfo_end;
};
- typedef boost::spirit::rule<ScannerT> rule_type;
- typedef boost::spirit::rule<ScannerT,
+ typedef boost::spirit::classic::rule<ScannerT> rule_type;
+ typedef boost::spirit::classic::rule<ScannerT,
typename server_closure::context_t>
server_rule_type;
@@ -209,7 +209,7 @@
explicit definition(const uri_authority_grammar & self);
- const boost::spirit::rule<ScannerT> & start() const;
+ const boost::spirit::classic::rule<ScannerT> & start() const;
};
const Actions & actions;
@@ -222,7 +222,7 @@
uri_authority_grammar<Actions>::definition<ScannerT>::
definition(const uri_authority_grammar & self)
{
- using namespace boost::spirit;
+ using namespace boost::spirit::classic;
using namespace phoenix;
authority
@@ -308,7 +308,7 @@
template <typename Actions>
template <typename ScannerT>
- const boost::spirit::rule<ScannerT> &
+ const boost::spirit::classic::rule<ScannerT> &
uri_authority_grammar<Actions>::definition<ScannerT>::start() const
{
return this->authority;
@@ -322,11 +322,11 @@
template <typename Actions>
struct uri_abs_path_grammar :
- public boost::spirit::grammar<uri_abs_path_grammar<Actions> > {
+ public boost::spirit::classic::grammar<uri_abs_path_grammar<Actions> > {
template <typename ScannerT>
struct definition {
- typedef boost::spirit::rule<ScannerT> rule_type;
+ typedef boost::spirit::classic::rule<ScannerT> rule_type;
rule_type abs_path;
rule_type path_segments;
@@ -338,7 +338,7 @@
explicit definition(const uri_abs_path_grammar & self);
- const boost::spirit::rule<ScannerT> & start() const;
+ const boost::spirit::classic::rule<ScannerT> & start() const;
};
const Actions & actions;
@@ -351,7 +351,7 @@
uri_abs_path_grammar<Actions>::definition<ScannerT>::
definition(const uri_abs_path_grammar & self)
{
- using namespace boost::spirit;
+ using namespace boost::spirit::classic;
using namespace phoenix;
abs_path
@@ -389,7 +389,7 @@
template <typename Actions>
template <typename ScannerT>
- const boost::spirit::rule<ScannerT> &
+ const boost::spirit::classic::rule<ScannerT> &
uri_abs_path_grammar<Actions>::definition<ScannerT>::start() const
{
return this->abs_path;
@@ -404,12 +404,12 @@
template <typename Actions = null_actions>
struct absolute_uri_grammar :
- public boost::spirit::grammar<absolute_uri_grammar<Actions> > {
+ public boost::spirit::classic::grammar<absolute_uri_grammar<Actions> > {
template <typename ScannerT>
struct definition {
struct absolute_uri_closure :
- boost::spirit::closure<absolute_uri_closure,
+ boost::spirit::classic::closure<absolute_uri_closure,
typename ScannerT::iterator_t,
typename ScannerT::iterator_t> {
typename absolute_uri_closure::member1 scheme_begin;
@@ -417,19 +417,19 @@
};
struct server_closure :
- boost::spirit::closure<server_closure,
+ boost::spirit::classic::closure<server_closure,
typename ScannerT::iterator_t,
typename ScannerT::iterator_t> {
typename server_closure::member1 userinfo_begin;
typename server_closure::member2 userinfo_end;
};
- typedef boost::spirit::rule<ScannerT> rule_type;
- typedef boost::spirit::rule<
+ typedef boost::spirit::classic::rule<ScannerT> rule_type;
+ typedef boost::spirit::classic::rule<
ScannerT,
typename absolute_uri_closure::context_t>
absolute_uri_rule_type;
- typedef boost::spirit::rule<ScannerT,
+ typedef boost::spirit::classic::rule<ScannerT,
typename server_closure::context_t>
server_rule_type;
@@ -461,7 +461,7 @@
abs_path(self.actions),
authority(self.actions)
{
- using namespace boost::spirit;
+ using namespace boost::spirit::classic;
using namespace phoenix;
absolute_uri
@@ -523,11 +523,11 @@
template <typename Actions = null_actions>
struct uri_grammar :
- public boost::spirit::grammar<uri_grammar<Actions> > {
+ public boost::spirit::classic::grammar<uri_grammar<Actions> > {
template <typename ScannerT>
struct definition {
- typedef boost::spirit::rule<ScannerT> rule_type;
+ typedef boost::spirit::classic::rule<ScannerT> rule_type;
rule_type uri_reference;
absolute_uri_grammar<Actions> absolute_uri;
@@ -544,7 +544,7 @@
explicit definition(const uri_grammar & self);
- const boost::spirit::rule<ScannerT> & start() const;
+ const boost::spirit::classic::rule<ScannerT> & start() const;
};
const Actions & actions;
@@ -566,7 +566,7 @@
abs_path(self.actions),
authority(self.actions)
{
- using namespace boost::spirit;
+ using namespace boost::spirit::classic;
using namespace phoenix;
BOOST_SPIRIT_DEBUG_NODE(uri_reference);
@@ -624,7 +624,7 @@
template <typename Actions>
template <typename ScannerT>
- const boost::spirit::rule<ScannerT> &
+ const boost::spirit::classic::rule<ScannerT> &
uri_grammar<Actions>::definition<ScannerT>::start() const
{
return this->uri_reference;
Modified: trunk/src/libopenvrml/openvrml/node.cpp
===================================================================
--- trunk/src/libopenvrml/openvrml/node.cpp 2009-06-22 08:28:39 UTC (rev 3924)
+++ trunk/src/libopenvrml/openvrml/node.cpp 2009-06-22 21:11:18 UTC (rev 3925)
@@ -595,11 +595,11 @@
namespace {
struct OPENVRML_LOCAL node_metatype_id_grammar :
- public boost::spirit::grammar<node_metatype_id_grammar> {
+ public boost::spirit::classic::grammar<node_metatype_id_grammar> {
template <typename ScannerT>
struct definition {
- typedef boost::spirit::rule<ScannerT> rule_type;
+ typedef boost::spirit::classic::rule<ScannerT> rule_type;
rule_type node_metatype_id;
openvrml::local::absolute_uri_grammar<> absolute_uri;
@@ -607,7 +607,7 @@
definition(const node_metatype_id_grammar & self);
- const boost::spirit::rule<ScannerT> & start() const;
+ const boost::spirit::classic::rule<ScannerT> & start() const;
};
};
@@ -621,7 +621,7 @@
}
template <typename ScannerT>
- const boost::spirit::rule<ScannerT> &
+ const boost::spirit::classic::rule<ScannerT> &
node_metatype_id_grammar::definition<ScannerT>::start() const
{
return this->node_metatype_id;
@@ -643,7 +643,7 @@
OPENVRML_THROW2(std::invalid_argument, std::bad_alloc):
id_(id)
{
- using namespace boost::spirit;
+ using namespace boost::spirit::classic;
node_metatype_id_grammar g;
if (!parse(this->id_.begin(), this->id_.end(), g, space_p).full) {
@@ -667,7 +667,7 @@
OPENVRML_THROW2(std::invalid_argument, std::bad_alloc):
id_(id)
{
- using namespace boost::spirit;
+ using namespace boost::spirit::classic;
node_metatype_id_grammar g;
if (!parse(this->id_.begin(), this->id_.end(), g, space_p).full) {
Modified: trunk/src/libopenvrml/openvrml/vrml97_grammar.h
===================================================================
--- trunk/src/libopenvrml/openvrml/vrml97_grammar.h 2009-06-22 08:28:39 UTC (rev 3924)
+++ trunk/src/libopenvrml/openvrml/vrml97_grammar.h 2009-06-22 21:11:18 UTC (rev 3925)
@@ -22,17 +22,17 @@
# define OPENVRML_VRML97_GRAMMAR_H
# include <openvrml/browser.h>
-# include <boost/spirit.hpp>
-# include <boost/spirit/actor.hpp>
-# include <boost/spirit/dynamic.hpp>
-# include <boost/spirit/phoenix.hpp>
+# include <boost/spirit/include/classic.hpp>
+# include <boost/spirit/include/classic_actor.hpp>
+# include <boost/spirit/include/classic_dynamic.hpp>
+# include <boost/spirit/include/phoenix1.hpp>
# include <boost/test/floating_point_comparison.hpp>
# include <stack>
namespace openvrml {
struct vrml97_space_parser :
- boost::spirit::char_parser<vrml97_space_parser> {
+ boost::spirit::classic::char_parser<vrml97_space_parser> {
typedef vrml97_space_parser self_t;
@@ -46,10 +46,11 @@
const vrml97_space_parser vrml97_space_p = vrml97_space_parser();
- struct vrml97_skip_grammar : boost::spirit::grammar<vrml97_skip_grammar> {
+ struct vrml97_skip_grammar :
+ boost::spirit::classic::grammar<vrml97_skip_grammar> {
template <typename ScannerT>
struct definition {
- typedef boost::spirit::rule<ScannerT> rule_t;
+ typedef boost::spirit::classic::rule<ScannerT> rule_t;
rule_t skip;
@@ -63,7 +64,7 @@
vrml97_skip_grammar::definition<ScannerT>::
definition(const vrml97_skip_grammar & /* self */)
{
- using namespace boost::spirit;
+ using namespace boost::spirit::classic;
BOOST_SPIRIT_DEBUG_NODE(skip);
@@ -135,7 +136,7 @@
struct get_mftype_parse_error;
template <>
- struct get_mftype_parse_error<boost::spirit::real_parser<float, boost::spirit::real_parser_policies<float> > > {
+ struct get_mftype_parse_error<boost::spirit::classic::real_parser<float, boost::spirit::classic::real_parser_policies<float> > > {
static const vrml_parse_error element_or_lbracket_value =
float_or_lbracket_expected;
static const vrml_parse_error element_or_rbracket_value =
@@ -143,7 +144,7 @@
};
template <>
- struct get_mftype_parse_error<boost::spirit::real_parser<double, boost::spirit::real_parser_policies<double> > > {
+ struct get_mftype_parse_error<boost::spirit::classic::real_parser<double, boost::spirit::classic::real_parser_policies<double> > > {
static const vrml_parse_error element_or_lbracket_value =
float_or_lbracket_expected;
static const vrml_parse_error element_or_rbracket_value =
@@ -203,7 +204,7 @@
return msg[error];
}
- typedef boost::spirit::assertion<vrml_parse_error> vrml_parse_assertion;
+ typedef boost::spirit::classic::assertion<vrml_parse_error> vrml_parse_assertion;
const vrml_parse_assertion expect_dot(dot_expected);
const vrml_parse_assertion expect_lbrace(lbrace_expected);
@@ -247,12 +248,12 @@
{}
template <typename ScannerT, typename ErrorT>
- boost::spirit::error_status<> operator()(const ScannerT & scan,
+ boost::spirit::classic::error_status<> operator()(const ScannerT & scan,
const ErrorT & err) const
{
using std::endl;
- using boost::spirit::error_status;
- using boost::spirit::file_position;
+ using boost::spirit::classic::error_status;
+ using boost::spirit::classic::file_position;
const file_position fpos = err.where.get_position();
if (err.descriptor == rotation_axis_not_normalized) {
@@ -276,9 +277,9 @@
};
- const boost::spirit::real_parser<float, boost::spirit::real_parser_policies<float> >
+ const boost::spirit::classic::real_parser<float, boost::spirit::classic::real_parser_policies<float> >
float_p =
- boost::spirit::real_parser<float, boost::spirit::real_parser_policies<float> >();
+ boost::spirit::classic::real_parser<float, boost::spirit::classic::real_parser_policies<float> >();
struct bool_parser {
@@ -288,7 +289,7 @@
std::ptrdiff_t operator()(const ScannerT & scan,
result_t & result) const
{
- using namespace boost::spirit;
+ using namespace boost::spirit::classic;
using namespace phoenix;
typedef typename match_result<ScannerT, result_t>::type match_t;
match_t match
@@ -299,7 +300,7 @@
}
};
- const boost::spirit::functor_parser<bool_parser> bool_p;
+ const boost::spirit::classic::functor_parser<bool_parser> bool_p;
struct int32_parser {
@@ -309,7 +310,7 @@
std::ptrdiff_t operator()(const ScannerT & scan,
result_t & result) const
{
- using namespace boost::spirit;
+ using namespace boost::spirit::classic;
using namespace phoenix;
typedef typename match_result<ScannerT, result_t>::type match_t;
match_t match
@@ -323,10 +324,10 @@
}
};
- const boost::spirit::functor_parser<int32_parser> int32_p;
+ const boost::spirit::classic::functor_parser<int32_parser> int32_p;
template <>
- struct get_mftype_parse_error<boost::spirit::functor_parser<int32_parser> > {
+ struct get_mftype_parse_error<boost::spirit::classic::functor_parser<int32_parser> > {
static const vrml_parse_error element_or_lbracket_value =
int32_or_lbracket_expected;
static const vrml_parse_error element_or_rbracket_value =
@@ -356,12 +357,12 @@
std::ptrdiff_t operator()(const ScannerT & scan,
result_t & result) const
{
- using boost::spirit::eps_p;
- using boost::spirit::match_result;
+ using boost::spirit::classic::eps_p;
+ using boost::spirit::classic::match_result;
using phoenix::arg1;
using phoenix::var;
typedef typename match_result<ScannerT, result_t>::type match_t;
- typedef typename boost::spirit::rule<ScannerT> rule_t;
+ typedef typename boost::spirit::classic::rule<ScannerT> rule_t;
rule_t rule
= float_p[var(result) = arg1] >> eps_p(valid(result))
@@ -371,7 +372,7 @@
}
};
- const boost::spirit::functor_parser<intensity_parser> intensity_p;
+ const boost::spirit::classic::functor_parser<intensity_parser> intensity_p;
struct color_parser {
@@ -382,10 +383,10 @@
std::ptrdiff_t operator()(const ScannerT & scan,
result_t & result) const
{
- using boost::spirit::match_result;
+ using boost::spirit::classic::match_result;
using phoenix::arg1;
using phoenix::var;
- typedef typename boost::spirit::rule<ScannerT> rule_t;
+ typedef typename boost::spirit::classic::rule<ScannerT> rule_t;
typedef typename match_result<ScannerT, result_t>::type match_t;
rule_t rule
@@ -398,10 +399,10 @@
}
};
- const boost::spirit::functor_parser<color_parser> color_p;
+ const boost::spirit::classic::functor_parser<color_parser> color_p;
template <>
- struct get_mftype_parse_error<boost::spirit::functor_parser<color_parser> > {
+ struct get_mftype_parse_error<boost::spirit::classic::functor_parser<color_parser> > {
static const vrml_parse_error element_or_lbracket_value =
color_or_lbracket_expected;
static const vrml_parse_error element_or_rbracket_value =
@@ -444,12 +445,12 @@
std::ptrdiff_t operator()(const ScannerT & scan,
result_t & result) const
{
- using boost::spirit::match_result;
- using boost::spirit::eps_p;
- using boost::spirit::guard;
+ using boost::spirit::classic::match_result;
+ using boost::spirit::classic::eps_p;
+ using boost::spirit::classic::guard;
using phoenix::arg1;
using phoenix::var;
- typedef typename boost::spirit::rule<ScannerT> rule_t;
+ typedef typename boost::spirit::classic::rule<ScannerT> rule_t;
typedef typename match_result<ScannerT, result_t>::type match_t;
guard<vrml_parse_error> g;
rule_t rule
@@ -475,7 +476,7 @@
};
template <typename RotationNotNormalizedHandler>
- struct get_mftype_parse_error<boost::spirit::functor_parser<rotation_parser<RotationNotNormalizedHandler> > > {
+ struct get_mftype_parse_error<boost::spirit::classic::functor_parser<rotation_parser<RotationNotNormalizedHandler> > > {
static const vrml_parse_error element_or_lbracket_value =
rotation_or_lbracket_expected;
static const vrml_parse_error element_or_rbracket_value =
@@ -491,10 +492,10 @@
std::ptrdiff_t operator()(const ScannerT & scan,
result_t & result) const
{
- using boost::spirit::match_result;
+ using boost::spirit::classic::match_result;
using phoenix::arg1;
using phoenix::var;
- typedef typename boost::spirit::rule<ScannerT> rule_t;
+ typedef typename boost::spirit::classic::rule<ScannerT> rule_t;
typedef typename match_result<ScannerT, result_t>::type match_t;
rule_t rule
= float_p[var(result.vec[0]) = arg1]
@@ -505,10 +506,10 @@
}
};
- const boost::spirit::functor_parser<vec2f_parser> vec2f_p;
+ const boost::spirit::classic::functor_parser<vec2f_parser> vec2f_p;
template <>
- struct get_mftype_parse_error<boost::spirit::functor_parser<vec2f_parser> > {
+ struct get_mftype_parse_error<boost::spirit::classic::functor_parser<vec2f_parser> > {
static const vrml_parse_error element_or_lbracket_value =
vec2_or_lbracket_expected;
static const vrml_parse_error element_or_rbracket_value =
@@ -524,10 +525,10 @@
std::ptrdiff_t operator()(const ScannerT & scan,
result_t & result) const
{
- using boost::spirit::match_result;
+ using boost::spirit::classic::match_result;
using phoenix::arg1;
using phoenix::var;
- typedef typename boost::spirit::rule<ScannerT> rule_t;
+ typedef typename boost::spirit::classic::rule<ScannerT> rule_t;
typedef typename match_result<ScannerT, result_t>::type match_t;
rule_t rule
= float_p[var(result.vec[0]) = arg1]
@@ -539,10 +540,10 @@
}
};
- const boost::spirit::functor_parser<vec3f_parser> vec3f_p;
+ const boost::spirit::classic::functor_parser<vec3f_parser> vec3f_p;
template <>
- struct get_mftype_parse_error<boost::spirit::functor_parser<vec3f_parser> > {
+ struct get_mftype_parse_error<boost::spirit::classic::functor_parser<vec3f_parser> > {
static const vrml_parse_error element_or_lbracket_value =
vec3_or_lbracket_expected;
static const vrml_parse_error element_or_rbracket_value =
@@ -597,13 +598,13 @@
result_t & result) const
{
using boost::ref;
- using boost::spirit::repeat_p;
- using boost::spirit::eps_p;
+ using boost::spirit::classic::repeat_p;
+ using boost::spirit::classic::eps_p;
using phoenix::arg1;
using phoenix::var;
- using boost::spirit::match_result;
- typedef typename boost::spirit::rule<ScannerT> rule_t;
+ using boost::spirit::classic::match_result;
+ typedef typename boost::spirit::classic::rule<ScannerT> rule_t;
typedef typename match_result<ScannerT, result_t>::type match_t;
size_t x = 0, y = 0, comp = 0, pixels = 0, index = 0;
@@ -626,7 +627,7 @@
}
};
- const boost::spirit::functor_parser<image_parser> image_p;
+ const boost::spirit::classic::functor_parser<image_parser> image_p;
struct get_string_content_function {
@@ -653,15 +654,15 @@
std::ptrdiff_t operator()(const ScannerT & scan,
result_t & result) const
{
- using boost::spirit::chlit;
- using boost::spirit::strlit;
- using boost::spirit::anychar_p;
- using boost::spirit::lexeme_d;
- using boost::spirit::match_result;
+ using boost::spirit::classic::chlit;
+ using boost::spirit::classic::strlit;
+ using boost::spirit::classic::anychar_p;
+ using boost::spirit::classic::lexeme_d;
+ using boost::spirit::classic::match_result;
using phoenix::arg1;
using phoenix::arg2;
using phoenix::var;
- typedef typename boost::spirit::rule<ScannerT> rule_t;
+ typedef typename boost::spirit::classic::rule<ScannerT> rule_t;
typedef typename match_result<ScannerT, result_t>::type match_t;
std::string str;
@@ -678,11 +679,11 @@
}
};
- const boost::spirit::functor_parser<string_parser> string_p;
+ const boost::spirit::classic::functor_parser<string_parser> string_p;
template <>
struct get_mftype_parse_error<
- boost::spirit::functor_parser<string_parser> > {
+ boost::spirit::classic::functor_parser<string_parser> > {
static const vrml_parse_error element_or_lbracket_value =
string_or_lbracket_expected;
static const vrml_parse_error element_or_rbracket_value =
@@ -758,24 +759,24 @@
return scope_stack.top().proto_node_type;
}
- struct sfnode_closure : boost::spirit::closure<sfnode_closure,
+ struct sfnode_closure : boost::spirit::classic::closure<sfnode_closure,
bool> {
member1 null;
};
struct interface_type_closure :
- boost::spirit::closure<interface_type_closure,
+ boost::spirit::classic::closure<interface_type_closure,
node_interface::type_id> {
member1 type;
};
- struct field_type_closure : boost::spirit::closure<field_type_closure,
+ struct field_type_closure : boost::spirit::classic::closure<field_type_closure,
field_value::type_id> {
member1 type;
};
struct interface_decl_closure :
- boost::spirit::closure<interface_decl_closure,
+ boost::spirit::classic::closure<interface_decl_closure,
node_interface> {
member1 interface_;
};
@@ -829,14 +830,14 @@
const phoenix::function<set_node_interface_id_function>
set_node_interface_id;
- struct proto_closure : boost::spirit::closure<proto_closure,
+ struct proto_closure : boost::spirit::classic::closure<proto_closure,
node_type_decl,
bool> {
member1 node_type;
member2 add_node_interface_succeeded;
};
- struct is_mapping_closure : boost::spirit::closure<is_mapping_closure,
+ struct is_mapping_closure : boost::spirit::classic::closure<is_mapping_closure,
node_interface,
node_interface_set,
node_interface> {
@@ -846,7 +847,7 @@
};
struct externproto_closure :
- boost::spirit::closure<externproto_closure,
+ boost::spirit::classic::closure<externproto_closure,
node_type_decl,
std::vector<std::string>,
bool> {
@@ -856,7 +857,7 @@
};
struct script_interface_closure :
- boost::spirit::closure<script_interface_closure,
+ boost::spirit::classic::closure<script_interface_closure,
node_interface,
bool> {
member1 interface_;
@@ -929,7 +930,7 @@
struct root_node_statement_closure :
- boost::spirit::closure<root_node_statement_closure,
+ boost::spirit::classic::closure<root_node_statement_closure,
std::string,
node_type_decls::value_type *> {
member1 node_name_id;
@@ -946,7 +947,7 @@
void operator()(const IteratorT & first, IteratorT) const
{
if (!this->succeeded_) {
- boost::spirit::throw_(first, interface_collision);
+ boost::spirit::classic::throw_(first, interface_collision);
}
}
@@ -995,7 +996,7 @@
struct route_statement_closure :
- boost::spirit::closure<route_statement_closure,
+ boost::spirit::classic::closure<route_statement_closure,
const defs_t::value_type *,
const node_interface *,
const defs_t::value_type *,
@@ -1259,58 +1260,58 @@
template <typename Actions = null_vrml97_parse_actions,
typename ErrorHandler = vrml97_parse_error_handler>
struct vrml97_grammar :
- boost::spirit::grammar<vrml97_grammar<Actions, ErrorHandler> > {
+ boost::spirit::classic::grammar<vrml97_grammar<Actions, ErrorHandler> > {
- const boost::spirit::functor_parser<rotation_parser<ErrorHandler> >
+ const boost::spirit::classic::functor_parser<rotation_parser<ErrorHandler> >
rotation_p;
template <typename ScannerT>
struct definition {
- typedef boost::spirit::rule<ScannerT> rule_type;
+ typedef boost::spirit::classic::rule<ScannerT> rule_type;
- typedef boost::spirit::rule<ScannerT, sfnode_closure::context_t>
+ typedef boost::spirit::classic::rule<ScannerT, sfnode_closure::context_t>
sfnode_rule_type;
- typedef boost::spirit::rule<ScannerT,
+ typedef boost::spirit::classic::rule<ScannerT,
interface_type_closure::context_t>
interface_type_rule_type;
- typedef boost::spirit::rule<ScannerT,
+ typedef boost::spirit::classic::rule<ScannerT,
field_type_closure::context_t>
field_type_rule_type;
- typedef boost::spirit::rule<ScannerT,
+ typedef boost::spirit::classic::rule<ScannerT,
interface_decl_closure::context_t>
interface_decl_rule_type;
- typedef boost::spirit::rule<ScannerT,
+ typedef boost::spirit::classic::rule<ScannerT,
script_interface_closure::context_t>
script_interface_rule_type;
- typedef boost::spirit::rule<ScannerT, proto_closure::context_t>
+ typedef boost::spirit::classic::rule<ScannerT, proto_closure::context_t>
proto_rule_type;
- typedef boost::spirit::rule<ScannerT,
+ typedef boost::spirit::classic::rule<ScannerT,
interface_decl_closure::context_t>
proto_interface_rule_type;
- typedef boost::spirit::rule<ScannerT, is_mapping_closure::context_t>
+ typedef boost::spirit::classic::rule<ScannerT, is_mapping_closure::context_t>
is_mapping_rule_type;
- typedef boost::spirit::rule<ScannerT,
+ typedef boost::spirit::classic::rule<ScannerT,
externproto_closure::context_t>
externproto_rule_type;
- typedef boost::spirit::rule<ScannerT,
+ typedef boost::spirit::classic::rule<ScannerT,
root_node_statement_closure::context_t>
root_node_statement_rule_type;
- typedef boost::spirit::rule<ScannerT,
+ typedef boost::spirit::classic::rule<ScannerT,
route_statement_closure::context_t>
route_statement_rule_type;
- typedef boost::spirit::stored_rule<ScannerT> field_value_rule_type;
+ typedef boost::spirit::classic::stored_rule<ScannerT> field_value_rule_type;
template <typename ElementParser>
@@ -1326,10 +1327,10 @@
std::ptrdiff_t operator()(const MFTypeParserScannerT & scan,
result_t & result) const
{
- using boost::spirit::ch_p;
- using boost::spirit::push_back_a;
- using boost::spirit::match_result;
- typedef typename boost::spirit::rule<MFTypeParserScannerT>
+ using boost::spirit::classic::ch_p;
+ using boost::spirit::classic::push_back_a;
+ using boost::spirit::classic::match_result;
+ typedef typename boost::spirit::classic::rule<MFTypeParserScannerT>
rule_t;
typedef typename match_result<MFTypeParserScannerT,
result_t>::type
@@ -1355,54 +1356,54 @@
const ElementParser & parser_;
};
- static const boost::spirit::functor_parser<
+ static const boost::spirit::classic::functor_parser<
mftype_parser<
- boost::spirit::functor_parser<openvrml::color_parser> > >
+ boost::spirit::classic::functor_parser<openvrml::color_parser> > >
mfcolor_p;
- static const boost::spirit::functor_parser<
+ static const boost::spirit::classic::functor_parser<
mftype_parser<
- boost::spirit::real_parser<
+ boost::spirit::classic::real_parser<
float,
- boost::spirit::real_parser_policies<float> > > >
+ boost::spirit::classic::real_parser_policies<float> > > >
mffloat_p;
- static const boost::spirit::functor_parser<
+ static const boost::spirit::classic::functor_parser<
mftype_parser<
- boost::spirit::functor_parser<openvrml::int32_parser> > >
+ boost::spirit::classic::functor_parser<openvrml::int32_parser> > >
mfint32_p;
- static const boost::spirit::functor_parser<
+ static const boost::spirit::classic::functor_parser<
mftype_parser<
- boost::spirit::functor_parser<openvrml::string_parser> > >
+ boost::spirit::classic::functor_parser<openvrml::string_parser> > >
mfstring_p;
- const boost::spirit::functor_parser<
+ const boost::spirit::classic::functor_parser<
mftype_parser<
- boost::spirit::functor_parser<
+ boost::spirit::classic::functor_parser<
openvrml::rotation_parser<ErrorHandler> > > >
mfrotation_p;
- static const boost::spirit::functor_parser<
+ static const boost::spirit::classic::functor_parser<
mftype_parser<
- boost::spirit::real_parser<
+ boost::spirit::classic::real_parser<
double,
- boost::spirit::real_parser_policies<double> > > >
+ boost::spirit::classic::real_parser_policies<double> > > >
mftime_p;
- static const boost::spirit::functor_parser<
+ static const boost::spirit::classic::functor_parser<
mftype_parser<
- boost::spirit::functor_parser<openvrml::vec2f_parser> > >
+ boost::spirit::classic::functor_parser<openvrml::vec2f_parser> > >
mfvec2f_p;
- static const boost::spirit::functor_parser<
+ static const boost::spirit::classic::functor_parser<
mftype_parser<
- boost::spirit::functor_parser<openvrml::vec3f_parser> > >
+ boost::spirit::classic::functor_parser<openvrml::vec3f_parser> > >
mfvec3f_p;
struct mfnode_parser {
- typedef boost::spirit::nil_t result_t;
+ typedef boost::spirit::classic::nil_t result_t;
explicit mfnode_parser(const rule_type & node_statement):
node_statement_(node_statement)
@@ -1411,9 +1412,9 @@
std::ptrdiff_t operator()(const ScannerT & scan,
result_t &) const
{
- using boost::spirit::ch_p;
- using boost::spirit::match_result;
- typedef typename boost::spirit::rule<ScannerT> rule_t;
+ using boost::spirit::classic::ch_p;
+ using boost::spirit::classic::match_result;
+ typedef typename boost::spirit::classic::rule<ScannerT> rule_t;
typedef typename match_result<ScannerT, result_t>::type
match_t;
@@ -1435,15 +1436,15 @@
const rule_type & node_statement_;
};
- const boost::spirit::functor_parser<mfnode_parser> mfnode_p;
+ const boost::spirit::classic::functor_parser<mfnode_parser> mfnode_p;
scope_stack_t scope_stack;
- virtual const boost::spirit::stored_rule<ScannerT>
+ virtual const boost::spirit::classic::stored_rule<ScannerT>
get_field_value_parser(const field_value::type_id field_type) const
{
- boost::spirit::stored_rule<ScannerT> r;
+ boost::spirit::classic::stored_rule<ScannerT> r;
switch (field_type) {
case field_value::sfbool_id:
r = expect_bool(bool_p)[this->self.actions.on_sfbool];
@@ -1472,7 +1473,7 @@
r = expect_string(string_p)[this->self.actions.on_sfstring];
break;
case field_value::sftime_id:
- r = expect_float(boost::spirit::real_p)[
+ r = expect_float(boost::spirit::classic::real_p)[
this->self.actions.on_sftime
];
break;
@@ -1541,7 +1542,7 @@
d.field_value =
(interface_.type == node_interface::eventin_id
|| interface_.type == node_interface::eventout_id)
- ? boost::spirit::eps_p
+ ? boost::spirit::classic::eps_p
: d.get_field_value_parser(interface_.field_type);
if (in_proto_def(d.scope_stack)) {
@@ -1600,10 +1601,10 @@
std::ptrdiff_t operator()(const ScannerT & scan,
result_t & result) const
{
- using boost::spirit::assertion;
- using boost::spirit::eps_p;
- using boost::spirit::rule;
- using boost::spirit::match_result;
+ using boost::spirit::classic::assertion;
+ using boost::spirit::classic::eps_p;
+ using boost::spirit::classic::rule;
+ using boost::spirit::classic::match_result;
typedef rule<ScannerT> rule_t;
typedef typename match_result<ScannerT, result_t>::type
match_t;
@@ -1627,7 +1628,7 @@
rule_type & id_;
};
- const boost::spirit::functor_parser<node_name_id_parser>
+ const boost::spirit::classic::functor_parser<node_name_id_parser>
node_name_id_p;
@@ -1688,9 +1689,9 @@
std::ptrdiff_t operator()(const ScannerT & scan,
result_t & result) const
{
- using boost::spirit::eps_p;
- using boost::spirit::rule;
- using boost::spirit::match_result;
+ using boost::spirit::classic::eps_p;
+ using boost::spirit::classic::rule;
+ using boost::spirit::classic::match_result;
typedef rule<ScannerT> rule_t;
typedef typename match_result<ScannerT, result_t>::type
match_t;
@@ -1710,7 +1711,7 @@
rule_type & id_;
};
- const boost::spirit::functor_parser<node_type_id_parser>
+ const boost::spirit::classic::functor_parser<node_type_id_parser>
node_type_id_p;
@@ -1725,7 +1726,7 @@
void operator()(const node_interface & interface_) const
{
- using boost::spirit::eps_p;
+ using boost::spirit::classic::eps_p;
vrml97_grammar_def_t & d = this->vrml97_grammar_def_;
@@ -1794,7 +1795,7 @@
void operator()(const IteratorT & first,
const IteratorT & last) const
{
- using boost::spirit::throw_;
+ using boost::spirit::classic::throw_;
vrml97_grammar_def_t & d = this->vrml97_grammar_def_;
@@ -2347,7 +2348,7 @@
std::string node_type_id;
bool node_type_already_exists;
- boost::spirit::symbols<typename ScannerT::value_t> keywords;
+ boost::spirit::classic::symbols<typename ScannerT::value_t> keywords;
rule_type vrml_scene;
rule_type statement;
@@ -2376,13 +2377,13 @@
rule_type exposedfield;
rule_type field;
- typedef boost::spirit::chset<typename ScannerT::value_t> chset;
+ typedef boost::spirit::classic::chset<typename ScannerT::value_t> chset;
chset invalid_id_rest_char, invalid_id_first_char;
explicit definition(const vrml97_grammar & self);
virtual ~definition() {}
- const boost::spirit::rule<ScannerT> & start() const;
+ const boost::spirit::classic::rule<ScannerT> & start() const;
};
explicit vrml97_grammar(
@@ -2399,87 +2400,87 @@
template <typename Actions, typename ErrorHandler>
template <typename ScannerT>
- const boost::spirit::functor_parser<
+ const boost::spirit::classic::functor_parser<
typename vrml97_grammar<Actions, ErrorHandler>::template definition<ScannerT>::
- template mftype_parser<boost::spirit::functor_parser<openvrml::color_parser> > >
+ template mftype_parser<boost::spirit::classic::functor_parser<openvrml::color_parser> > >
vrml97_grammar<Actions, ErrorHandler>::definition<ScannerT>::mfcolor_p =
typename vrml97_grammar<Actions, ErrorHandler>::template definition<ScannerT>::
template mftype_parser<
- boost::spirit::functor_parser<openvrml::color_parser>
+ boost::spirit::classic::functor_parser<openvrml::color_parser>
>(color_p);
template <typename Actions, typename ErrorHandler>
template <typename ScannerT>
- const boost::spirit::functor_parser<
+ const boost::spirit::classic::functor_parser<
typename vrml97_grammar<Actions, ErrorHandler>::template definition<ScannerT>::
template mftype_parser<
- boost::spirit::real_parser<
+ boost::spirit::classic::real_parser<
float,
- boost::spirit::real_parser_policies<float> > > >
+ boost::spirit::classic::real_parser_policies<float> > > >
vrml97_grammar<Actions, ErrorHandler>::definition<ScannerT>::mffloat_p =
typename vrml97_grammar<Actions, ErrorHandler>::template definition<ScannerT>::
template mftype_parser<
- boost::spirit::real_parser<
+ boost::spirit::classic::real_parser<
float,
- boost::spirit::real_parser_policies<float>
+ boost::spirit::classic::real_parser_policies<float>
>
>(float_p);
template <typename Actions, typename ErrorHandler>
template <typename ScannerT>
- const boost::spirit::functor_parser<
+ const boost::spirit::classic::functor_parser<
typename vrml97_grammar<Actions, ErrorHandler>::template definition<ScannerT>::
template mftype_parser<
- boost::spirit::real_parser<
+ boost::spirit::classic::real_parser<
double,
- boost::spirit::real_parser_policies<double> > > >
+ boost::spirit::classic::real_parser_policies<double> > > >
vrml97_grammar<Actions, ErrorHandler>::definition<ScannerT>::mftime_p =
typename vrml97_grammar<Actions, ErrorHandler>::template definition<ScannerT>::
template mftype_parser<
- boost::spirit::real_parser<
+ boost::spirit::classic::real_parser<
double,
- boost::spirit::real_parser_policies<double>
+ boost::spirit::classic::real_parser_policies<double>
>
- >(boost::spirit::real_p);
+ >(boost::spirit::classic::real_p);
template <typename Actions, typename ErrorHandler>
template <typename ScannerT>
- const boost::spirit::functor_parser<
+ const boost::spirit::classic::functor_parser<
typename vrml97_grammar<Actions, ErrorHandler>::template definition<ScannerT>::
- template mftype_parser<boost::spirit::functor_parser<int32_parser> > >
+ template mftype_parser<boost::spirit::classic::functor_parser<int32_parser> > >
vrml97_grammar<Actions, ErrorHandler>::definition<ScannerT>::mfint32_p =
typename vrml97_grammar<Actions, ErrorHandler>::template definition<ScannerT>::
- template mftype_parser< boost::spirit::functor_parser<int32_parser> >(
+ template mftype_parser< boost::spirit::classic::functor_parser<int32_parser> >(
int32_p);
template <typename Actions, typename ErrorHandler>
template <typename ScannerT>
- const boost::spirit::functor_parser<
+ const boost::spirit::classic::functor_parser<
typename vrml97_grammar<Actions, ErrorHandler>::template definition<ScannerT>::
- template mftype_parser<boost::spirit::functor_parser<string_parser> > >
+ template mftype_parser<boost::spirit::classic::functor_parser<string_parser> > >
vrml97_grammar<Actions, ErrorHandler>::definition<ScannerT>::mfstring_p =
typename vrml97_grammar<Actions, ErrorHandler>::template definition<ScannerT>::
- template mftype_parser<boost::spirit::functor_parser<string_parser> >(
+ template mftype_parser<boost::spirit::classic::functor_parser<string_parser> >(
string_p);
template <typename Actions, typename ErrorHandler>
template <typename ScannerT>
- const boost::spirit::functor_parser<
+ const boost::spirit::classic::functor_parser<
typename vrml97_grammar<Actions, ErrorHandler>::template definition<ScannerT>::
- template mftype_parser<boost::spirit::functor_parser<vec2f_parser> > >
+ template mftype_parser<boost::spirit::classic::functor_parser<vec2f_parser> > >
vrml97_grammar<Actions, ErrorHandler>::definition<ScannerT>::mfvec2f_p =
typename vrml97_grammar<Actions, ErrorHandler>::template definition<ScannerT>::
- template mftype_parser<boost::spirit::functor_parser<vec2f_parser> >(
+ template mftype_parser<boost::spirit::classic::functor_parser<vec2f_parser> >(
vec2f_p);
template <typename Actions, typename ErrorHandler>
template <typename ScannerT>
- const boost::spirit::functor_parser<
+ const boost::spirit::classic::functor_parser<
typename vrml97_grammar<Actions, ErrorHandler>::template definition<ScannerT>::
- template mftype_parser<boost::spirit::functor_parser<vec3f_parser> > >
+ template mftype_parser<boost::spirit::classic::functor_parser<vec3f_parser> > >
vrml97_grammar<Actions, ErrorHandler>::definition<ScannerT>::mfvec3f_p =
typename vrml97_grammar<Actions, ErrorHandler>::template definition<ScannerT>::
- template mftype_parser<boost::spirit::functor_parser<vec3f_parser> >(
+ template mftype_parser<boost::spirit::classic::functor_parser<vec3f_parser> >(
vec3f_p);
template <typename Actions, typename ErrorHandler>
@@ -2488,7 +2489,7 @@
definition(const vrml97_grammar & self):
mfrotation_p(
mftype_parser<
- boost::spirit::functor_parser<
+ boost::spirit::classic::functor_parser<
openvrml::rotation_parser<ErrorHandler>
>
>(self.rotation_p)),
@@ -2518,11 +2519,11 @@
self(self),
node_type_already_exists(false),
invalid_id_rest_char("\x01-\x20\x22\x23\x27,.[\\]{}\x7f"),
- invalid_id_first_char(boost::spirit::chset_p("1234567890+-")
+ invalid_id_first_char(boost::spirit::classic::chset_p("1234567890+-")
| invalid_id_rest_char)
{
using std::string;
- using namespace boost::spirit;
+ using namespace boost::spirit::classic;
using namespace phoenix;
BOOST_SPIRIT_DEBUG_NODE(vrml_scene);
BOOST_SPIRIT_DEBUG_NODE(statement);
@@ -2873,7 +2874,7 @@
template <typename Actions, typename ErrorHandler>
template <typename ScannerT>
- const boost::spirit::rule<ScannerT> &
+ const boost::spirit::classic::rule<ScannerT> &
vrml97_grammar<Actions, ErrorHandler>::definition<ScannerT>::start() const
{
return this->vrml_scene;
Modified: trunk/src/libopenvrml/openvrml/x3d_vrml_grammar.h
===================================================================
--- trunk/src/libopenvrml/openvrml/x3d_vrml_grammar.h 2009-06-22 08:28:39 UTC (rev 3924)
+++ trunk/src/libopenvrml/openvrml/x3d_vrml_grammar.h 2009-06-22 21:11:18 UTC (rev 3925)
@@ -88,12 +88,12 @@
{}
template <typename ScannerT, typename Erro...
[truncated message content] |
