[FIX] Fixed a few functor names and deleted a deprecated link to extras

Author: Jochen Singer

core/include/seqan/basic/basic_exception.h

@@ -256,17 +256,17 @@ const std::string ExceptionMessage<T, TSpec>::VALUE;
 // ============================================================================
 
 // ----------------------------------------------------------------------------
-// Functor Asserter
+// Functor AssertFunctor
 // ----------------------------------------------------------------------------
 
 template <typename TFunctor, typename TException, typename TContext = void, bool RETURN_VALUE = false>
-struct Asserter
+struct AssertFunctor
 {
     TFunctor func;
 
-    Asserter() {}
+    AssertFunctor() {}
 
-    Asserter(TFunctor & func) :
+    AssertFunctor(TFunctor & func) :
         func(func)
     {}
 

core/include/seqan/stream.h

@@ -46,7 +46,6 @@
 #include <fstream>
 #include <sstream>
 
-#include <../../extras/include/seqan/sequence/iterator_range.h>
 #include <seqan/basic.h>
 #include <seqan/file.h>
 #include <seqan/sequence.h>

core/include/seqan/stream/tokenization.h

@@ -142,7 +142,9 @@ const std::string ExceptionMessage<EqualsChar<CHAR>, TContext>::VALUE = std::str
 // ----------------------------------------------------------------------------
 // Don't use isblank() or isspace() as it they seem to be slower than our functors (due to inlining)
 
-typedef OrFunctor<EqualsChar<' '>, EqualsChar<'\t'> >           IsBlank;
+typedef EqualsChar<'\t'>                                        IsTab;
+typedef EqualsChar<' '>                                         IsSpace;
+typedef OrFunctor<IsSpace, IsTab>                               IsBlank;
 typedef OrFunctor<EqualsChar<'\n'>, EqualsChar<'\r'> >          IsNewline;
 typedef OrFunctor<IsBlank, IsNewline>                           IsWhitespace;
 typedef IsInRange<'!', '~'>                                     IsGraph;
@@ -221,7 +223,7 @@ inline void skipUntil(TFwdIterator &iter, TStopFunctor const &stopFunctor)
 template <typename TFwdIterator, typename TFunctor>
 inline void skipOne(TFwdIterator &iter, TFunctor &functor)
 {
-    Asserter<TFunctor, ParseError> asserter(functor);
+    AssertFunctor<TFunctor, ParseError> asserter(functor);
 
     if (atEnd(iter))
         throw UnexpectedEnd();