X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2FConsole%2FParse.ih;h=5fc5c5c849fc805578ae5d11dc75788219ed8d33;hb=d506c3134c5c01272c01608c86b8285176b50226;hp=8bfb8f8b28acdbc57224c770d736859eab14d3f6;hpb=9cb871b939efe93e35dd96808d25089399acfc46;p=senf.git diff --git a/senf/Utils/Console/Parse.ih b/senf/Utils/Console/Parse.ih index 8bfb8f8..5fc5c5c 100644 --- a/senf/Utils/Console/Parse.ih +++ b/senf/Utils/Console/Parse.ih @@ -2,23 +2,28 @@ // // Copyright (C) 2008 // Fraunhofer Institute for Open Communication Systems (FOKUS) -// Competence Center NETwork research (NET), St. Augustin, GERMANY -// Stefan Bund // -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. +// The contents of this file are subject to the Fraunhofer FOKUS Public License +// Version 1.0 (the "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// http://senf.berlios.de/license.html // -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. +// The Fraunhofer FOKUS Public License Version 1.0 is based on, +// but modifies the Mozilla Public License Version 1.1. +// See the full license text for the amendments. // -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the -// Free Software Foundation, Inc., -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Software distributed under the License is distributed on an "AS IS" basis, +// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +// for the specific language governing rights and limitations under the License. +// +// The Original Code is Fraunhofer FOKUS code. +// +// The Initial Developer of the Original Code is Fraunhofer-Gesellschaft e.V. +// (registered association), Hansastraße 27 c, 80686 Munich, Germany. +// All Rights Reserved. +// +// Contributor(s): +// Stefan Bund /** \file \brief Parse internal header */ @@ -29,33 +34,48 @@ // Custom includes #include #include -#include -#include -#include -#include + +#if HAVE_BOOST_SPIRIT_INCLUDE_CLASSIC_HPP +# include +# include +# include +# include +#else +# include +# include +# include +# include +#endif + #include -///////////////////////////////ih.p//////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// namespace senf { namespace console { namespace detail { +#if HAVE_BOOST_SPIRIT_INCLUDE_CLASSIC_HPP + namespace boost_spirit = ::boost::spirit::classic; +#else + namespace boost_spirit = ::boost::spirit; +#endif + #ifndef DOXYGEN struct FilePositionWithIndex - : public boost::spirit::file_position + : public boost_spirit::file_position { int index; FilePositionWithIndex(std::string const & file_ = std::string(), int line_ = 1, int column_ = 1, int index_ = 0) - : boost::spirit::file_position (file_, line_, column_), index (index_) + : boost_spirit::file_position (file_, line_, column_), index (index_) {} bool operator==(const FilePositionWithIndex & fp) const { - return boost::spirit::file_position::operator==(fp) && index == fp.index; + return boost_spirit::file_position::operator==(fp) && index == fp.index; } }; @@ -67,18 +87,18 @@ namespace detail { ::phoenix::function const positionOf; - /////////////////////////////////////////////////////////////////////////// + //-///////////////////////////////////////////////////////////////////////////////////////////// // Grammar template - struct CommandGrammar : boost::spirit::grammar > + struct CommandGrammar : boost_spirit::grammar > { - /////////////////////////////////////////////////////////////////////////// + //-///////////////////////////////////////////////////////////////////////////////////////// // Start rules enum { CommandParser, SkipParser, ArgumentsParser, PathParser }; - /////////////////////////////////////////////////////////////////////////// + //-///////////////////////////////////////////////////////////////////////////////////////// // The parse context (variables needed while parsing) typedef Token::TokenType TokenType; @@ -93,27 +113,27 @@ namespace detail { Context & context; - /////////////////////////////////////////////////////////////////////////// + //-///////////////////////////////////////////////////////////////////////////////////////// // Configuration bool incremental; - /////////////////////////////////////////////////////////////////////////// + //-///////////////////////////////////////////////////////////////////////////////////////// // Dispatching semantic actions ParseDispatcher & dispatcher; - ////////////////////////////////////////////////////////////////////////// + //-///////////////////////////////////////////////////////////////////////////////////////// // charachter sets - static boost::spirit::chset<> special_p; - static boost::spirit::chset<> punctuation_p; - static boost::spirit::chset<> space_p; - static boost::spirit::chset<> invalid_p; - static boost::spirit::chset<> word_p; - static boost::spirit::distinct_parser<> keyword_p; + static boost_spirit::chset<> special_p; + static boost_spirit::chset<> punctuation_p; + static boost_spirit::chset<> space_p; + static boost_spirit::chset<> invalid_p; + static boost_spirit::chset<> word_p; + static boost_spirit::distinct_parser<> keyword_p; - /////////////////////////////////////////////////////////////////////////// + //-///////////////////////////////////////////////////////////////////////////////////////// // Errors enum Errors { @@ -123,26 +143,26 @@ namespace detail { QuoteExpected }; - /////////////////////////////////////////////////////////////////////////// + //-///////////////////////////////////////////////////////////////////////////////////////// CommandGrammar(ParseDispatcher & d, Context & c) : context(c), incremental(false), dispatcher(d) {} template struct definition - : public boost::spirit::grammar_def< boost::spirit::rule, - boost::spirit::rule, - boost::spirit::rule, - boost::spirit::rule > + : public boost_spirit::grammar_def< boost_spirit::rule, + boost_spirit::rule, + boost_spirit::rule, + boost_spirit::rule > { - boost::spirit::rule command, path, argument, word, string, hexstring, token, - punctuation, hexbyte, balanced_tokens, simple_argument, complex_argument, builtin, - skip, statement, relpath, abspath, arguments, group_start, group_close, - statement_end, opt_path; + boost_spirit::rule command, path, argument, word, string, hexstring, + word_or_string, token, punctuation, hexbyte, balanced_tokens, simple_argument, + complex_argument, builtin, skip, statement, relpath, abspath, arguments, + group_start, group_close, statement_end, opt_path; definition(CommandGrammar const & self) { - using namespace boost::spirit; + using namespace boost_spirit; using namespace ::phoenix; using namespace senf::phoenix; typedef ParseDispatcher PD; @@ -159,7 +179,7 @@ namespace detail { assertion closing_paren_expected (ClosingParenExpected); assertion quote_expected (QuoteExpected); - /////////////////////////////////////////////////////////////////// + //-///////////////////////////////////////////////////////////////////////////////// // Spirit grammar // // Syntax summary: @@ -292,7 +312,7 @@ namespace detail { ; relpath - = ( word [ push_back(path_, token_) ] + = ( word_or_string [ push_back(path_, token_) ] % +ch_p('/') ) >> ( ! (+ch_p('/') ) [ push_back(path_, construct_()) ] ) ; @@ -360,6 +380,11 @@ namespace detail { pos_) ] ; + word_or_string + = word + | string + ; + hexbyte = uint_parser() [ push_back(str_, arg1) ] @@ -379,7 +404,7 @@ namespace detail { = self.space_p | comment_p('#') ; - /////////////////////////////////////////////////////////////////// + //-///////////////////////////////////////////////////////////////////////////////// start_parsers( command, // CommandParser @@ -410,24 +435,24 @@ namespace detail { }; }; - template boost::spirit::chset<> CommandGrammar::special_p ( + template boost_spirit::chset<> CommandGrammar::special_p ( "/(){};\""); - template boost::spirit::chset<> CommandGrammar::punctuation_p ( + template boost_spirit::chset<> CommandGrammar::punctuation_p ( ",="); - template boost::spirit::chset<> CommandGrammar::space_p ( + template boost_spirit::chset<> CommandGrammar::space_p ( " \t\n\r"); - template boost::spirit::chset<> CommandGrammar::invalid_p ( - (boost::spirit::chset<>('\0') | boost::spirit::chset<>("\x01-\x20")) - space_p ); - template boost::spirit::chset<> CommandGrammar::word_p ( - boost::spirit::anychar_p - special_p - punctuation_p - space_p - invalid_p); - template boost::spirit::distinct_parser<> CommandGrammar::keyword_p ( - word_p | boost::spirit::ch_p('/')); + template boost_spirit::chset<> CommandGrammar::invalid_p ( + (boost_spirit::chset<>('\0') | boost_spirit::chset<>("\x01-\x20")) - space_p ); + template boost_spirit::chset<> CommandGrammar::word_p ( + boost_spirit::anychar_p - special_p - punctuation_p - space_p - invalid_p); + template boost_spirit::distinct_parser<> CommandGrammar::keyword_p ( + word_p | boost_spirit::ch_p('/')); #endif }}} -///////////////////////////////ih.e//////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// #endif