minor fixes for clang++
[senf.git] / senf / Utils / Console / Parse.ih
index 1fd7d2d..a2dc6b3 100644 (file)
@@ -2,23 +2,28 @@
 //
 // Copyright (C) 2008
 // Fraunhofer Institute for Open Communication Systems (FOKUS)
-// Competence Center NETwork research (NET), St. Augustin, GERMANY
-//     Stefan Bund <g0dil@berlios.de>
 //
-// 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 <g0dil@berlios.de>
 
 /** \file
     \brief Parse internal header */
@@ -44,7 +49,7 @@
 
 #include <senf/Utils/Phoenix.hh>
 
-///////////////////////////////ih.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 namespace senf {
 namespace console {
@@ -82,18 +87,18 @@ namespace detail {
 
     ::phoenix::function<PositionOf> const positionOf;
 
-    ///////////////////////////////////////////////////////////////////////////
+    //-/////////////////////////////////////////////////////////////////////////////////////////////
     // Grammar
 
     template <class ParseDispatcher>
     struct CommandGrammar : boost_spirit::grammar<CommandGrammar<ParseDispatcher> >
     {
-        ///////////////////////////////////////////////////////////////////////////
+        //-/////////////////////////////////////////////////////////////////////////////////////////
         // Start rules
 
         enum { CommandParser, SkipParser, ArgumentsParser, PathParser };
 
-        ///////////////////////////////////////////////////////////////////////////
+        //-/////////////////////////////////////////////////////////////////////////////////////////
         // The parse context (variables needed while parsing)
 
         typedef Token::TokenType TokenType;
@@ -108,27 +113,45 @@ 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<> p ("/(){};\"");
+            return p;
+        }
+        static boost_spirit::chset<> & punctuation_p() {
+            static boost_spirit::chset<> p (",=");
+            return p;
+        }
+        static boost_spirit::chset<> & space_p() {
+            static boost_spirit::chset<> p (" \t\n\r");
+            return p;
+        }
+        static boost_spirit::chset<> & invalid_p() {
+            static boost_spirit::chset<> p ((boost_spirit::chset<>('\0') | boost_spirit::chset<>("\x01-\x20")) - space_p() );
+            return p;
+        }
+        static boost_spirit::chset<> & word_p() {
+            static boost_spirit::chset<> p (boost_spirit::anychar_p - special_p() - punctuation_p() - space_p() - invalid_p());
+            return p;
+        }
+        static boost_spirit::distinct_parser<> & keyword_p() {
+            static boost_spirit::distinct_parser<> p (word_p() | boost_spirit::ch_p('/'));
+            return p;
+        }
+
+        //-/////////////////////////////////////////////////////////////////////////////////////////
         // Errors
 
         enum Errors {
@@ -138,7 +161,7 @@ namespace detail {
             QuoteExpected
         };
 
-        ///////////////////////////////////////////////////////////////////////////
+        //-/////////////////////////////////////////////////////////////////////////////////////////
 
         CommandGrammar(ParseDispatcher & d, Context & c)
             : context(c), incremental(false), dispatcher(d) {}
@@ -150,10 +173,10 @@ namespace detail {
                                                  boost_spirit::rule<Scanner>,
                                                  boost_spirit::rule<Scanner> >
         {
-            boost_spirit::rule<Scanner> 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<Scanner> 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)
             {
@@ -174,7 +197,7 @@ namespace detail {
                 assertion<Errors> closing_paren_expected      (ClosingParenExpected);
                 assertion<Errors> quote_expected              (QuoteExpected);
 
-                ///////////////////////////////////////////////////////////////////
+                //-/////////////////////////////////////////////////////////////////////////////////
                 // Spirit grammar
                 //
                 // Syntax summary:
@@ -229,20 +252,20 @@ namespace detail {
                     ;
 
                 builtin
-                    =    self.keyword_p("cd")
+                    =    self.keyword_p()("cd")
                       >> path_expected(path)
                       >> eps_p                    [ bind(&PD::builtin_cd)(d_, path_) ]
-                    |    self.keyword_p("ls")
+                    |    self.keyword_p()("ls")
                       >> ! path
                       >> eps_p                    [ bind(&PD::builtin_ls)(d_, path_) ]
-                    |    self.keyword_p("ll")
+                    |    self.keyword_p()("ll")
                       >> ! path
                       >> eps_p                    [ bind(&PD::builtin_ll)(d_, path_) ]
-                    |    self.keyword_p("lr")
+                    |    self.keyword_p()("lr")
                       >> ! path
                       >> eps_p                    [ bind(&PD::builtin_lr)(d_, path_) ]
-                    |    self.keyword_p("exit")   [ bind(&PD::builtin_exit)(d_) ]
-                    |    self.keyword_p("help")
+                    |    self.keyword_p()("exit")   [ bind(&PD::builtin_exit)(d_) ]
+                    |    self.keyword_p()("help")
                       >> ! path
                       >> eps_p                    [ bind(&PD::builtin_help)(d_, path_) ]
                     ;
@@ -307,7 +330,7 @@ namespace detail {
                     ;
 
                 relpath
-                    =    (   word                 [ push_back(path_, token_) ]
+                    =    (   word_or_string       [ push_back(path_, token_) ]
                            % +ch_p('/') )
                       >> ( ! (+ch_p('/') )        [ push_back(path_, construct_<Token>()) ] )
                     ;
@@ -356,7 +379,7 @@ namespace detail {
                          | ch_p(';')                [ token_ = construct_<Token>(
                                                           Token::CommandTerminator,
                                                           ";") ]
-                         | self.punctuation_p       [ token_ = construct_<Token>(
+                         | self.punctuation_p()     [ token_ = construct_<Token>(
                                                           Token::OtherPunctuation,
                                                           construct_<std::string>(1u, arg1),
                                                           pos_) ]
@@ -367,7 +390,7 @@ namespace detail {
                     =    eps_p                    [ pos_ = positionOf(arg1) ]
                       >> lexeme_d
                          [
-                             (+ self.word_p)      [ str_ = construct_<std::string>(arg1, arg2) ]
+                             (+ self.word_p())    [ str_ = construct_<std::string>(arg1, arg2) ]
                          ]
                       >> eps_p                    [ token_ = construct_<Token>(
                                                         Token::Word,
@@ -375,6 +398,11 @@ namespace detail {
                                                         pos_) ]
                     ;
 
+                word_or_string
+                    =    word
+                    |    string
+                    ;
+
                 hexbyte
                     =    uint_parser<char, 16, 2, 2>()
                                                   [ push_back(str_, arg1) ]
@@ -391,12 +419,12 @@ namespace detail {
                     ;
 
                 skip
-                    =    self.space_p | comment_p('#')
+                    =    self.space_p() | comment_p('#')
                     ;
 
-                ///////////////////////////////////////////////////////////////////
+                //-/////////////////////////////////////////////////////////////////////////////////
 
-                start_parsers(
+                this->start_parsers(
                     command,            // CommandParser
                     skip,               // SkipParser
                     arguments,          // ArgumentsParser
@@ -425,24 +453,11 @@ namespace detail {
         };
     };
 
-    template <class PD> boost_spirit::chset<> CommandGrammar<PD>::special_p (
-        "/(){};\"");
-    template <class PD> boost_spirit::chset<> CommandGrammar<PD>::punctuation_p (
-        ",=");
-    template <class PD> boost_spirit::chset<> CommandGrammar<PD>::space_p (
-        " \t\n\r");
-    template <class PD> boost_spirit::chset<> CommandGrammar<PD>::invalid_p (
-        (boost_spirit::chset<>('\0') | boost_spirit::chset<>("\x01-\x20")) - space_p );
-    template <class PD> boost_spirit::chset<> CommandGrammar<PD>::word_p (
-        boost_spirit::anychar_p - special_p - punctuation_p - space_p - invalid_p);
-    template <class PD> boost_spirit::distinct_parser<> CommandGrammar<PD>::keyword_p (
-        word_p | boost_spirit::ch_p('/'));
-
 #endif
 
 }}}
 
-///////////////////////////////ih.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #endif
 
 \f