Changeset 44672


Ignore:
Timestamp:
Apr 21, 2008, 2:04:06 AM (10 years ago)
Author:
Hartmut Kaiser
Message:

Spirit.Lex: pending commits, fixed static lexer.

Location:
trunk/boost/spirit/home
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/boost/spirit/home/lex/lexer/lexertl/lexertl_functor.hpp

    r44656 r44672  
    353353        }
    354354       
    355         // we don't need this
     355        // we don't need this, but it must be there
    356356        template <typename MultiPass>
    357357        static void destroy(MultiPass const& mp)
  • trunk/boost/spirit/home/lex/lexer/lexertl/lexertl_static_functor.hpp

    r44656 r44672  
    258258        ///////////////////////////////////////////////////////////////////////
    259259        template <typename MultiPass>
    260         result_type& operator()(MultiPass& mp, result_type& result)
     260        static result_type& get_next(MultiPass& mp, result_type& result)
    261261        {
    262262            shared& data = mp.shared->ftor;
     
    343343            return mp.shared->ftor.rules.state(statename);
    344344        }
     345       
     346        // we don't need this, but it must be there
     347        template <typename MultiPass>
     348        static void destroy(MultiPass const& mp)
     349        {} 
    345350    };
    346351
  • trunk/boost/spirit/home/lex/lexer/lexertl/lexertl_static_lexer.hpp

    r44541 r44672  
    7070
    7171    public:
     72        typedef Token token_type;
     73        typedef typename Token::id_type id_type;
     74
    7275        // interface for token definition management
    7376        void add_token (char_type const* state, string_type const& tokendef,
     
    168171        //  a public interface
    169172        typedef Token token_type;
     173        typedef typename Token::id_type id_type;
    170174        typedef TokenSet token_set;
    171175        typedef lexertl_iterator<Functor> iterator_type;
  • trunk/boost/spirit/home/support/iterators/detail/combine_policies.hpp

    r44358 r44672  
    415415    //  multi_pass policy class needs to follow the scheme as shown below.
    416416    template<
    417         typename Input, typename Ownership, typename Checking,
     417        typename Ownership, typename Checking, typename Input,
    418418        typename Storage
    419419    >
  • trunk/boost/spirit/home/support/iterators/detail/split_functor_input_policy.hpp

    r44482 r44672  
    155155            }
    156156
    157         protected:
    158157            mutable functor_type ftor;
    159158        };
Note: See TracChangeset for help on using the changeset viewer.