|
|
Boost-Commit : |
From: joel_at_[hidden]
Date: 2008-07-18 11:23:26
Author: djowel
Date: 2008-07-18 11:23:23 EDT (Fri, 18 Jul 2008)
New Revision: 47566
URL: http://svn.boost.org/trac/boost/changeset/47566
Log:
update from release
Added:
branches/release/libs/spirit/classic/example/intermediate/simple_xml/tag.hpp
- copied unchanged from r47560, /trunk/libs/spirit/classic/example/intermediate/simple_xml/tag.hpp
branches/release/libs/spirit/doc/html/spirit/
- copied from r47560, /trunk/libs/spirit/doc/html/spirit/
branches/release/libs/spirit/doc/html/spirit/acknowledgments.html
- copied unchanged from r47560, /trunk/libs/spirit/doc/html/spirit/acknowledgments.html
branches/release/libs/spirit/doc/html/spirit/faq.html
- copied unchanged from r47560, /trunk/libs/spirit/doc/html/spirit/faq.html
branches/release/libs/spirit/doc/html/spirit/introduction.html
- copied unchanged from r47560, /trunk/libs/spirit/doc/html/spirit/introduction.html
branches/release/libs/spirit/doc/html/spirit/lex/
- copied from r47560, /trunk/libs/spirit/doc/html/spirit/lex/
branches/release/libs/spirit/doc/html/spirit/lex.html
- copied unchanged from r47560, /trunk/libs/spirit/doc/html/spirit/lex.html
branches/release/libs/spirit/doc/html/spirit/lex/abstracts/
- copied from r47560, /trunk/libs/spirit/doc/html/spirit/lex/abstracts/
branches/release/libs/spirit/doc/html/spirit/lex/abstracts.html
- copied unchanged from r47560, /trunk/libs/spirit/doc/html/spirit/lex/abstracts.html
branches/release/libs/spirit/doc/html/spirit/lex/abstracts/lexer_attributes.html
- copied unchanged from r47560, /trunk/libs/spirit/doc/html/spirit/lex/abstracts/lexer_attributes.html
branches/release/libs/spirit/doc/html/spirit/lex/abstracts/lexer_parsing.html
- copied unchanged from r47560, /trunk/libs/spirit/doc/html/spirit/lex/abstracts/lexer_parsing.html
branches/release/libs/spirit/doc/html/spirit/lex/abstracts/lexer_semantic_actions.html
- copied unchanged from r47560, /trunk/libs/spirit/doc/html/spirit/lex/abstracts/lexer_semantic_actions.html
branches/release/libs/spirit/doc/html/spirit/lex/abstracts/lexer_states.html
- copied unchanged from r47560, /trunk/libs/spirit/doc/html/spirit/lex/abstracts/lexer_states.html
branches/release/libs/spirit/doc/html/spirit/lex/abstracts/lexer_static_model.html
- copied unchanged from r47560, /trunk/libs/spirit/doc/html/spirit/lex/abstracts/lexer_static_model.html
branches/release/libs/spirit/doc/html/spirit/lex/abstracts/lexer_tokenizing.html
- copied unchanged from r47560, /trunk/libs/spirit/doc/html/spirit/lex/abstracts/lexer_tokenizing.html
branches/release/libs/spirit/doc/html/spirit/lex/quick_reference.html
- copied unchanged from r47560, /trunk/libs/spirit/doc/html/spirit/lex/quick_reference.html
branches/release/libs/spirit/doc/html/spirit/lex/reference/
- copied from r47560, /trunk/libs/spirit/doc/html/spirit/lex/reference/
branches/release/libs/spirit/doc/html/spirit/lex/reference.html
- copied unchanged from r47560, /trunk/libs/spirit/doc/html/spirit/lex/reference.html
branches/release/libs/spirit/doc/html/spirit/lex/reference/lexer_class.html
- copied unchanged from r47560, /trunk/libs/spirit/doc/html/spirit/lex/reference/lexer_class.html
branches/release/libs/spirit/doc/html/spirit/lex/reference/token_class.html
- copied unchanged from r47560, /trunk/libs/spirit/doc/html/spirit/lex/reference/token_class.html
branches/release/libs/spirit/doc/html/spirit/lex/reference/tokendef_class.html
- copied unchanged from r47560, /trunk/libs/spirit/doc/html/spirit/lex/reference/tokendef_class.html
branches/release/libs/spirit/doc/html/spirit/lex/reference/tokenset_class.html
- copied unchanged from r47560, /trunk/libs/spirit/doc/html/spirit/lex/reference/tokenset_class.html
branches/release/libs/spirit/doc/html/spirit/lex/tutorials/
- copied from r47560, /trunk/libs/spirit/doc/html/spirit/lex/tutorials/
branches/release/libs/spirit/doc/html/spirit/lex/tutorials.html
- copied unchanged from r47560, /trunk/libs/spirit/doc/html/spirit/lex/tutorials.html
branches/release/libs/spirit/doc/html/spirit/lex/tutorials/lexer_quickstart1.html
- copied unchanged from r47560, /trunk/libs/spirit/doc/html/spirit/lex/tutorials/lexer_quickstart1.html
branches/release/libs/spirit/doc/html/spirit/lex/tutorials/lexer_quickstart2.html
- copied unchanged from r47560, /trunk/libs/spirit/doc/html/spirit/lex/tutorials/lexer_quickstart2.html
branches/release/libs/spirit/doc/html/spirit/lex/tutorials/lexer_quickstart3.html
- copied unchanged from r47560, /trunk/libs/spirit/doc/html/spirit/lex/tutorials/lexer_quickstart3.html
branches/release/libs/spirit/doc/html/spirit/notes/
- copied from r47560, /trunk/libs/spirit/doc/html/spirit/notes/
branches/release/libs/spirit/doc/html/spirit/notes.html
- copied unchanged from r47560, /trunk/libs/spirit/doc/html/spirit/notes.html
branches/release/libs/spirit/doc/html/spirit/notes/porting_from_spirit_1_8_x.html
- copied unchanged from r47560, /trunk/libs/spirit/doc/html/spirit/notes/porting_from_spirit_1_8_x.html
branches/release/libs/spirit/doc/html/spirit/notes/style_guide.html
- copied unchanged from r47560, /trunk/libs/spirit/doc/html/spirit/notes/style_guide.html
branches/release/libs/spirit/doc/html/spirit/notes/techniques.html
- copied unchanged from r47560, /trunk/libs/spirit/doc/html/spirit/notes/techniques.html
branches/release/libs/spirit/doc/html/spirit/qi_and_karma/
- copied from r47560, /trunk/libs/spirit/doc/html/spirit/qi_and_karma/
branches/release/libs/spirit/doc/html/spirit/qi_and_karma.html
- copied unchanged from r47560, /trunk/libs/spirit/doc/html/spirit/qi_and_karma.html
branches/release/libs/spirit/doc/html/spirit/qi_and_karma/abstracts/
- copied from r47560, /trunk/libs/spirit/doc/html/spirit/qi_and_karma/abstracts/
branches/release/libs/spirit/doc/html/spirit/qi_and_karma/abstracts.html
- copied unchanged from r47560, /trunk/libs/spirit/doc/html/spirit/qi_and_karma/abstracts.html
branches/release/libs/spirit/doc/html/spirit/qi_and_karma/abstracts/attributes.html
- copied unchanged from r47560, /trunk/libs/spirit/doc/html/spirit/qi_and_karma/abstracts/attributes.html
branches/release/libs/spirit/doc/html/spirit/qi_and_karma/abstracts/debugging.html
- copied unchanged from r47560, /trunk/libs/spirit/doc/html/spirit/qi_and_karma/abstracts/debugging.html
branches/release/libs/spirit/doc/html/spirit/qi_and_karma/abstracts/directives.html
- copied unchanged from r47560, /trunk/libs/spirit/doc/html/spirit/qi_and_karma/abstracts/directives.html
branches/release/libs/spirit/doc/html/spirit/qi_and_karma/abstracts/error_handling.html
- copied unchanged from r47560, /trunk/libs/spirit/doc/html/spirit/qi_and_karma/abstracts/error_handling.html
branches/release/libs/spirit/doc/html/spirit/qi_and_karma/abstracts/grammars.html
- copied unchanged from r47560, /trunk/libs/spirit/doc/html/spirit/qi_and_karma/abstracts/grammars.html
branches/release/libs/spirit/doc/html/spirit/qi_and_karma/abstracts/mini_xml___error_handling.html
- copied unchanged from r47560, /trunk/libs/spirit/doc/html/spirit/qi_and_karma/abstracts/mini_xml___error_handling.html
branches/release/libs/spirit/doc/html/spirit/qi_and_karma/abstracts/operators.html
- copied unchanged from r47560, /trunk/libs/spirit/doc/html/spirit/qi_and_karma/abstracts/operators.html
branches/release/libs/spirit/doc/html/spirit/qi_and_karma/abstracts/parse_trees_and_asts.html
- copied unchanged from r47560, /trunk/libs/spirit/doc/html/spirit/qi_and_karma/abstracts/parse_trees_and_asts.html
branches/release/libs/spirit/doc/html/spirit/qi_and_karma/abstracts/parsing.html
- copied unchanged from r47560, /trunk/libs/spirit/doc/html/spirit/qi_and_karma/abstracts/parsing.html
branches/release/libs/spirit/doc/html/spirit/qi_and_karma/abstracts/parsing_and_generating.html
- copied unchanged from r47560, /trunk/libs/spirit/doc/html/spirit/qi_and_karma/abstracts/parsing_and_generating.html
branches/release/libs/spirit/doc/html/spirit/qi_and_karma/abstracts/primitives.html
- copied unchanged from r47560, /trunk/libs/spirit/doc/html/spirit/qi_and_karma/abstracts/primitives.html
branches/release/libs/spirit/doc/html/spirit/qi_and_karma/abstracts/rules.html
- copied unchanged from r47560, /trunk/libs/spirit/doc/html/spirit/qi_and_karma/abstracts/rules.html
branches/release/libs/spirit/doc/html/spirit/qi_and_karma/abstracts/semantic_actions.html
- copied unchanged from r47560, /trunk/libs/spirit/doc/html/spirit/qi_and_karma/abstracts/semantic_actions.html
branches/release/libs/spirit/doc/html/spirit/qi_and_karma/quick_reference.html
- copied unchanged from r47560, /trunk/libs/spirit/doc/html/spirit/qi_and_karma/quick_reference.html
branches/release/libs/spirit/doc/html/spirit/qi_and_karma/reference/
- copied from r47560, /trunk/libs/spirit/doc/html/spirit/qi_and_karma/reference/
branches/release/libs/spirit/doc/html/spirit/qi_and_karma/reference.html
- copied unchanged from r47560, /trunk/libs/spirit/doc/html/spirit/qi_and_karma/reference.html
branches/release/libs/spirit/doc/html/spirit/qi_and_karma/reference/action.html
- copied unchanged from r47560, /trunk/libs/spirit/doc/html/spirit/qi_and_karma/reference/action.html
branches/release/libs/spirit/doc/html/spirit/qi_and_karma/reference/auxiliary.html
- copied unchanged from r47560, /trunk/libs/spirit/doc/html/spirit/qi_and_karma/reference/auxiliary.html
branches/release/libs/spirit/doc/html/spirit/qi_and_karma/reference/binary.html
- copied unchanged from r47560, /trunk/libs/spirit/doc/html/spirit/qi_and_karma/reference/binary.html
branches/release/libs/spirit/doc/html/spirit/qi_and_karma/reference/char.html
- copied unchanged from r47560, /trunk/libs/spirit/doc/html/spirit/qi_and_karma/reference/char.html
branches/release/libs/spirit/doc/html/spirit/qi_and_karma/reference/debug.html
- copied unchanged from r47560, /trunk/libs/spirit/doc/html/spirit/qi_and_karma/reference/debug.html
branches/release/libs/spirit/doc/html/spirit/qi_and_karma/reference/directive.html
- copied unchanged from r47560, /trunk/libs/spirit/doc/html/spirit/qi_and_karma/reference/directive.html
branches/release/libs/spirit/doc/html/spirit/qi_and_karma/reference/nonterminal.html
- copied unchanged from r47560, /trunk/libs/spirit/doc/html/spirit/qi_and_karma/reference/nonterminal.html
branches/release/libs/spirit/doc/html/spirit/qi_and_karma/reference/numeric.html
- copied unchanged from r47560, /trunk/libs/spirit/doc/html/spirit/qi_and_karma/reference/numeric.html
branches/release/libs/spirit/doc/html/spirit/qi_and_karma/reference/operators.html
- copied unchanged from r47560, /trunk/libs/spirit/doc/html/spirit/qi_and_karma/reference/operators.html
branches/release/libs/spirit/doc/html/spirit/qi_and_karma/reference/stream.html
- copied unchanged from r47560, /trunk/libs/spirit/doc/html/spirit/qi_and_karma/reference/stream.html
branches/release/libs/spirit/doc/html/spirit/qi_and_karma/reference/string.html
- copied unchanged from r47560, /trunk/libs/spirit/doc/html/spirit/qi_and_karma/reference/string.html
branches/release/libs/spirit/doc/html/spirit/rationale.html
- copied unchanged from r47560, /trunk/libs/spirit/doc/html/spirit/rationale.html
branches/release/libs/spirit/doc/html/spirit/references.html
- copied unchanged from r47560, /trunk/libs/spirit/doc/html/spirit/references.html
branches/release/libs/spirit/doc/html/spirit/what_s_new.html
- copied unchanged from r47560, /trunk/libs/spirit/doc/html/spirit/what_s_new.html
branches/release/libs/spirit/doc/qi_and_karma/employee.qbk
- copied unchanged from r47560, /trunk/libs/spirit/doc/qi_and_karma/employee.qbk
branches/release/libs/spirit/doc/qi_and_karma/mini_xml.qbk
- copied unchanged from r47560, /trunk/libs/spirit/doc/qi_and_karma/mini_xml.qbk
branches/release/libs/spirit/example/qi/mini_xml3.cpp
- copied unchanged from r47560, /trunk/libs/spirit/example/qi/mini_xml3.cpp
branches/release/libs/spirit/example/qi/mini_xml_samples/4.toyxml
- copied unchanged from r47560, /trunk/libs/spirit/example/qi/mini_xml_samples/4.toyxml
Removed:
branches/release/libs/spirit/doc/html/images/lexerflow.png
Text files modified:
branches/release/libs/spirit/classic/example/Jamfile | 9
branches/release/libs/spirit/classic/example/fundamental/distinct/distinct_parser.cpp | 2
branches/release/libs/spirit/classic/example/fundamental/distinct/distinct_parser_dynamic.cpp | 2
branches/release/libs/spirit/classic/example/fundamental/more_calculators/primitive_calc.cpp | 4
branches/release/libs/spirit/classic/example/fundamental/more_calculators/rpn_calc.cpp | 2
branches/release/libs/spirit/classic/example/fundamental/no_actions.cpp | 4
branches/release/libs/spirit/classic/example/fundamental/parser_context.cpp | 8
branches/release/libs/spirit/classic/example/fundamental/stuff_vector.cpp | 4
branches/release/libs/spirit/classic/example/fundamental/stuff_vector2.cpp | 6
branches/release/libs/spirit/classic/example/fundamental/sum.cpp | 4
branches/release/libs/spirit/classic/example/intermediate/ipv4_opt.cpp | 2
branches/release/libs/spirit/classic/example/intermediate/lazy_parser.cpp | 6
branches/release/libs/spirit/classic/example/intermediate/parameters.cpp | 8
branches/release/libs/spirit/classic/example/techniques/epsilon.cpp | 4
branches/release/libs/spirit/classic/example/techniques/no_rules/no_rule3.cpp | 2
branches/release/libs/spirit/doc/html/index.html | 87 +-
branches/release/libs/spirit/example/lex/word_count_functor_flex.cpp | 1478 ++++++++++++++++++++--------------------
17 files changed, 823 insertions(+), 809 deletions(-)
Modified: branches/release/libs/spirit/classic/example/Jamfile
==============================================================================
--- branches/release/libs/spirit/classic/example/Jamfile (original)
+++ branches/release/libs/spirit/classic/example/Jamfile 2008-07-18 11:23:23 EDT (Fri, 18 Jul 2008)
@@ -122,6 +122,7 @@
exe regular_expression
: fundamental/regular_expression.cpp
+ /boost//regex
:
;
@@ -219,6 +220,14 @@
exe regex_convert
: intermediate/regex_convert.cpp
+ /boost//regex
+ :
+ ;
+
+exe simple_xml
+ : intermediate/simple_xml/driver.cpp
+ intermediate/simple_xml/tag.cpp
+ intermediate/simple_xml/tag.cpp
:
;
Modified: branches/release/libs/spirit/classic/example/fundamental/distinct/distinct_parser.cpp
==============================================================================
--- branches/release/libs/spirit/classic/example/fundamental/distinct/distinct_parser.cpp (original)
+++ branches/release/libs/spirit/classic/example/fundamental/distinct/distinct_parser.cpp 2008-07-18 11:23:23 EDT (Fri, 18 Jul 2008)
@@ -14,7 +14,7 @@
using namespace std;
using namespace boost;
-using namespace spirit;
+using namespace BOOST_SPIRIT_CLASSIC_NS;
// keyword_p for C++
// (for basic usage instead of std_p)
Modified: branches/release/libs/spirit/classic/example/fundamental/distinct/distinct_parser_dynamic.cpp
==============================================================================
--- branches/release/libs/spirit/classic/example/fundamental/distinct/distinct_parser_dynamic.cpp (original)
+++ branches/release/libs/spirit/classic/example/fundamental/distinct/distinct_parser_dynamic.cpp 2008-07-18 11:23:23 EDT (Fri, 18 Jul 2008)
@@ -14,7 +14,7 @@
using namespace std;
using namespace boost;
-using namespace spirit;
+using namespace BOOST_SPIRIT_CLASSIC_NS;
struct my_grammar: public grammar<my_grammar>
{
Modified: branches/release/libs/spirit/classic/example/fundamental/more_calculators/primitive_calc.cpp
==============================================================================
--- branches/release/libs/spirit/classic/example/fundamental/more_calculators/primitive_calc.cpp (original)
+++ branches/release/libs/spirit/classic/example/fundamental/more_calculators/primitive_calc.cpp 2008-07-18 11:23:23 EDT (Fri, 18 Jul 2008)
@@ -15,8 +15,8 @@
//
///////////////////////////////////////////////////////////////////////////////
#include <boost/spirit/include/classic_core.hpp>
-#include <boost/spirit/include/classic_primitives.hpp>
-#include <boost/spirit/include/classic_operators.hpp>
+#include <boost/spirit/include/phoenix1_primitives.hpp>
+#include <boost/spirit/include/phoenix1_operators.hpp>
#include <iostream>
#include <string>
Modified: branches/release/libs/spirit/classic/example/fundamental/more_calculators/rpn_calc.cpp
==============================================================================
--- branches/release/libs/spirit/classic/example/fundamental/more_calculators/rpn_calc.cpp (original)
+++ branches/release/libs/spirit/classic/example/fundamental/more_calculators/rpn_calc.cpp 2008-07-18 11:23:23 EDT (Fri, 18 Jul 2008)
@@ -18,7 +18,7 @@
///////////////////////////////////////////////////////////////////////////////
#include <boost/spirit/include/classic_core.hpp>
#include <boost/spirit/include/classic_attribute.hpp>
-#include <boost/spirit/include/classic_functions.hpp>
+#include <boost/spirit/include/phoenix1_functions.hpp>
#include <iostream>
#include <string>
Modified: branches/release/libs/spirit/classic/example/fundamental/no_actions.cpp
==============================================================================
--- branches/release/libs/spirit/classic/example/fundamental/no_actions.cpp (original)
+++ branches/release/libs/spirit/classic/example/fundamental/no_actions.cpp 2008-07-18 11:23:23 EDT (Fri, 18 Jul 2008)
@@ -22,7 +22,7 @@
using namespace std;
using namespace boost;
-using namespace spirit;
+using namespace BOOST_SPIRIT_CLASSIC_NS;
//-----------------------------------------------------------------------------
@@ -39,7 +39,7 @@
parse_info<> info = parse(
"1",
-
+
no_actions_d
[
r
Modified: branches/release/libs/spirit/classic/example/fundamental/parser_context.cpp
==============================================================================
--- branches/release/libs/spirit/classic/example/fundamental/parser_context.cpp (original)
+++ branches/release/libs/spirit/classic/example/fundamental/parser_context.cpp 2008-07-18 11:23:23 EDT (Fri, 18 Jul 2008)
@@ -19,8 +19,8 @@
// In this example int_rule is declared as rule with int match attribute's
// type, so in int_rule variable we can hold any parser, which returns int
// value. For example int_p or bin_p. And the most important is that we can
-// use returned value in the semantic action binded to the int_rule.
-//
+// use returned value in the semantic action binded to the int_rule.
+//
//-----------------------------------------------------------------------------
#include <iostream>
#include <boost/cstdlib.hpp>
@@ -30,7 +30,7 @@
using namespace std;
using namespace boost;
using namespace phoenix;
-using namespace spirit;
+using namespace BOOST_SPIRIT_CLASSIC_NS;
//-----------------------------------------------------------------------------
@@ -41,7 +41,7 @@
parse(
"123",
// Using a returned value in the semantic action
- int_rule[cout << arg1 << endl]
+ int_rule[cout << arg1 << endl]
);
return exit_success;
Modified: branches/release/libs/spirit/classic/example/fundamental/stuff_vector.cpp
==============================================================================
--- branches/release/libs/spirit/classic/example/fundamental/stuff_vector.cpp (original)
+++ branches/release/libs/spirit/classic/example/fundamental/stuff_vector.cpp 2008-07-18 11:23:23 EDT (Fri, 18 Jul 2008)
@@ -16,9 +16,9 @@
//
///////////////////////////////////////////////////////////////////////////////
#include <boost/spirit/include/classic_core.hpp>
-#include <boost/spirit/include/classic_primitives.hpp>
#include <boost/spirit/include/classic_operators.hpp>
-#include <boost/spirit/include/classic_functions.hpp>
+#include <boost/spirit/include/phoenix1_functions.hpp>
+#include <boost/spirit/include/phoenix1_primitives.hpp>
#include <iostream>
#include <string>
Modified: branches/release/libs/spirit/classic/example/fundamental/stuff_vector2.cpp
==============================================================================
--- branches/release/libs/spirit/classic/example/fundamental/stuff_vector2.cpp (original)
+++ branches/release/libs/spirit/classic/example/fundamental/stuff_vector2.cpp 2008-07-18 11:23:23 EDT (Fri, 18 Jul 2008)
@@ -16,10 +16,10 @@
//
///////////////////////////////////////////////////////////////////////////////
#include <boost/spirit/include/classic_core.hpp>
-#include <boost/spirit/include/classic_primitives.hpp>
#include <boost/spirit/include/classic_operators.hpp>
-#include <boost/spirit/include/classic_functions.hpp>
-#include <boost/spirit/include/classic_casts.hpp>
+#include <boost/spirit/include/phoenix1_functions.hpp>
+#include <boost/spirit/include/phoenix1_primitives.hpp>
+#include <boost/spirit/include/phoenix1_casts.hpp>
#include <iostream>
#include <string>
Modified: branches/release/libs/spirit/classic/example/fundamental/sum.cpp
==============================================================================
--- branches/release/libs/spirit/classic/example/fundamental/sum.cpp (original)
+++ branches/release/libs/spirit/classic/example/fundamental/sum.cpp 2008-07-18 11:23:23 EDT (Fri, 18 Jul 2008)
@@ -15,8 +15,8 @@
//
///////////////////////////////////////////////////////////////////////////////
#include <boost/spirit/include/classic_core.hpp>
-#include <boost/spirit/include/classic_primitives.hpp>
-#include <boost/spirit/include/classic_operators.hpp>
+#include <boost/spirit/include/phoenix1_primitives.hpp>
+#include <boost/spirit/include/phoenix1_operators.hpp>
#include <iostream>
#include <string>
Modified: branches/release/libs/spirit/classic/example/intermediate/ipv4_opt.cpp
==============================================================================
--- branches/release/libs/spirit/classic/example/intermediate/ipv4_opt.cpp (original)
+++ branches/release/libs/spirit/classic/example/intermediate/ipv4_opt.cpp 2008-07-18 11:23:23 EDT (Fri, 18 Jul 2008)
@@ -10,7 +10,7 @@
#include <boost/spirit/include/classic_push_back_actor.hpp>
#include <boost/spirit/include/classic_if.hpp>
#include <boost/spirit/include/classic_for.hpp>
-#include <boost/spirit/include/classic_phoenix.hpp>
+#include <boost/spirit/include/phoenix1.hpp>
#include <iostream>
#include <string>
#include <vector>
Modified: branches/release/libs/spirit/classic/example/intermediate/lazy_parser.cpp
==============================================================================
--- branches/release/libs/spirit/classic/example/intermediate/lazy_parser.cpp (original)
+++ branches/release/libs/spirit/classic/example/intermediate/lazy_parser.cpp 2008-07-18 11:23:23 EDT (Fri, 18 Jul 2008)
@@ -39,7 +39,7 @@
#include <boost/spirit/include/classic_dynamic.hpp>
using namespace boost;
-using namespace spirit;
+using namespace BOOST_SPIRIT_CLASSIC_NS;
using namespace phoenix;
//-----------------------------------------------------------------------------
@@ -56,14 +56,14 @@
typedef stored_rule<ScannerT, parser_context<int> > number_rule_t;
struct block_closure;
- typedef spirit::closure<
+ typedef boost::spirit::classic::closure<
block_closure,
int,
typename number_rule_t::alias_t>
closure_base_t;
struct block_closure : closure_base_t
- {
+ {
typename closure_base_t::member1 sum;
typename closure_base_t::member2 int_rule;
};
Modified: branches/release/libs/spirit/classic/example/intermediate/parameters.cpp
==============================================================================
--- branches/release/libs/spirit/classic/example/intermediate/parameters.cpp (original)
+++ branches/release/libs/spirit/classic/example/intermediate/parameters.cpp 2008-07-18 11:23:23 EDT (Fri, 18 Jul 2008)
@@ -25,12 +25,12 @@
#include <boost/spirit/include/classic_core.hpp>
#include <boost/spirit/include/classic_symbols.hpp>
-
-#include <boost/spirit/include/classic_phx1_tuples.hpp>
-#include <boost/spirit/include/classic_phx1_tuple_helpers.hpp>
-#include <boost/spirit/include/classic_primitives.hpp>
#include <boost/spirit/include/classic_closure.hpp>
+#include <boost/spirit/include/phoenix1_tuples.hpp>
+#include <boost/spirit/include/phoenix1_tuple_helpers.hpp>
+#include <boost/spirit/include/phoenix1_primitives.hpp>
+
///////////////////////////////////////////////////////////////////////////////
// used namespaces
using namespace BOOST_SPIRIT_CLASSIC_NS;
Modified: branches/release/libs/spirit/classic/example/techniques/epsilon.cpp
==============================================================================
--- branches/release/libs/spirit/classic/example/techniques/epsilon.cpp (original)
+++ branches/release/libs/spirit/classic/example/techniques/epsilon.cpp 2008-07-18 11:23:23 EDT (Fri, 18 Jul 2008)
@@ -32,7 +32,7 @@
using namespace std;
using namespace boost;
-using namespace spirit;
+using namespace BOOST_SPIRIT_CLASSIC_NS;
using namespace phoenix;
//-----------------------------------------------------------------------------
@@ -51,7 +51,7 @@
parse_info<> info = parse(
"1",
-
+
// r rule is used twice but the semantic action is invoked only once
epsilon_p(r) >> r,
Modified: branches/release/libs/spirit/classic/example/techniques/no_rules/no_rule3.cpp
==============================================================================
--- branches/release/libs/spirit/classic/example/techniques/no_rules/no_rule3.cpp (original)
+++ branches/release/libs/spirit/classic/example/techniques/no_rules/no_rule3.cpp 2008-07-18 11:23:23 EDT (Fri, 18 Jul 2008)
@@ -49,7 +49,7 @@
// Client code
//
///////////////////////////////////////////////////////////////////////////////
-struct skip_grammar : sub_grammar<skip_grammar>
+struct skip_grammar : boost::spirit::sub_grammar<skip_grammar>
{
typedef
alternative<alternative<space_parser, sequence<sequence<
Deleted: branches/release/libs/spirit/doc/html/images/lexerflow.png
==============================================================================
Binary file. No diff available.
Modified: branches/release/libs/spirit/doc/html/index.html
==============================================================================
--- branches/release/libs/spirit/doc/html/index.html (original)
+++ branches/release/libs/spirit/doc/html/index.html 2008-07-18 11:23:23 EDT (Fri, 18 Jul 2008)
@@ -34,7 +34,7 @@
<div><p class="copyright">Copyright © 2001-2008 Joel de Guzman,
Hartmut Kaiser</p></div>
<div><div class="legalnotice">
-<a name="id385790"></a><p>
+<a name="id616212"></a><p>
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)
</p>
@@ -68,6 +68,12 @@
List Attribute - one more, with style</a></span></dt>
<dt><span class="section"><a href="spirit/qi_and_karma.html#spirit.qi_and_karma.tutorials.roman_numerals">Roman
Numerals</a></span></dt>
+<dt><span class="section"><a href="spirit/qi_and_karma.html#spirit.qi_and_karma.tutorials.employee___parsing_into_structs">Employee
+ - Parsing into structs</a></span></dt>
+<dt><span class="section"><a href="spirit/qi_and_karma.html#spirit.qi_and_karma.tutorials.mini_xml___asts_">Mini
+ XML - ASTs!</a></span></dt>
+<dt><span class="section"><a href="spirit/qi_and_karma.html#spirit.qi_and_karma.tutorials.mini_xml___error_handling">Mini
+ XML - Error Handling</a></span></dt>
</dl></dd>
<dt><span class="section">Abstracts</span></dt>
<dd><dl>
@@ -85,8 +91,8 @@
<dt><span class="section">Rules</span></dt>
<dt><span class="section">Grammars</span></dt>
<dt><span class="section">Debugging</span></dt>
-<dt><span class="section"><a href="spirit/qi_and_karma/abstracts/error_handling.html">Error
- Handling</a></span></dt>
+<dt><span class="section"><a href="spirit/qi_and_karma/abstracts/mini_xml___error_handling.html">Mini
+ XML - Error Handling</a></span></dt>
<dt><span class="section"><a href="spirit/qi_and_karma/abstracts/parse_trees_and_asts.html">Parse
Trees and ASTs</a></span></dt>
</dl></dd>
@@ -107,44 +113,43 @@
<dt><span class="section">Debug</span></dt>
</dl></dd>
</dl></dd>
-<dt><span class="section">Spirit.Lex</span></dt>
+<dt><span class="section"> Spirit.Lex</span></dt>
<dd><dl>
-<dt><span class="section"><a href="spirit/__lex__.html#spirit.__lex__.introduction_to___lex__">Introduction
- to <span class="emphasis"><em>Spirit.Lex</em></span></a></span></dt>
-<dt><span class="section"><a href="spirit/__lex__/__lex___tutorials.html"><span class="emphasis"><em>Spirit.Lex</em></span>
+<dt><span class="section"> Introduction to Spirit.Lex</span></dt>
+<dt><span class="section"><a href="spirit/lex/tutorials.html"> <span class="emphasis"><em>Spirit.Lex</em></span>
Tutorials</a></span></dt>
<dd><dl>
-<dt><span class="section"><a href="spirit/__lex__/__lex___tutorials.html#spirit.__lex__.__lex___tutorials.__lex___tutorials_overview"><span class="emphasis"><em>Spirit.Lex</em></span>
+<dt><span class="section"><a href="spirit/lex/tutorials.html#spirit.lex.tutorials.lexer_tutorials"> <span class="emphasis"><em>Spirit.Lex</em></span>
Tutorials Overview</a></span></dt>
-<dt><span class="section"><a href="spirit/__lex__/__lex___tutorials/quickstart_1___a_word_counter_using___lex__.html">Quickstart
+<dt><span class="section"><a href="spirit/lex/tutorials/lexer_quickstart1.html"> Quickstart
1 - A word counter using <span class="emphasis"><em>Spirit.Lex</em></span></a></span></dt>
-<dt><span class="section"><a href="spirit/__lex__/__lex___tutorials/quickstart_2___a_better_word_counter_using___lex__.html">Quickstart
+<dt><span class="section"><a href="spirit/lex/tutorials/lexer_quickstart2.html"> Quickstart
2 - A better word counter using <span class="emphasis"><em>Spirit.Lex</em></span></a></span></dt>
-<dt><span class="section"><a href="spirit/__lex__/__lex___tutorials/quickstart_3___counting_words_using_a_parser.html">Quickstart
+<dt><span class="section"><a href="spirit/lex/tutorials/lexer_quickstart3.html"> Quickstart
3 - Counting Words Using a Parser</a></span></dt>
</dl></dd>
-<dt><span class="section">Abstracts</span></dt>
+<dt><span class="section"> Abstracts</span></dt>
<dd><dl>
-<dt><span class="section">Lexer Primitives</span></dt>
-<dt><span class="section"><a href="spirit/__lex__/abstracts/tokenizing_input_data.html">Tokenizing
+<dt><span class="section">Lexer Primitives</span></dt>
+<dt><span class="section"><a href="spirit/lex/abstracts/lexer_tokenizing.html"> Tokenizing
Input Data</a></span></dt>
-<dt><span class="section"><a href="spirit/__lex__/abstracts/lexer_semantic_actions.html">Lexer
+<dt><span class="section"><a href="spirit/lex/abstracts/lexer_semantic_actions.html"> Lexer
Semantic Actions</a></span></dt>
-<dt><span class="section"><a href="spirit/__lex__/abstracts/the__static__lexer_model.html">The
- <span class="emphasis"><em>Static</em></span> Lexer Model</a></span></dt>
-<dt><span class="section"><a href="spirit/__lex__/abstracts/parsing_using_a_lexer.html">Parsing
- using a Lexer</a></span></dt>
-<dt><span class="section">Lexer Attributes</span></dt>
-<dt><span class="section">Lexer States</span></dt>
+<dt><span class="section"><a href="spirit/lex/abstracts/lexer_static_model.html"> The <span class="emphasis"><em>Static</em></span>
+ Lexer Model</a></span></dt>
+<dt><span class="section"><a href="spirit/lex/abstracts/lexer_parsing.html"> Parsing using
+ a Lexer</a></span></dt>
+<dt><span class="section"> Lexer Attributes</span></dt>
+<dt><span class="section"> Lexer States</span></dt>
</dl></dd>
-<dt><span class="section">Quick Reference</span></dt>
-<dt><span class="section">Reference</span></dt>
+<dt><span class="section"> Quick Reference</span></dt>
+<dt><span class="section"> Reference</span></dt>
<dd><dl>
-<dt><span class="section">Concepts</span></dt>
-<dt><span class="section">Lexer Class</span></dt>
-<dt><span class="section">Token Class</span></dt>
-<dt><span class="section">TokenDef Class</span></dt>
-<dt><span class="section">TokenSet Class</span></dt>
+<dt><span class="section"> Concepts</span></dt>
+<dt><span class="section">Lexer Class</span></dt>
+<dt><span class="section">Token Class</span></dt>
+<dt><span class="section">TokenDef Class</span></dt>
+<dt><span class="section">TokenSet Class</span></dt>
</dl></dd>
</dl></dd>
<dt><span class="section">FAQ</span></dt>
@@ -179,11 +184,11 @@
</p>
</blockquote></div>
<a name="spirit.preface.history"></a><h3>
-<a name="id387005"></a>
+<a name="id616266"></a>
<a href="index.html#spirit.preface.history">History</a>
</h3>
<a name="spirit.preface._emphasis_80s__emphasis_"></a><h3>
-<a name="id385807"></a>
+<a name="id616279"></a>
<a href="index.html#spirit.preface._emphasis_80s__emphasis_"><span class="emphasis"><em>80s</em></span></a>
</h3>
<p>
@@ -197,7 +202,7 @@
recursive-descent parser. This worked very well.
</p>
<a name="spirit.preface._emphasis_90s__emphasis_"></a><h3>
-<a name="id385846"></a>
+<a name="id616297"></a>
<a href="index.html#spirit.preface._emphasis_90s__emphasis_"><span class="emphasis"><em>90s</em></span></a>
</h3>
<p>
@@ -242,7 +247,7 @@
here: pre-Spirit.
</p>
<a name="spirit.preface._emphasis_2001_to_2006__emphasis_"></a><h3>
-<a name="id387238"></a>
+<a name="id616340"></a>
<a href="index.html#spirit.preface._emphasis_2001_to_2006__emphasis_"><span class="emphasis"><em>2001
to 2006</em></span></a>
</h3>
@@ -272,7 +277,7 @@
for design and implementation quality, robustness, and reusability.
</p>
<a name="spirit.preface._emphasis_2007__emphasis_"></a><h3>
-<a name="id387314"></a>
+<a name="id616375"></a>
<a href="index.html#spirit.preface._emphasis_2007__emphasis_"><span class="emphasis"><em>2007</em></span></a>
</h3>
<p>
@@ -302,7 +307,7 @@
Templates</a> library called -Boost.Proto-.
</p>
<a name="spirit.preface.new_ideas__spirit_v2"></a><h3>
-<a name="id387434"></a>
+<a name="id616441"></a>
<a href="index.html#spirit.preface.new_ideas__spirit_v2">New Ideas: Spirit V2</a>
</h3>
<p>
@@ -340,12 +345,12 @@
same underlying component library as for the parser and generator libraries.
</p>
<a name="spirit.preface.how_to_use_this_manual"></a><h3>
-<a name="id387536"></a>
+<a name="id616491"></a>
<a href="index.html#spirit.preface.how_to_use_this_manual">How to use this manual</a>
</h3>
<p>
Each major section (there are two: <a href="spirit/qi_and_karma.html" title="Qi and Karma">Qi and
- Karma</a>, and Lex) is roughly divided
+ Karma</a>, and Lex) is roughly divided
into 3 parts:
</p>
<div class="orderedlist"><ol type="1">
@@ -371,7 +376,7 @@
icons precede some text to indicate:
</p>
<div class="table">
-<a name="id385325"></a><p class="title"><b>Table 1. Icons</b></p>
+<a name="id616539"></a><p class="title"><b>Table 1. Icons</b></p>
<table class="table" summary="Icons">
<colgroup>
<col>
@@ -492,13 +497,13 @@
Tools</a>.
</p>
<a name="spirit.preface.support"></a><h3>
-<a name="id385595"></a>
+<a name="id616780"></a>
<a href="index.html#spirit.preface.support">Support</a>
</h3>
<p>
Please direct all questions to Spirit's mailing list. You can subscribe to
- the <a href="https://lists.sourceforge.net/lists/listinfo/spirit-general" target="_top">Spirit
- Mailing List</a>. The mailing list has a searchable archive. A search link
+ the <a href="http://www.nabble.com/The-Spirit-Parser-Library-f3430.html" target="_top">Spirit
+ General List</a>. The mailing list has a searchable archive. A search link
to this archive is provided in Spirit's
home page. You may also read and post messages to the mailing list through
<a href="news://news.gmane.org/gmane.comp.spirit.general" target="_top">Spirit General
@@ -508,7 +513,7 @@
</div>
</div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"><p><small>Last revised: July 10, 2008 at 15:45:10 GMT</small></p></td>
+<td align="left"><p><small>Last revised: July 16, 2008 at 03:04:03 GMT</small></p></td>
<td align="right"><div class="copyright-footer"></div></td>
</tr></table>
<hr>
Modified: branches/release/libs/spirit/example/lex/word_count_functor_flex.cpp
==============================================================================
--- branches/release/libs/spirit/example/lex/word_count_functor_flex.cpp (original)
+++ branches/release/libs/spirit/example/lex/word_count_functor_flex.cpp 2008-07-18 11:23:23 EDT (Fri, 18 Jul 2008)
@@ -33,7 +33,7 @@
/* The "const" storage-class-modifier is valid. */
#define YY_USE_CONST
-#else /* ! __cplusplus */
+#else /* ! __cplusplus */
#if __STDC__
@@ -113,7 +113,7 @@
* int a single C statement (which needs a semi-colon terminator). This
* avoids problems with code like:
*
- * if ( condition_holds )
+ * if ( condition_holds )
* yyless( 5 );
* else
* do_something_else();
@@ -126,15 +126,15 @@
/* Return all but the first 'n' matched characters back to the input stream. */
#define yyless(n) \
- do \
- { \
- /* Undo effects of setting up yytext. */ \
- *yy_cp = yy_hold_char; \
- YY_RESTORE_YY_MORE_OFFSET \
- yy_c_buf_p = yy_cp = yy_bp + n - YY_MORE_ADJ; \
- YY_DO_BEFORE_ACTION; /* set up yytext again */ \
- } \
- while ( 0 )
+ do \
+ { \
+ /* Undo effects of setting up yytext. */ \
+ *yy_cp = yy_hold_char; \
+ YY_RESTORE_YY_MORE_OFFSET \
+ yy_c_buf_p = yy_cp = yy_bp + n - YY_MORE_ADJ; \
+ YY_DO_BEFORE_ACTION; /* set up yytext again */ \
+ } \
+ while ( 0 )
#define unput(c) yyunput( c, yytext_ptr )
@@ -146,61 +146,61 @@
struct yy_buffer_state
- {
- FILE *yy_input_file;
+ {
+ FILE *yy_input_file;
+
+ char *yy_ch_buf; /* input buffer */
+ char *yy_buf_pos; /* current position in input buffer */
+
+ /* Size of input buffer in bytes, not including room for EOB
+ * characters.
+ */
+ yy_size_t yy_buf_size;
- char *yy_ch_buf; /* input buffer */
- char *yy_buf_pos; /* current position in input buffer */
+ /* Number of characters read into yy_ch_buf, not including EOB
+ * characters.
+ */
+ int yy_n_chars;
+
+ /* Whether we "own" the buffer - i.e., we know we created it,
+ * and can realloc() it to grow it, and should free() it to
+ * delete it.
+ */
+ int yy_is_our_buffer;
- /* Size of input buffer in bytes, not including room for EOB
- * characters.
- */
- yy_size_t yy_buf_size;
-
- /* Number of characters read into yy_ch_buf, not including EOB
- * characters.
- */
- int yy_n_chars;
-
- /* Whether we "own" the buffer - i.e., we know we created it,
- * and can realloc() it to grow it, and should free() it to
- * delete it.
- */
- int yy_is_our_buffer;
-
- /* Whether this is an "interactive" input source; if so, and
- * if we're using stdio for input, then we want to use getc()
- * instead of fread(), to make sure we stop fetching input after
- * each newline.
- */
- int yy_is_interactive;
-
- /* Whether we're considered to be at the beginning of a line.
- * If so, '^' rules will be active on the next match, otherwise
- * not.
- */
- int yy_at_bol;
-
- /* Whether to try to fill the input buffer when we reach the
- * end of it.
- */
- int yy_fill_buffer;
+ /* Whether this is an "interactive" input source; if so, and
+ * if we're using stdio for input, then we want to use getc()
+ * instead of fread(), to make sure we stop fetching input after
+ * each newline.
+ */
+ int yy_is_interactive;
- int yy_buffer_status;
+ /* Whether we're considered to be at the beginning of a line.
+ * If so, '^' rules will be active on the next match, otherwise
+ * not.
+ */
+ int yy_at_bol;
+
+ /* Whether to try to fill the input buffer when we reach the
+ * end of it.
+ */
+ int yy_fill_buffer;
+
+ int yy_buffer_status;
#define YY_BUFFER_NEW 0
#define YY_BUFFER_NORMAL 1
- /* When an EOF's been seen but there's still some text to process
- * then we mark the buffer as YY_EOF_PENDING, to indicate that we
- * shouldn't try reading from the input source any more. We might
- * still have a bunch of tokens to match, though, because of
- * possible backing-up.
- *
- * When we actually see the EOF, we change the status to "new"
- * (via yyrestart()), so that the user can continue scanning by
- * just pointing yyin at a new input file.
- */
+ /* When an EOF's been seen but there's still some text to process
+ * then we mark the buffer as YY_EOF_PENDING, to indicate that we
+ * shouldn't try reading from the input source any more. We might
+ * still have a bunch of tokens to match, though, because of
+ * possible backing-up.
+ *
+ * When we actually see the EOF, we change the status to "new"
+ * (via yyrestart()), so that the user can continue scanning by
+ * just pointing yyin at a new input file.
+ */
#define YY_BUFFER_EOF_PENDING 2
- };
+ };
static YY_BUFFER_STATE yy_current_buffer = 0;
@@ -221,7 +221,7 @@
/* Points to current character in buffer. */
static char *yy_c_buf_p = (char *) 0;
-static int yy_init = 1; /* whether we need to initialize */
+static int yy_init = 1; /* whether we need to initialize */
static int yy_start = 0; /* start state number */
/* Flag which is used to allow yywrap()'s to do buffer switches
@@ -250,18 +250,18 @@
#define yy_new_buffer yy_create_buffer
#define yy_set_interactive(is_interactive) \
- { \
- if ( ! yy_current_buffer ) \
- yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \
- yy_current_buffer->yy_is_interactive = is_interactive; \
- }
+ { \
+ if ( ! yy_current_buffer ) \
+ yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \
+ yy_current_buffer->yy_is_interactive = is_interactive; \
+ }
#define yy_set_bol(at_bol) \
- { \
- if ( ! yy_current_buffer ) \
- yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \
- yy_current_buffer->yy_at_bol = at_bol; \
- }
+ { \
+ if ( ! yy_current_buffer ) \
+ yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \
+ yy_current_buffer->yy_at_bol = at_bol; \
+ }
#define YY_AT_BOL() (yy_current_buffer->yy_at_bol)
@@ -280,11 +280,11 @@
* corresponding action - sets up yytext.
*/
#define YY_DO_BEFORE_ACTION \
- yytext_ptr = yy_bp; \
- yyleng = (int) (yy_cp - yy_bp); \
- yy_hold_char = *yy_cp; \
- *yy_cp = '\0'; \
- yy_c_buf_p = yy_cp;
+ yytext_ptr = yy_bp; \
+ yyleng = (int) (yy_cp - yy_bp); \
+ yy_hold_char = *yy_cp; \
+ *yy_cp = '\0'; \
+ yy_c_buf_p = yy_cp;
#define YY_NUM_RULES 4
#define YY_END_OF_BUFFER 5
@@ -376,7 +376,7 @@
#define ID_WORD 1000
#define ID_EOL 1001
#define ID_CHAR 1002
-#line 375 "c:\\CVS\\boost\\libs\\spirit\\example\\lex\\word_count_functor_flex.cpp"
+#line 380 "c:\\CVS\\boost\\libs\\spirit\\example\\lex\\word_count_functor_flex.cpp"
/* Macros after this point can all be overridden by user definitions in
* section 1.
@@ -464,32 +464,32 @@
*/
#ifndef YY_INPUT
#define YY_INPUT(buf,result,max_size) \
- if ( yy_current_buffer->yy_is_interactive ) \
- { \
- int c = '*', n; \
- for ( n = 0; n < max_size && \
- (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
- buf[n] = (char) c; \
- if ( c == '\n' ) \
- buf[n++] = (char) c; \
- if ( c == EOF && ferror( yyin ) ) \
- YY_FATAL_ERROR( "input in flex scanner failed" ); \
- result = n; \
- } \
- else \
- { \
- errno=0; \
- while ( (result = fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \
- { \
- if( errno != EINTR) \
+ if ( yy_current_buffer->yy_is_interactive ) \
{ \
- YY_FATAL_ERROR( "input in flex scanner failed" ); \
- break; \
+ int c = '*', n; \
+ for ( n = 0; n < max_size && \
+ (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
+ buf[n] = (char) c; \
+ if ( c == '\n' ) \
+ buf[n++] = (char) c; \
+ if ( c == EOF && ferror( yyin ) ) \
+ YY_FATAL_ERROR( "input in flex scanner failed" ); \
+ result = n; \
} \
- errno=0; \
- clearerr(yyin); \
- } \
- }
+ else \
+ { \
+ errno=0; \
+ while ( (result = fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \
+ { \
+ if( errno != EINTR) \
+ { \
+ YY_FATAL_ERROR( "input in flex scanner failed" ); \
+ break; \
+ } \
+ errno=0; \
+ clearerr(yyin); \
+ } \
+ }
#endif
/* No semi-colon after return; correct usage is to write "yyterminate();" -
@@ -530,419 +530,419 @@
#endif
#define YY_RULE_SETUP \
- YY_USER_ACTION
+ YY_USER_ACTION
YY_DECL
- {
- register yy_state_type yy_current_state;
- register char *yy_cp, *yy_bp;
- register int yy_act;
+ {
+ register yy_state_type yy_current_state;
+ register char *yy_cp, *yy_bp;
+ register int yy_act;
-#line 11 "c:\\CVS\\boost\\libs\\spirit\\example\\lex\\word_count_functor.flex"
+#line 16 "c:\\CVS\\boost\\libs\\spirit\\example\\lex\\word_count_functor.flex"
-#line 539 "c:\\CVS\\boost\\libs\\spirit\\example\\lex\\word_count_functor_flex.cpp"
+#line 544 "c:\\CVS\\boost\\libs\\spirit\\example\\lex\\word_count_functor_flex.cpp"
- if ( yy_init )
- {
- yy_init = 0;
+ if ( yy_init )
+ {
+ yy_init = 0;
#ifdef YY_USER_INIT
- YY_USER_INIT;
+ YY_USER_INIT;
#endif
- if ( ! yy_start )
- yy_start = 1; /* first start state */
+ if ( ! yy_start )
+ yy_start = 1; /* first start state */
- if ( ! yyin )
- yyin = stdin;
+ if ( ! yyin )
+ yyin = stdin;
- if ( ! yyout )
- yyout = stdout;
+ if ( ! yyout )
+ yyout = stdout;
- if ( ! yy_current_buffer )
- yy_current_buffer =
- yy_create_buffer( yyin, YY_BUF_SIZE );
+ if ( ! yy_current_buffer )
+ yy_current_buffer =
+ yy_create_buffer( yyin, YY_BUF_SIZE );
- yy_load_buffer_state();
- }
+ yy_load_buffer_state();
+ }
- while ( 1 ) /* loops until end-of-file is reached */
- {
- yy_cp = yy_c_buf_p;
+ while ( 1 ) /* loops until end-of-file is reached */
+ {
+ yy_cp = yy_c_buf_p;
- /* Support of yytext. */
- *yy_cp = yy_hold_char;
+ /* Support of yytext. */
+ *yy_cp = yy_hold_char;
- /* yy_bp points to the position in yy_ch_buf of the start of
- * the current run.
- */
- yy_bp = yy_cp;
+ /* yy_bp points to the position in yy_ch_buf of the start of
+ * the current run.
+ */
+ yy_bp = yy_cp;
- yy_current_state = yy_start;
+ yy_current_state = yy_start;
yy_match:
- do
- {
- register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
- if ( yy_accept[yy_current_state] )
- {
- yy_last_accepting_state = yy_current_state;
- yy_last_accepting_cpos = yy_cp;
- }
- while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
- {
- yy_current_state = (int) yy_def[yy_current_state];
- if ( yy_current_state >= 9 )
- yy_c = yy_meta[(unsigned int) yy_c];
- }
- yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
- ++yy_cp;
- }
- while ( yy_base[yy_current_state] != 6 );
+ do
+ {
+ register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
+ if ( yy_accept[yy_current_state] )
+ {
+ yy_last_accepting_state = yy_current_state;
+ yy_last_accepting_cpos = yy_cp;
+ }
+ while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
+ {
+ yy_current_state = (int) yy_def[yy_current_state];
+ if ( yy_current_state >= 9 )
+ yy_c = yy_meta[(unsigned int) yy_c];
+ }
+ yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+ ++yy_cp;
+ }
+ while ( yy_base[yy_current_state] != 6 );
yy_find_action:
- yy_act = yy_accept[yy_current_state];
- if ( yy_act == 0 )
- { /* have to back up */
- yy_cp = yy_last_accepting_cpos;
- yy_current_state = yy_last_accepting_state;
- yy_act = yy_accept[yy_current_state];
- }
-
- YY_DO_BEFORE_ACTION;
-
-
-do_action: /* This label is used only to access EOF actions. */
-
-
- switch ( yy_act )
- { /* beginning of action switch */
- case 0: /* must back up */
- /* undo the effects of YY_DO_BEFORE_ACTION */
- *yy_cp = yy_hold_char;
- yy_cp = yy_last_accepting_cpos;
- yy_current_state = yy_last_accepting_state;
- goto yy_find_action;
+ yy_act = yy_accept[yy_current_state];
+ if ( yy_act == 0 )
+ { /* have to back up */
+ yy_cp = yy_last_accepting_cpos;
+ yy_current_state = yy_last_accepting_state;
+ yy_act = yy_accept[yy_current_state];
+ }
+
+ YY_DO_BEFORE_ACTION;
+
+
+do_action: /* This label is used only to access EOF actions. */
+
+
+ switch ( yy_act )
+ { /* beginning of action switch */
+ case 0: /* must back up */
+ /* undo the effects of YY_DO_BEFORE_ACTION */
+ *yy_cp = yy_hold_char;
+ yy_cp = yy_last_accepting_cpos;
+ yy_current_state = yy_last_accepting_state;
+ goto yy_find_action;
case 1:
YY_RULE_SETUP
-#line 12 "c:\\CVS\\boost\\libs\\spirit\\example\\lex\\word_count_functor.flex"
+#line 17 "c:\\CVS\\boost\\libs\\spirit\\example\\lex\\word_count_functor.flex"
{ return ID_WORD; }
- YY_BREAK
+ YY_BREAK
case 2:
YY_RULE_SETUP
-#line 13 "c:\\CVS\\boost\\libs\\spirit\\example\\lex\\word_count_functor.flex"
+#line 18 "c:\\CVS\\boost\\libs\\spirit\\example\\lex\\word_count_functor.flex"
{ return ID_EOL; }
- YY_BREAK
+ YY_BREAK
case 3:
YY_RULE_SETUP
-#line 14 "c:\\CVS\\boost\\libs\\spirit\\example\\lex\\word_count_functor.flex"
+#line 19 "c:\\CVS\\boost\\libs\\spirit\\example\\lex\\word_count_functor.flex"
{ return ID_CHAR; }
- YY_BREAK
+ YY_BREAK
case 4:
YY_RULE_SETUP
-#line 15 "c:\\CVS\\boost\\libs\\spirit\\example\\lex\\word_count_functor.flex"
+#line 20 "c:\\CVS\\boost\\libs\\spirit\\example\\lex\\word_count_functor.flex"
ECHO;
- YY_BREAK
-#line 642 "c:\\CVS\\boost\\libs\\spirit\\example\\lex\\word_count_functor_flex.cpp"
+ YY_BREAK
+#line 647 "c:\\CVS\\boost\\libs\\spirit\\example\\lex\\word_count_functor_flex.cpp"
case YY_STATE_EOF(INITIAL):
- yyterminate();
-
- case YY_END_OF_BUFFER:
- {
- /* Amount of text matched not including the EOB char. */
- int yy_amount_of_matched_text = (int) (yy_cp - yytext_ptr) - 1;
-
- /* Undo the effects of YY_DO_BEFORE_ACTION. */
- *yy_cp = yy_hold_char;
- YY_RESTORE_YY_MORE_OFFSET
-
- if ( yy_current_buffer->yy_buffer_status == YY_BUFFER_NEW )
- {
- /* We're scanning a new file or input source. It's
- * possible that this happened because the user
- * just pointed yyin at a new source and called
- * yylex(). If so, then we have to assure
- * consistency between yy_current_buffer and our
- * globals. Here is the right place to do so, because
- * this is the first action (other than possibly a
- * back-up) that will match for the new input source.
- */
- yy_n_chars = yy_current_buffer->yy_n_chars;
- yy_current_buffer->yy_input_file = yyin;
- yy_current_buffer->yy_buffer_status = YY_BUFFER_NORMAL;
- }
-
- /* Note that here we test for yy_c_buf_p "<=" to the position
- * of the first EOB in the buffer, since yy_c_buf_p will
- * already have been incremented past the NUL character
- * (since all states make transitions on EOB to the
- * end-of-buffer state). Contrast this with the test
- * in input().
- */
- if ( yy_c_buf_p <= &yy_current_buffer->yy_ch_buf[yy_n_chars] )
- { /* This was really a NUL. */
- yy_state_type yy_next_state;
-
- yy_c_buf_p = yytext_ptr + yy_amount_of_matched_text;
+ yyterminate();
- yy_current_state = yy_get_previous_state();
-
- /* Okay, we're now positioned to make the NUL
- * transition. We couldn't have
- * yy_get_previous_state() go ahead and do it
- * for us because it doesn't know how to deal
- * with the possibility of jamming (and we don't
- * want to build jamming into it because then it
- * will run more slowly).
- */
-
- yy_next_state = yy_try_NUL_trans( yy_current_state );
-
- yy_bp = yytext_ptr + YY_MORE_ADJ;
-
- if ( yy_next_state )
- {
- /* Consume the NUL. */
- yy_cp = ++yy_c_buf_p;
- yy_current_state = yy_next_state;
- goto yy_match;
- }
-
- else
+ case YY_END_OF_BUFFER:
{
- yy_cp = yy_c_buf_p;
- goto yy_find_action;
- }
- }
-
- else switch ( yy_get_next_buffer() )
- {
- case EOB_ACT_END_OF_FILE:
- {
- yy_did_buffer_switch_on_eof = 0;
+ /* Amount of text matched not including the EOB char. */
+ int yy_amount_of_matched_text = (int) (yy_cp - yytext_ptr) - 1;
- if ( yywrap() )
- {
- /* Note: because we've taken care in
- * yy_get_next_buffer() to have set up
- * yytext, we can now set up
- * yy_c_buf_p so that if some total
- * hoser (like flex itself) wants to
- * call the scanner after we return the
- * YY_NULL, it'll still work - another
- * YY_NULL will get returned.
- */
- yy_c_buf_p = yytext_ptr + YY_MORE_ADJ;
-
- yy_act = YY_STATE_EOF(YY_START);
- goto do_action;
- }
-
- else
- {
- if ( ! yy_did_buffer_switch_on_eof )
- YY_NEW_FILE;
- }
+ /* Undo the effects of YY_DO_BEFORE_ACTION. */
+ *yy_cp = yy_hold_char;
+ YY_RESTORE_YY_MORE_OFFSET
+
+ if ( yy_current_buffer->yy_buffer_status == YY_BUFFER_NEW )
+ {
+ /* We're scanning a new file or input source. It's
+ * possible that this happened because the user
+ * just pointed yyin at a new source and called
+ * yylex(). If so, then we have to assure
+ * consistency between yy_current_buffer and our
+ * globals. Here is the right place to do so, because
+ * this is the first action (other than possibly a
+ * back-up) that will match for the new input source.
+ */
+ yy_n_chars = yy_current_buffer->yy_n_chars;
+ yy_current_buffer->yy_input_file = yyin;
+ yy_current_buffer->yy_buffer_status = YY_BUFFER_NORMAL;
+ }
+
+ /* Note that here we test for yy_c_buf_p "<=" to the position
+ * of the first EOB in the buffer, since yy_c_buf_p will
+ * already have been incremented past the NUL character
+ * (since all states make transitions on EOB to the
+ * end-of-buffer state). Contrast this with the test
+ * in input().
+ */
+ if ( yy_c_buf_p <= &yy_current_buffer->yy_ch_buf[yy_n_chars] )
+ { /* This was really a NUL. */
+ yy_state_type yy_next_state;
+
+ yy_c_buf_p = yytext_ptr + yy_amount_of_matched_text;
+
+ yy_current_state = yy_get_previous_state();
+
+ /* Okay, we're now positioned to make the NUL
+ * transition. We couldn't have
+ * yy_get_previous_state() go ahead and do it
+ * for us because it doesn't know how to deal
+ * with the possibility of jamming (and we don't
+ * want to build jamming into it because then it
+ * will run more slowly).
+ */
+
+ yy_next_state = yy_try_NUL_trans( yy_current_state );
+
+ yy_bp = yytext_ptr + YY_MORE_ADJ;
+
+ if ( yy_next_state )
+ {
+ /* Consume the NUL. */
+ yy_cp = ++yy_c_buf_p;
+ yy_current_state = yy_next_state;
+ goto yy_match;
+ }
+
+ else
+ {
+ yy_cp = yy_c_buf_p;
+ goto yy_find_action;
+ }
+ }
+
+ else switch ( yy_get_next_buffer() )
+ {
+ case EOB_ACT_END_OF_FILE:
+ {
+ yy_did_buffer_switch_on_eof = 0;
+
+ if ( yywrap() )
+ {
+ /* Note: because we've taken care in
+ * yy_get_next_buffer() to have set up
+ * yytext, we can now set up
+ * yy_c_buf_p so that if some total
+ * hoser (like flex itself) wants to
+ * call the scanner after we return the
+ * YY_NULL, it'll still work - another
+ * YY_NULL will get returned.
+ */
+ yy_c_buf_p = yytext_ptr + YY_MORE_ADJ;
+
+ yy_act = YY_STATE_EOF(YY_START);
+ goto do_action;
+ }
+
+ else
+ {
+ if ( ! yy_did_buffer_switch_on_eof )
+ YY_NEW_FILE;
+ }
+ break;
+ }
+
+ case EOB_ACT_CONTINUE_SCAN:
+ yy_c_buf_p =
+ yytext_ptr + yy_amount_of_matched_text;
+
+ yy_current_state = yy_get_previous_state();
+
+ yy_cp = yy_c_buf_p;
+ yy_bp = yytext_ptr + YY_MORE_ADJ;
+ goto yy_match;
+
+ case EOB_ACT_LAST_MATCH:
+ yy_c_buf_p =
+ &yy_current_buffer->yy_ch_buf[yy_n_chars];
+
+ yy_current_state = yy_get_previous_state();
+
+ yy_cp = yy_c_buf_p;
+ yy_bp = yytext_ptr + YY_MORE_ADJ;
+ goto yy_find_action;
+ }
break;
}
- case EOB_ACT_CONTINUE_SCAN:
- yy_c_buf_p =
- yytext_ptr + yy_amount_of_matched_text;
-
- yy_current_state = yy_get_previous_state();
-
- yy_cp = yy_c_buf_p;
- yy_bp = yytext_ptr + YY_MORE_ADJ;
- goto yy_match;
-
- case EOB_ACT_LAST_MATCH:
- yy_c_buf_p =
- &yy_current_buffer->yy_ch_buf[yy_n_chars];
-
- yy_current_state = yy_get_previous_state();
-
- yy_cp = yy_c_buf_p;
- yy_bp = yytext_ptr + YY_MORE_ADJ;
- goto yy_find_action;
- }
- break;
- }
-
- default:
- YY_FATAL_ERROR(
- "fatal flex scanner internal error--no action found" );
- } /* end of action switch */
- } /* end of scanning one token */
- } /* end of yylex */
+ default:
+ YY_FATAL_ERROR(
+ "fatal flex scanner internal error--no action found" );
+ } /* end of action switch */
+ } /* end of scanning one token */
+ } /* end of yylex */
/* yy_get_next_buffer - try to read in a new buffer
*
* Returns a code representing an action:
- * EOB_ACT_LAST_MATCH -
- * EOB_ACT_CONTINUE_SCAN - continue scanning from current position
- * EOB_ACT_END_OF_FILE - end of file
+ * EOB_ACT_LAST_MATCH -
+ * EOB_ACT_CONTINUE_SCAN - continue scanning from current position
+ * EOB_ACT_END_OF_FILE - end of file
*/
static int yy_get_next_buffer()
- {
- register char *dest = yy_current_buffer->yy_ch_buf;
- register char *source = yytext_ptr;
- register int number_to_move, i;
- int ret_val;
-
- if ( yy_c_buf_p > &yy_current_buffer->yy_ch_buf[yy_n_chars + 1] )
- YY_FATAL_ERROR(
- "fatal flex scanner internal error--end of buffer missed" );
-
- if ( yy_current_buffer->yy_fill_buffer == 0 )
- { /* Don't try to fill the buffer, so this is an EOF. */
- if ( yy_c_buf_p - yytext_ptr - YY_MORE_ADJ == 1 )
- {
- /* We matched a single character, the EOB, so
- * treat this as a final EOF.
- */
- return EOB_ACT_END_OF_FILE;
- }
+ {
+ register char *dest = yy_current_buffer->yy_ch_buf;
+ register char *source = yytext_ptr;
+ register int number_to_move, i;
+ int ret_val;
- else
- {
- /* We matched some text prior to the EOB, first
- * process it.
- */
- return EOB_ACT_LAST_MATCH;
- }
- }
+ if ( yy_c_buf_p > &yy_current_buffer->yy_ch_buf[yy_n_chars + 1] )
+ YY_FATAL_ERROR(
+ "fatal flex scanner internal error--end of buffer missed" );
- /* Try to read more data. */
+ if ( yy_current_buffer->yy_fill_buffer == 0 )
+ { /* Don't try to fill the buffer, so this is an EOF. */
+ if ( yy_c_buf_p - yytext_ptr - YY_MORE_ADJ == 1 )
+ {
+ /* We matched a single character, the EOB, so
+ * treat this as a final EOF.
+ */
+ return EOB_ACT_END_OF_FILE;
+ }
- /* First move last chars to start of buffer. */
- number_to_move = (int) (yy_c_buf_p - yytext_ptr) - 1;
+ else
+ {
+ /* We matched some text prior to the EOB, first
+ * process it.
+ */
+ return EOB_ACT_LAST_MATCH;
+ }
+ }
- for ( i = 0; i < number_to_move; ++i )
- *(dest++) = *(source++);
+ /* Try to read more data. */
- if ( yy_current_buffer->yy_buffer_status == YY_BUFFER_EOF_PENDING )
- /* don't do the read, it's not guaranteed to return an EOF,
- * just force an EOF
- */
- yy_current_buffer->yy_n_chars = yy_n_chars = 0;
+ /* First move last chars to start of buffer. */
+ number_to_move = (int) (yy_c_buf_p - yytext_ptr) - 1;
- else
- {
- int num_to_read =
- yy_current_buffer->yy_buf_size - number_to_move - 1;
+ for ( i = 0; i < number_to_move; ++i )
+ *(dest++) = *(source++);
+
+ if ( yy_current_buffer->yy_buffer_status == YY_BUFFER_EOF_PENDING )
+ /* don't do the read, it's not guaranteed to return an EOF,
+ * just force an EOF
+ */
+ yy_current_buffer->yy_n_chars = yy_n_chars = 0;
- while ( num_to_read <= 0 )
- { /* Not enough room in the buffer - grow it. */
+ else
+ {
+ int num_to_read =
+ yy_current_buffer->yy_buf_size - number_to_move - 1;
+
+ while ( num_to_read <= 0 )
+ { /* Not enough room in the buffer - grow it. */
#ifdef YY_USES_REJECT
- YY_FATAL_ERROR(
+ YY_FATAL_ERROR(
"input buffer overflow, can't enlarge buffer because scanner uses REJECT" );
#else
- /* just a shorter name for the current buffer */
- YY_BUFFER_STATE b = yy_current_buffer;
+ /* just a shorter name for the current buffer */
+ YY_BUFFER_STATE b = yy_current_buffer;
- int yy_c_buf_p_offset =
- (int) (yy_c_buf_p - b->yy_ch_buf);
+ int yy_c_buf_p_offset =
+ (int) (yy_c_buf_p - b->yy_ch_buf);
- if ( b->yy_is_our_buffer )
- {
- int new_size = b->yy_buf_size * 2;
+ if ( b->yy_is_our_buffer )
+ {
+ int new_size = b->yy_buf_size * 2;
- if ( new_size <= 0 )
- b->yy_buf_size += b->yy_buf_size / 8;
- else
- b->yy_buf_size *= 2;
+ if ( new_size <= 0 )
+ b->yy_buf_size += b->yy_buf_size / 8;
+ else
+ b->yy_buf_size *= 2;
- b->yy_ch_buf = (char *)
- /* Include room in for 2 EOB chars. */
- yy_flex_realloc( (void *) b->yy_ch_buf,
- b->yy_buf_size + 2 );
- }
- else
- /* Can't grow it, we don't own it. */
- b->yy_ch_buf = 0;
+ b->yy_ch_buf = (char *)
+ /* Include room in for 2 EOB chars. */
+ yy_flex_realloc( (void *) b->yy_ch_buf,
+ b->yy_buf_size + 2 );
+ }
+ else
+ /* Can't grow it, we don't own it. */
+ b->yy_ch_buf = 0;
- if ( ! b->yy_ch_buf )
- YY_FATAL_ERROR(
- "fatal error - scanner input buffer overflow" );
+ if ( ! b->yy_ch_buf )
+ YY_FATAL_ERROR(
+ "fatal error - scanner input buffer overflow" );
- yy_c_buf_p = &b->yy_ch_buf[yy_c_buf_p_offset];
+ yy_c_buf_p = &b->yy_ch_buf[yy_c_buf_p_offset];
- num_to_read = yy_current_buffer->yy_buf_size -
- number_to_move - 1;
+ num_to_read = yy_current_buffer->yy_buf_size -
+ number_to_move - 1;
#endif
- }
+ }
- if ( num_to_read > YY_READ_BUF_SIZE )
- num_to_read = YY_READ_BUF_SIZE;
+ if ( num_to_read > YY_READ_BUF_SIZE )
+ num_to_read = YY_READ_BUF_SIZE;
- /* Read in more data. */
- YY_INPUT( (&yy_current_buffer->yy_ch_buf[number_to_move]),
- yy_n_chars, num_to_read );
+ /* Read in more data. */
+ YY_INPUT( (&yy_current_buffer->yy_ch_buf[number_to_move]),
+ yy_n_chars, num_to_read );
- yy_current_buffer->yy_n_chars = yy_n_chars;
- }
+ yy_current_buffer->yy_n_chars = yy_n_chars;
+ }
- if ( yy_n_chars == 0 )
- {
- if ( number_to_move == YY_MORE_ADJ )
- {
- ret_val = EOB_ACT_END_OF_FILE;
- yyrestart( yyin );
- }
+ if ( yy_n_chars == 0 )
+ {
+ if ( number_to_move == YY_MORE_ADJ )
+ {
+ ret_val = EOB_ACT_END_OF_FILE;
+ yyrestart( yyin );
+ }
- else
- {
- ret_val = EOB_ACT_LAST_MATCH;
- yy_current_buffer->yy_buffer_status =
- YY_BUFFER_EOF_PENDING;
- }
- }
+ else
+ {
+ ret_val = EOB_ACT_LAST_MATCH;
+ yy_current_buffer->yy_buffer_status =
+ YY_BUFFER_EOF_PENDING;
+ }
+ }
- else
- ret_val = EOB_ACT_CONTINUE_SCAN;
+ else
+ ret_val = EOB_ACT_CONTINUE_SCAN;
- yy_n_chars += number_to_move;
- yy_current_buffer->yy_ch_buf[yy_n_chars] = YY_END_OF_BUFFER_CHAR;
- yy_current_buffer->yy_ch_buf[yy_n_chars + 1] = YY_END_OF_BUFFER_CHAR;
+ yy_n_chars += number_to_move;
+ yy_current_buffer->yy_ch_buf[yy_n_chars] = YY_END_OF_BUFFER_CHAR;
+ yy_current_buffer->yy_ch_buf[yy_n_chars + 1] = YY_END_OF_BUFFER_CHAR;
- yytext_ptr = &yy_current_buffer->yy_ch_buf[0];
+ yytext_ptr = &yy_current_buffer->yy_ch_buf[0];
- return ret_val;
- }
+ return ret_val;
+ }
/* yy_get_previous_state - get the state just before the EOB char was reached */
static yy_state_type yy_get_previous_state()
- {
- register yy_state_type yy_current_state;
- register char *yy_cp;
+ {
+ register yy_state_type yy_current_state;
+ register char *yy_cp;
- yy_current_state = yy_start;
+ yy_current_state = yy_start;
- for ( yy_cp = yytext_ptr + YY_MORE_ADJ; yy_cp < yy_c_buf_p; ++yy_cp )
- {
- register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
- if ( yy_accept[yy_current_state] )
- {
- yy_last_accepting_state = yy_current_state;
- yy_last_accepting_cpos = yy_cp;
- }
- while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
- {
- yy_current_state = (int) yy_def[yy_current_state];
- if ( yy_current_state >= 9 )
- yy_c = yy_meta[(unsigned int) yy_c];
- }
- yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
- }
+ for ( yy_cp = yytext_ptr + YY_MORE_ADJ; yy_cp < yy_c_buf_p; ++yy_cp )
+ {
+ register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
+ if ( yy_accept[yy_current_state] )
+ {
+ yy_last_accepting_state = yy_current_state;
+ yy_last_accepting_cpos = yy_cp;
+ }
+ while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
+ {
+ yy_current_state = (int) yy_def[yy_current_state];
+ if ( yy_current_state >= 9 )
+ yy_c = yy_meta[(unsigned int) yy_c];
+ }
+ yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+ }
- return yy_current_state;
- }
+ return yy_current_state;
+ }
/* yy_try_NUL_trans - try to make a transition on the NUL character
@@ -957,27 +957,27 @@
static yy_state_type yy_try_NUL_trans( yy_current_state )
yy_state_type yy_current_state;
#endif
- {
- register int yy_is_jam;
- register char *yy_cp = yy_c_buf_p;
-
- register YY_CHAR yy_c = 1;
- if ( yy_accept[yy_current_state] )
- {
- yy_last_accepting_state = yy_current_state;
- yy_last_accepting_cpos = yy_cp;
- }
- while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
{
- yy_current_state = (int) yy_def[yy_current_state];
- if ( yy_current_state >= 9 )
- yy_c = yy_meta[(unsigned int) yy_c];
- }
- yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
- yy_is_jam = (yy_current_state == 8);
+ register int yy_is_jam;
+ register char *yy_cp = yy_c_buf_p;
- return yy_is_jam ? 0 : yy_current_state;
- }
+ register YY_CHAR yy_c = 1;
+ if ( yy_accept[yy_current_state] )
+ {
+ yy_last_accepting_state = yy_current_state;
+ yy_last_accepting_cpos = yy_cp;
+ }
+ while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
+ {
+ yy_current_state = (int) yy_def[yy_current_state];
+ if ( yy_current_state >= 9 )
+ yy_c = yy_meta[(unsigned int) yy_c];
+ }
+ yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+ yy_is_jam = (yy_current_state == 8);
+
+ return yy_is_jam ? 0 : yy_current_state;
+ }
#ifndef YY_NO_UNPUT
@@ -988,40 +988,40 @@
int c;
register char *yy_bp;
#endif
- {
- register char *yy_cp = yy_c_buf_p;
-
- /* undo effects of setting up yytext */
- *yy_cp = yy_hold_char;
+ {
+ register char *yy_cp = yy_c_buf_p;
- if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 )
- { /* need to shift things up to make room */
- /* +2 for EOB chars. */
- register int number_to_move = yy_n_chars + 2;
- register char *dest = &yy_current_buffer->yy_ch_buf[
- yy_current_buffer->yy_buf_size + 2];
- register char *source =
- &yy_current_buffer->yy_ch_buf[number_to_move];
-
- while ( source > yy_current_buffer->yy_ch_buf )
- *--dest = *--source;
-
- yy_cp += (int) (dest - source);
- yy_bp += (int) (dest - source);
- yy_current_buffer->yy_n_chars =
- yy_n_chars = yy_current_buffer->yy_buf_size;
+ /* undo effects of setting up yytext */
+ *yy_cp = yy_hold_char;
if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 )
- YY_FATAL_ERROR( "flex scanner push-back overflow" );
- }
+ { /* need to shift things up to make room */
+ /* +2 for EOB chars. */
+ register int number_to_move = yy_n_chars + 2;
+ register char *dest = &yy_current_buffer->yy_ch_buf[
+ yy_current_buffer->yy_buf_size + 2];
+ register char *source =
+ &yy_current_buffer->yy_ch_buf[number_to_move];
+
+ while ( source > yy_current_buffer->yy_ch_buf )
+ *--dest = *--source;
+
+ yy_cp += (int) (dest - source);
+ yy_bp += (int) (dest - source);
+ yy_current_buffer->yy_n_chars =
+ yy_n_chars = yy_current_buffer->yy_buf_size;
+
+ if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 )
+ YY_FATAL_ERROR( "flex scanner push-back overflow" );
+ }
- *--yy_cp = (char) c;
+ *--yy_cp = (char) c;
- yytext_ptr = yy_bp;
- yy_hold_char = *yy_cp;
- yy_c_buf_p = yy_cp;
- }
+ yytext_ptr = yy_bp;
+ yy_hold_char = *yy_cp;
+ yy_c_buf_p = yy_cp;
+ }
#endif /* ifndef YY_NO_UNPUT */
@@ -1030,72 +1030,72 @@
#else
static int input()
#endif
- {
- int c;
-
- *yy_c_buf_p = yy_hold_char;
-
- if ( *yy_c_buf_p == YY_END_OF_BUFFER_CHAR )
{
- /* yy_c_buf_p now points to the character we want to return.
- * If this occurs *before* the EOB characters, then it's a
- * valid NUL; if not, then we've hit the end of the buffer.
- */
- if ( yy_c_buf_p < &yy_current_buffer->yy_ch_buf[yy_n_chars] )
- /* This was really a NUL. */
- *yy_c_buf_p = '\0';
+ int c;
- else
- { /* need more input */
- int offset = yy_c_buf_p - yytext_ptr;
- ++yy_c_buf_p;
+ *yy_c_buf_p = yy_hold_char;
- switch ( yy_get_next_buffer() )
+ if ( *yy_c_buf_p == YY_END_OF_BUFFER_CHAR )
{
- case EOB_ACT_LAST_MATCH:
- /* This happens because yy_g_n_b()
- * sees that we've accumulated a
- * token and flags that we need to
- * try matching the token before
- * proceeding. But for input(),
- * there's no matching to consider.
- * So convert the EOB_ACT_LAST_MATCH
- * to EOB_ACT_END_OF_FILE.
- */
-
- /* Reset buffer status. */
- yyrestart( yyin );
-
- /* fall through */
-
- case EOB_ACT_END_OF_FILE:
- {
- if ( yywrap() )
- return EOF;
+ /* yy_c_buf_p now points to the character we want to return.
+ * If this occurs *before* the EOB characters, then it's a
+ * valid NUL; if not, then we've hit the end of the buffer.
+ */
+ if ( yy_c_buf_p < &yy_current_buffer->yy_ch_buf[yy_n_chars] )
+ /* This was really a NUL. */
+ *yy_c_buf_p = '\0';
+
+ else
+ { /* need more input */
+ int offset = yy_c_buf_p - yytext_ptr;
+ ++yy_c_buf_p;
+
+ switch ( yy_get_next_buffer() )
+ {
+ case EOB_ACT_LAST_MATCH:
+ /* This happens because yy_g_n_b()
+ * sees that we've accumulated a
+ * token and flags that we need to
+ * try matching the token before
+ * proceeding. But for input(),
+ * there's no matching to consider.
+ * So convert the EOB_ACT_LAST_MATCH
+ * to EOB_ACT_END_OF_FILE.
+ */
+
+ /* Reset buffer status. */
+ yyrestart( yyin );
+
+ /* fall through */
+
+ case EOB_ACT_END_OF_FILE:
+ {
+ if ( yywrap() )
+ return EOF;
- if ( ! yy_did_buffer_switch_on_eof )
- YY_NEW_FILE;
+ if ( ! yy_did_buffer_switch_on_eof )
+ YY_NEW_FILE;
#ifdef __cplusplus
- return yyinput();
+ return yyinput();
#else
- return input();
+ return input();
#endif
- }
+ }
- case EOB_ACT_CONTINUE_SCAN:
- yy_c_buf_p = yytext_ptr + offset;
- break;
+ case EOB_ACT_CONTINUE_SCAN:
+ yy_c_buf_p = yytext_ptr + offset;
+ break;
+ }
+ }
}
- }
- }
- c = *(unsigned char *) yy_c_buf_p; /* cast for 8-bit char's */
- *yy_c_buf_p = '\0'; /* preserve yytext */
- yy_hold_char = *++yy_c_buf_p;
+ c = *(unsigned char *) yy_c_buf_p; /* cast for 8-bit char's */
+ *yy_c_buf_p = '\0'; /* preserve yytext */
+ yy_hold_char = *++yy_c_buf_p;
- return c;
- }
+ return c;
+ }
#ifdef YY_USE_PROTOS
@@ -1104,13 +1104,13 @@
void yyrestart( input_file )
FILE *input_file;
#endif
- {
- if ( ! yy_current_buffer )
- yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE );
-
- yy_init_buffer( yy_current_buffer, input_file );
- yy_load_buffer_state();
- }
+ {
+ if ( ! yy_current_buffer )
+ yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE );
+
+ yy_init_buffer( yy_current_buffer, input_file );
+ yy_load_buffer_state();
+ }
#ifdef YY_USE_PROTOS
@@ -1119,28 +1119,28 @@
void yy_switch_to_buffer( new_buffer )
YY_BUFFER_STATE new_buffer;
#endif
- {
- if ( yy_current_buffer == new_buffer )
- return;
-
- if ( yy_current_buffer )
{
- /* Flush out information for old buffer. */
- *yy_c_buf_p = yy_hold_char;
- yy_current_buffer->yy_buf_pos = yy_c_buf_p;
- yy_current_buffer->yy_n_chars = yy_n_chars;
- }
+ if ( yy_current_buffer == new_buffer )
+ return;
+
+ if ( yy_current_buffer )
+ {
+ /* Flush out information for old buffer. */
+ *yy_c_buf_p = yy_hold_char;
+ yy_current_buffer->yy_buf_pos = yy_c_buf_p;
+ yy_current_buffer->yy_n_chars = yy_n_chars;
+ }
- yy_current_buffer = new_buffer;
- yy_load_buffer_state();
+ yy_current_buffer = new_buffer;
+ yy_load_buffer_state();
- /* We don't actually know whether we did this switch during
- * EOF (yywrap()) processing, but the only time this flag
- * is looked at is after yywrap() is called, so it's safe
- * to go ahead and always set it.
- */
- yy_did_buffer_switch_on_eof = 1;
- }
+ /* We don't actually know whether we did this switch during
+ * EOF (yywrap()) processing, but the only time this flag
+ * is looked at is after yywrap() is called, so it's safe
+ * to go ahead and always set it.
+ */
+ yy_did_buffer_switch_on_eof = 1;
+ }
#ifdef YY_USE_PROTOS
@@ -1148,12 +1148,12 @@
#else
void yy_load_buffer_state()
#endif
- {
- yy_n_chars = yy_current_buffer->yy_n_chars;
- yytext_ptr = yy_c_buf_p = yy_current_buffer->yy_buf_pos;
- yyin = yy_current_buffer->yy_input_file;
- yy_hold_char = *yy_c_buf_p;
- }
+ {
+ yy_n_chars = yy_current_buffer->yy_n_chars;
+ yytext_ptr = yy_c_buf_p = yy_current_buffer->yy_buf_pos;
+ yyin = yy_current_buffer->yy_input_file;
+ yy_hold_char = *yy_c_buf_p;
+ }
#ifdef YY_USE_PROTOS
@@ -1163,28 +1163,28 @@
FILE *file;
int size;
#endif
- {
- YY_BUFFER_STATE b;
+ {
+ YY_BUFFER_STATE b;
- b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) );
- if ( ! b )
- YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
+ b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) );
+ if ( ! b )
+ YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
- b->yy_buf_size = size;
+ b->yy_buf_size = size;
- /* yy_ch_buf has to be 2 characters longer than the size given because
- * we need to put in 2 end-of-buffer characters.
- */
- b->yy_ch_buf = (char *) yy_flex_alloc( b->yy_buf_size + 2 );
- if ( ! b->yy_ch_buf )
- YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
+ /* yy_ch_buf has to be 2 characters longer than the size given because
+ * we need to put in 2 end-of-buffer characters.
+ */
+ b->yy_ch_buf = (char *) yy_flex_alloc( b->yy_buf_size + 2 );
+ if ( ! b->yy_ch_buf )
+ YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
- b->yy_is_our_buffer = 1;
+ b->yy_is_our_buffer = 1;
- yy_init_buffer( b, file );
+ yy_init_buffer( b, file );
- return b;
- }
+ return b;
+ }
#ifdef YY_USE_PROTOS
@@ -1193,18 +1193,18 @@
void yy_delete_buffer( b )
YY_BUFFER_STATE b;
#endif
- {
- if ( ! b )
- return;
+ {
+ if ( ! b )
+ return;
- if ( b == yy_current_buffer )
- yy_current_buffer = (YY_BUFFER_STATE) 0;
+ if ( b == yy_current_buffer )
+ yy_current_buffer = (YY_BUFFER_STATE) 0;
- if ( b->yy_is_our_buffer )
- yy_flex_free( (void *) b->yy_ch_buf );
+ if ( b->yy_is_our_buffer )
+ yy_flex_free( (void *) b->yy_ch_buf );
- yy_flex_free( (void *) b );
- }
+ yy_flex_free( (void *) b );
+ }
#ifndef _WIN32
@@ -1226,22 +1226,22 @@
#endif
- {
- yy_flush_buffer( b );
+ {
+ yy_flush_buffer( b );
- b->yy_input_file = file;
- b->yy_fill_buffer = 1;
+ b->yy_input_file = file;
+ b->yy_fill_buffer = 1;
#if YY_ALWAYS_INTERACTIVE
- b->yy_is_interactive = 1;
+ b->yy_is_interactive = 1;
#else
#if YY_NEVER_INTERACTIVE
- b->yy_is_interactive = 0;
+ b->yy_is_interactive = 0;
#else
- b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
+ b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
#endif
#endif
- }
+ }
#ifdef YY_USE_PROTOS
@@ -1251,27 +1251,27 @@
YY_BUFFER_STATE b;
#endif
- {
- if ( ! b )
- return;
+ {
+ if ( ! b )
+ return;
- b->yy_n_chars = 0;
+ b->yy_n_chars = 0;
- /* We always need two end-of-buffer characters. The first causes
- * a transition to the end-of-buffer state. The second causes
- * a jam in that state.
- */
- b->yy_ch_buf[0] = YY_END_OF_BUFFER_CHAR;
- b->yy_ch_buf[1] = YY_END_OF_BUFFER_CHAR;
+ /* We always need two end-of-buffer characters. The first causes
+ * a transition to the end-of-buffer state. The second causes
+ * a jam in that state.
+ */
+ b->yy_ch_buf[0] = YY_END_OF_BUFFER_CHAR;
+ b->yy_ch_buf[1] = YY_END_OF_BUFFER_CHAR;
- b->yy_buf_pos = &b->yy_ch_buf[0];
+ b->yy_buf_pos = &b->yy_ch_buf[0];
- b->yy_at_bol = 1;
- b->yy_buffer_status = YY_BUFFER_NEW;
+ b->yy_at_bol = 1;
+ b->yy_buffer_status = YY_BUFFER_NEW;
- if ( b == yy_current_buffer )
- yy_load_buffer_state();
- }
+ if ( b == yy_current_buffer )
+ yy_load_buffer_state();
+ }
#ifndef YY_NO_SCAN_BUFFER
@@ -1282,33 +1282,33 @@
char *base;
yy_size_t size;
#endif
- {
- YY_BUFFER_STATE b;
-
- if ( size < 2 ||
- base[size-2] != YY_END_OF_BUFFER_CHAR ||
- base[size-1] != YY_END_OF_BUFFER_CHAR )
- /* They forgot to leave room for the EOB's. */
- return 0;
+ {
+ YY_BUFFER_STATE b;
- b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) );
- if ( ! b )
- YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" );
-
- b->yy_buf_size = size - 2; /* "- 2" to take care of EOB's */
- b->yy_buf_pos = b->yy_ch_buf = base;
- b->yy_is_our_buffer = 0;
- b->yy_input_file = 0;
- b->yy_n_chars = b->yy_buf_size;
- b->yy_is_interactive = 0;
- b->yy_at_bol = 1;
- b->yy_fill_buffer = 0;
- b->yy_buffer_status = YY_BUFFER_NEW;
+ if ( size < 2 ||
+ base[size-2] != YY_END_OF_BUFFER_CHAR ||
+ base[size-1] != YY_END_OF_BUFFER_CHAR )
+ /* They forgot to leave room for the EOB's. */
+ return 0;
+
+ b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) );
+ if ( ! b )
+ YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" );
+
+ b->yy_buf_size = size - 2; /* "- 2" to take care of EOB's */
+ b->yy_buf_pos = b->yy_ch_buf = base;
+ b->yy_is_our_buffer = 0;
+ b->yy_input_file = 0;
+ b->yy_n_chars = b->yy_buf_size;
+ b->yy_is_interactive = 0;
+ b->yy_at_bol = 1;
+ b->yy_fill_buffer = 0;
+ b->yy_buffer_status = YY_BUFFER_NEW;
- yy_switch_to_buffer( b );
+ yy_switch_to_buffer( b );
- return b;
- }
+ return b;
+ }
#endif
@@ -1319,13 +1319,13 @@
YY_BUFFER_STATE yy_scan_string( yy_str )
yyconst char *yy_str;
#endif
- {
- int len;
- for ( len = 0; yy_str[len]; ++len )
- ;
+ {
+ int len;
+ for ( len = 0; yy_str[len]; ++len )
+ ;
- return yy_scan_bytes( yy_str, len );
- }
+ return yy_scan_bytes( yy_str, len );
+ }
#endif
@@ -1337,34 +1337,34 @@
yyconst char *bytes;
int len;
#endif
- {
- YY_BUFFER_STATE b;
- char *buf;
- yy_size_t n;
- int i;
-
- /* Get memory for full buffer, including space for trailing EOB's. */
- n = len + 2;
- buf = (char *) yy_flex_alloc( n );
- if ( ! buf )
- YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" );
-
- for ( i = 0; i < len; ++i )
- buf[i] = bytes[i];
-
- buf[len] = buf[len+1] = YY_END_OF_BUFFER_CHAR;
-
- b = yy_scan_buffer( buf, n );
- if ( ! b )
- YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" );
-
- /* It's okay to grow etc. this buffer, and we should throw it
- * away when we're done.
- */
- b->yy_is_our_buffer = 1;
+ {
+ YY_BUFFER_STATE b;
+ char *buf;
+ yy_size_t n;
+ int i;
+
+ /* Get memory for full buffer, including space for trailing EOB's. */
+ n = len + 2;
+ buf = (char *) yy_flex_alloc( n );
+ if ( ! buf )
+ YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" );
+
+ for ( i = 0; i < len; ++i )
+ buf[i] = bytes[i];
+
+ buf[len] = buf[len+1] = YY_END_OF_BUFFER_CHAR;
+
+ b = yy_scan_buffer( buf, n );
+ if ( ! b )
+ YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" );
- return b;
- }
+ /* It's okay to grow etc. this buffer, and we should throw it
+ * away when we're done.
+ */
+ b->yy_is_our_buffer = 1;
+
+ return b;
+ }
#endif
@@ -1375,49 +1375,49 @@
static void yy_push_state( new_state )
int new_state;
#endif
- {
- if ( yy_start_stack_ptr >= yy_start_stack_depth )
{
- yy_size_t new_size;
+ if ( yy_start_stack_ptr >= yy_start_stack_depth )
+ {
+ yy_size_t new_size;
- yy_start_stack_depth += YY_START_STACK_INCR;
- new_size = yy_start_stack_depth * sizeof( int );
+ yy_start_stack_depth += YY_START_STACK_INCR;
+ new_size = yy_start_stack_depth * sizeof( int );
- if ( ! yy_start_stack )
- yy_start_stack = (int *) yy_flex_alloc( new_size );
+ if ( ! yy_start_stack )
+ yy_start_stack = (int *) yy_flex_alloc( new_size );
- else
- yy_start_stack = (int *) yy_flex_realloc(
- (void *) yy_start_stack, new_size );
+ else
+ yy_start_stack = (int *) yy_flex_realloc(
+ (void *) yy_start_stack, new_size );
- if ( ! yy_start_stack )
- YY_FATAL_ERROR(
- "out of memory expanding start-condition stack" );
- }
+ if ( ! yy_start_stack )
+ YY_FATAL_ERROR(
+ "out of memory expanding start-condition stack" );
+ }
- yy_start_stack[yy_start_stack_ptr++] = YY_START;
+ yy_start_stack[yy_start_stack_ptr++] = YY_START;
- BEGIN(new_state);
- }
+ BEGIN(new_state);
+ }
#endif
#ifndef YY_NO_POP_STATE
static void yy_pop_state()
- {
- if ( --yy_start_stack_ptr < 0 )
- YY_FATAL_ERROR( "start-condition stack underflow" );
+ {
+ if ( --yy_start_stack_ptr < 0 )
+ YY_FATAL_ERROR( "start-condition stack underflow" );
- BEGIN(yy_start_stack[yy_start_stack_ptr]);
- }
+ BEGIN(yy_start_stack[yy_start_stack_ptr]);
+ }
#endif
#ifndef YY_NO_TOP_STATE
static int yy_top_state()
- {
- return yy_start_stack[yy_start_stack_ptr - 1];
- }
+ {
+ return yy_start_stack[yy_start_stack_ptr - 1];
+ }
#endif
#ifndef YY_EXIT_FAILURE
@@ -1430,10 +1430,10 @@
static void yy_fatal_error( msg )
char msg[];
#endif
- {
- (void) fprintf( stderr, "%s\n", msg );
- exit( YY_EXIT_FAILURE );
- }
+ {
+ (void) fprintf( stderr, "%s\n", msg );
+ exit( YY_EXIT_FAILURE );
+ }
@@ -1441,16 +1441,16 @@
#undef yyless
#define yyless(n) \
- do \
- { \
- /* Undo effects of setting up yytext. */ \
- yytext[yyleng] = yy_hold_char; \
- yy_c_buf_p = yytext + n; \
- yy_hold_char = *yy_c_buf_p; \
- *yy_c_buf_p = '\0'; \
- yyleng = n; \
- } \
- while ( 0 )
+ do \
+ { \
+ /* Undo effects of setting up yytext. */ \
+ yytext[yyleng] = yy_hold_char; \
+ yy_c_buf_p = yytext + n; \
+ yy_hold_char = *yy_c_buf_p; \
+ *yy_c_buf_p = '\0'; \
+ yyleng = n; \
+ } \
+ while ( 0 )
/* Internal utility routines. */
@@ -1464,11 +1464,11 @@
yyconst char *s2;
int n;
#endif
- {
- register int i;
- for ( i = 0; i < n; ++i )
- s1[i] = s2[i];
- }
+ {
+ register int i;
+ for ( i = 0; i < n; ++i )
+ s1[i] = s2[i];
+ }
#endif
#ifdef YY_NEED_STRLEN
@@ -1478,13 +1478,13 @@
static int yy_flex_strlen( s )
yyconst char *s;
#endif
- {
- register int n;
- for ( n = 0; s[n]; ++n )
- ;
+ {
+ register int n;
+ for ( n = 0; s[n]; ++n )
+ ;
- return n;
- }
+ return n;
+ }
#endif
@@ -1494,9 +1494,9 @@
static void *yy_flex_alloc( size )
yy_size_t size;
#endif
- {
- return (void *) malloc( size );
- }
+ {
+ return (void *) malloc( size );
+ }
#ifdef YY_USE_PROTOS
static void *yy_flex_realloc( void *ptr, yy_size_t size )
@@ -1505,16 +1505,16 @@
void *ptr;
yy_size_t size;
#endif
- {
- /* The cast to (char *) in the following accommodates both
- * implementations that use char* generic pointers, and those
- * that use void* generic pointers. It works with the latter
- * because both ANSI C and C++ allow castless assignment from
- * any pointer type to void*, and deal with argument conversions
- * as though doing an assignment.
- */
- return (void *) realloc( (char *) ptr, size );
- }
+ {
+ /* The cast to (char *) in the following accommodates both
+ * implementations that use char* generic pointers, and those
+ * that use void* generic pointers. It works with the latter
+ * because both ANSI C and C++ allow castless assignment from
+ * any pointer type to void*, and deal with argument conversions
+ * as though doing an assignment.
+ */
+ return (void *) realloc( (char *) ptr, size );
+ }
#ifdef YY_USE_PROTOS
static void yy_flex_free( void *ptr )
@@ -1522,18 +1522,18 @@
static void yy_flex_free( ptr )
void *ptr;
#endif
- {
- free( ptr );
- }
+ {
+ free( ptr );
+ }
#if YY_MAIN
int main()
- {
- yylex();
- return 0;
- }
+ {
+ yylex();
+ return 0;
+ }
#endif
-#line 15 "c:\\CVS\\boost\\libs\\spirit\\example\\lex\\word_count_functor.flex"
+#line 20 "c:\\CVS\\boost\\libs\\spirit\\example\\lex\\word_count_functor.flex"
bool count(int tok, int* c, int* w, int* l)
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk