X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2FConsole%2FParse.cc;h=e36c7c52e2bab5fa79a9e0e77497e4eceaf11cdf;hb=refs%2Fheads%2Fmaster;hp=afae4feaaa5b20f9e189853c49532ff66f7f5f77;hpb=a1c37005ec4c281f6a76c07070a943cd1e36b6af;p=senf.git

diff --git a/senf/Utils/Console/Parse.cc b/senf/Utils/Console/Parse.cc
index afae4fe..e36c7c5 100644
--- a/senf/Utils/Console/Parse.cc
+++ b/senf/Utils/Console/Parse.cc
@@ -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 non-inline non-template implementation */
@@ -45,7 +50,7 @@
 
 //#include "Parse.mpp"
 #define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 namespace senf {
 namespace console {
@@ -128,7 +133,7 @@ namespace detail {
 
 }}}
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::console::Token
 
 prefix_ senf::console::Token::Token(TokenType type, std::string token,
@@ -170,7 +175,7 @@ prefix_ std::ostream & senf::console::operator<<(std::ostream & os, Token const
     return os;
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::console::ParseCommandInfo
 
 prefix_ std::ostream & senf::console::operator<<(std::ostream & stream,
@@ -209,7 +214,7 @@ prefix_ std::ostream & senf::console::operator<<(std::ostream & stream,
     return stream;
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::console::ParseCommandInfo::ArgumentIterator
 
 prefix_ void senf::console::ParseCommandInfo::ArgumentIterator::setRange()
@@ -251,7 +256,7 @@ prefix_ void senf::console::ParseCommandInfo::ArgumentIterator::decrement()
     }
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::console::CommandParser
 
 #ifndef DOXYGEN
@@ -292,9 +297,10 @@ namespace classic {
 #endif
 
     template <>
-    struct position_policy<senf::console::detail::FilePositionWithIndex>
+    class position_policy<senf::console::detail::FilePositionWithIndex>
         : public position_policy<file_position>
     {
+    public:
         typedef position_policy<file_position> Base;
 
         void next_line(senf::console::detail::FilePositionWithIndex & pos)
@@ -343,7 +349,7 @@ prefix_ Iterator senf::console::CommandParser::parseLoop(Iterator npb, Iterator
     detail::ParseDispatcher::BindInfo bind (impl().dispatcher, info);
     detail::boost_spirit::parse_info<PositionIterator> result;
 
-    for(;;) {
+    for (;;) {
         result = detail::boost_spirit::parse(
             b, e, * impl().grammar.use_parser<Impl::Grammar::SkipParser>());
         b = result.stop;
@@ -471,35 +477,35 @@ senf::console::CommandParser::parseIncremental(std::string const & commands, Cal
                           parseLoop(commands.begin(), commands.end(), "<unknown>", cb) );
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // Character sets
 
 prefix_ bool senf::console::CommandParser::isSpecialChar(char ch)
 {
-    return Impl::Grammar::special_p.test(ch);
+    return Impl::Grammar::special_p().test(ch);
 }
 
 prefix_ bool senf::console::CommandParser::isPunctuationChar(char ch)
 {
-    return Impl::Grammar::punctuation_p.test(ch);
+    return Impl::Grammar::punctuation_p().test(ch);
 }
 
 prefix_ bool senf::console::CommandParser::isSpaceChar(char ch)
 {
-    return Impl::Grammar::space_p.test(ch);
+    return Impl::Grammar::space_p().test(ch);
 }
 
 prefix_ bool senf::console::CommandParser::isInvalidChar(char ch)
 {
-    return Impl::Grammar::invalid_p.test(ch);
+    return Impl::Grammar::invalid_p().test(ch);
 }
 
 prefix_ bool senf::console::CommandParser::isWordChar(char ch)
 {
-    return Impl::Grammar::word_p.test(ch);
+    return Impl::Grammar::word_p().test(ch);
 }
 
-/////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_
 //#include "Parse.mpp"