qtbindings 4.8.6.3 → 4.8.6.4

data/ext/generator/parser/rpp/pp-macro.h

@@ -1,176 +1,176 @@
-/*
-  Copyright 2005 Roberto Raggi <roberto@kdevelop.org>
-
-  Permission to use, copy, modify, distribute, and sell this software and its
-  documentation for any purpose is hereby granted without fee, provided that
-  the above copyright notice appear in all copies and that both that
-  copyright notice and this permission notice appear in supporting
-  documentation.
-
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-  KDEVELOP TEAM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-  AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#ifndef PP_MACRO_H
-#define PP_MACRO_H
-
-//krazy:excludeall=inline
-
-#include <QtCore/QStringList>
-#include <QVector>
-#include "../indexedstring.h"
-#include "../cppparser_export.h"
-// #include "appendedlist.h"
-// #include <language/editor/hashedstring.h>
-// #include <language/duchain/appendedlist.h>
-
-#define FOREACH_CUSTOM(item, container, size) for(int a = 0, mustDo = 1; a < (int)size; ++a) if((mustDo = 1)) for(item(container[a]); mustDo; mustDo = 0)
-
-namespace rpp {
-
-// Q_DECL_EXPORT DECLARE_LIST_MEMBER_HASH(pp_macro, definition, IndexedString)
-// Q_DECL_EXPORT DECLARE_LIST_MEMBER_HASH(pp_macro, formals, IndexedString)
-
-  //This contains the data of a macro that can be marshalled by directly copying the memory
-struct CPPPARSER_EXPORT pp_macro
-{ ///@todo enable structure packing
-  pp_macro(const IndexedString& name = IndexedString());
-  pp_macro(const char* name);
-  pp_macro(const pp_macro& rhs, bool dynamic = true);
-  ~pp_macro();
-  
-  uint classSize() const {
-    return sizeof(pp_macro);
-  }
-  
-  /*uint itemSize() const {
-    return dynamicSize();
-  }*/
-  
-  typedef uint HashType;
-
-  IndexedString name;
-  IndexedString file;
-  
-  int sourceLine; //line
-
-  bool defined: 1; // !isUndefMacro
-  bool hidden: 1;
-  bool function_like: 1; // hasArguments
-  bool variadics: 1;
-  bool fixed : 1; //If this is set, the macro can not be overridden or undefined.
-  mutable bool m_valueHashValid : 1;
-  
-  //The valueHash is not necessarily valid
-  mutable HashType m_valueHash; //Hash that represents the values of all macros
-  
-  bool operator==(const pp_macro& rhs) const;
-  
-  bool isUndef() const  {
-    return !defined;
-  }
-  
-  unsigned int hash() const {
-    return completeHash();
-  }
-  
-  HashType idHash() const {
-    return name.hash();
-  }
-  
-  QString toString() const;
-  
-  struct NameCompare {
-    bool operator () ( const pp_macro& lhs, const pp_macro& rhs ) const {
-      return lhs.name.index() < rhs.name.index();
-    }
-    #ifdef Q_CC_MSVC
-    
-    HashType operator () ( const pp_macro& macro ) const
-    {
-        return macro.idHash();
-    }
-    
-    enum
-    { // parameters for hash table
-    bucket_size = 4,  // 0 < bucket_size
-    min_buckets = 8}; // min_buckets = 2 ^^ N, 0 < N
-    #endif
-  };
-
-  //Hash over id and value
-  struct CompleteHash {
-    HashType operator () ( const pp_macro& lhs ) const {
-        return lhs.completeHash();
-    }
-    
-    #ifdef Q_CC_MSVC
-    
-    bool operator () ( const pp_macro& lhs, const pp_macro& rhs ) const {
-        HashType lhash = lhs.valueHash()+lhs.idHash();
-        HashType rhash = rhs.valueHash()+rhs.idHash();
-        if( lhash < rhash ) return true;
-        else if( lhash > rhash ) return false;
-
-      int df = lhs.name.str().compare( rhs.name.str() );
-      return df < 0;
-    }
-    
-    enum
-    { // parameters for hash table
-    bucket_size = 4,  // 0 < bucket_size
-    min_buckets = 8}; // min_buckets = 2 ^^ N, 0 < N
-    #endif
-  };
-  
-  HashType valueHash() const {
-    if( !m_valueHashValid ) computeHash();
-    return m_valueHash;
-  }
-
-  ///Hash that identifies all of this macro, the value and the identity
-  HashType completeHash() const {
-    return valueHash() + idHash() * 3777;
-  }
-  
-  void invalidateHash();
-  
-  ///Convenient way of setting the definition, it is tokenized automatically
-  ///@param definition utf-8 representation of the definition text
-  void setDefinitionText(QByteArray definition);
-  
-  ///More convenient overload
-  void setDefinitionText(QString definition);
-  
-  void setDefinitionText(const char* definition) {
-    setDefinitionText(QByteArray(definition));
-  }
-  
-//   START_APPENDED_LISTS(pp_macro)
-//   APPENDED_LIST_FIRST(pp_macro, IndexedString, definition)
-//   APPENDED_LIST(pp_macro, IndexedString, formals, definition)
-//   END_APPENDED_LISTS(pp_macro, formals)
-
-  QVector<IndexedString> definition;
-  QVector<IndexedString> formals;
-
-  private:
-    pp_macro& operator=(const pp_macro& rhs);
-    void computeHash() const;
-};
-
-}
-
-inline uint qHash( const rpp::pp_macro& m ) {
-  return (uint)m.idHash();
-}
-
-#endif // PP_MACRO_H
-
+/*
+  Copyright 2005 Roberto Raggi <roberto@kdevelop.org>
+
+  Permission to use, copy, modify, distribute, and sell this software and its
+  documentation for any purpose is hereby granted without fee, provided that
+  the above copyright notice appear in all copies and that both that
+  copyright notice and this permission notice appear in supporting
+  documentation.
+
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+  KDEVELOP TEAM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+  AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#ifndef PP_MACRO_H
+#define PP_MACRO_H
+
+//krazy:excludeall=inline
+
+#include <QtCore/QStringList>
+#include <QVector>
+#include "../indexedstring.h"
+#include "../cppparser_export.h"
+// #include "appendedlist.h"
+// #include <language/editor/hashedstring.h>
+// #include <language/duchain/appendedlist.h>
+
+#define FOREACH_CUSTOM(item, container, size) for(int a = 0, mustDo = 1; a < (int)size; ++a) if((mustDo = 1)) for(item(container[a]); mustDo; mustDo = 0)
+
+namespace rpp {
+
+// Q_DECL_EXPORT DECLARE_LIST_MEMBER_HASH(pp_macro, definition, IndexedString)
+// Q_DECL_EXPORT DECLARE_LIST_MEMBER_HASH(pp_macro, formals, IndexedString)
+
+  //This contains the data of a macro that can be marshalled by directly copying the memory
+struct CPPPARSER_EXPORT pp_macro
+{ ///@todo enable structure packing
+  pp_macro(const IndexedString& name = IndexedString());
+  pp_macro(const char* name);
+  pp_macro(const pp_macro& rhs, bool dynamic = true);
+  ~pp_macro();
+  
+  uint classSize() const {
+    return sizeof(pp_macro);
+  }
+  
+  /*uint itemSize() const {
+    return dynamicSize();
+  }*/
+  
+  typedef uint HashType;
+
+  IndexedString name;
+  IndexedString file;
+  
+  int sourceLine; //line
+
+  bool defined: 1; // !isUndefMacro
+  bool hidden: 1;
+  bool function_like: 1; // hasArguments
+  bool variadics: 1;
+  bool fixed : 1; //If this is set, the macro can not be overridden or undefined.
+  mutable bool m_valueHashValid : 1;
+  
+  //The valueHash is not necessarily valid
+  mutable HashType m_valueHash; //Hash that represents the values of all macros
+  
+  bool operator==(const pp_macro& rhs) const;
+  
+  bool isUndef() const  {
+    return !defined;
+  }
+  
+  unsigned int hash() const {
+    return completeHash();
+  }
+  
+  HashType idHash() const {
+    return name.hash();
+  }
+  
+  QString toString() const;
+  
+  struct NameCompare {
+    bool operator () ( const pp_macro& lhs, const pp_macro& rhs ) const {
+      return lhs.name.index() < rhs.name.index();
+    }
+    #ifdef Q_CC_MSVC
+    
+    HashType operator () ( const pp_macro& macro ) const
+    {
+        return macro.idHash();
+    }
+    
+    enum
+    { // parameters for hash table
+    bucket_size = 4,  // 0 < bucket_size
+    min_buckets = 8}; // min_buckets = 2 ^^ N, 0 < N
+    #endif
+  };
+
+  //Hash over id and value
+  struct CompleteHash {
+    HashType operator () ( const pp_macro& lhs ) const {
+        return lhs.completeHash();
+    }
+    
+    #ifdef Q_CC_MSVC
+    
+    bool operator () ( const pp_macro& lhs, const pp_macro& rhs ) const {
+        HashType lhash = lhs.valueHash()+lhs.idHash();
+        HashType rhash = rhs.valueHash()+rhs.idHash();
+        if( lhash < rhash ) return true;
+        else if( lhash > rhash ) return false;
+
+      int df = lhs.name.str().compare( rhs.name.str() );
+      return df < 0;
+    }
+    
+    enum
+    { // parameters for hash table
+    bucket_size = 4,  // 0 < bucket_size
+    min_buckets = 8}; // min_buckets = 2 ^^ N, 0 < N
+    #endif
+  };
+  
+  HashType valueHash() const {
+    if( !m_valueHashValid ) computeHash();
+    return m_valueHash;
+  }
+
+  ///Hash that identifies all of this macro, the value and the identity
+  HashType completeHash() const {
+    return valueHash() + idHash() * 3777;
+  }
+  
+  void invalidateHash();
+  
+  ///Convenient way of setting the definition, it is tokenized automatically
+  ///@param definition utf-8 representation of the definition text
+  void setDefinitionText(QByteArray definition);
+  
+  ///More convenient overload
+  void setDefinitionText(QString definition);
+  
+  void setDefinitionText(const char* definition) {
+    setDefinitionText(QByteArray(definition));
+  }
+  
+//   START_APPENDED_LISTS(pp_macro)
+//   APPENDED_LIST_FIRST(pp_macro, IndexedString, definition)
+//   APPENDED_LIST(pp_macro, IndexedString, formals, definition)
+//   END_APPENDED_LISTS(pp_macro, formals)
+
+  QVector<IndexedString> definition;
+  QVector<IndexedString> formals;
+
+  private:
+    pp_macro& operator=(const pp_macro& rhs);
+    void computeHash() const;
+};
+
+}
+
+inline uint qHash( const rpp::pp_macro& m ) {
+  return (uint)m.idHash();
+}
+
+#endif // PP_MACRO_H
+

data/ext/generator/parser/rpp/pp-scanner.cpp

@@ -1,311 +1,311 @@
-/*
-  Copyright 2005 Roberto Raggi <roberto@kdevelop.org>
-  Copyright 2006 Hamish Rodda <rodda@kde.org>
-
-  Permission to use, copy, modify, distribute, and sell this software and its
-  documentation for any purpose is hereby granted without fee, provided that
-  the above copyright notice appear in all copies and that both that
-  copyright notice and this permission notice appear in supporting
-  documentation.
-
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-  KDEVELOP TEAM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-  AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#include "pp-scanner.h"
-#include "chartools.h"
-#include "../indexedstring.h"
-#include "../kdevvarlengtharray.h"
-
-using namespace rpp;
-
-void pp_skip_blanks::operator()(Stream& input, Stream& output)
-{
-  while (!input.atEnd()) {
-    if (input == '\\') {
-      ++input;
-      if (input != '\n') {
-        --input;
-        return;
-
-      } else {
-        ++input;
-        continue;
-      }
-    }
-
-    if (input == '\n' || !isSpace(input.current()))
-      return;
-
-    output << input;
-    ++input;
-  }
-}
-
-void pp_skip_whitespaces::operator()(Stream& input, Stream& output)
-{
-  while (!input.atEnd()) {
-    if (!isSpace(input.current()))
-      return;
-
-    output << input;
-    ++input;
-  }
-}
-
-void pp_skip_comment_or_divop::operator()(Stream& input, Stream& output, bool outputText)
-{
-  enum {
-    MAYBE_BEGIN,
-    BEGIN,
-    MAYBE_END,
-    END,
-    IN_COMMENT,
-    IN_CXX_COMMENT
-  } state (MAYBE_BEGIN);
-
-  while (!input.atEnd()) {
-    switch (state) {
-      case MAYBE_BEGIN:
-        if (input != '/')
-          return;
-
-        state = BEGIN;
-        break;
-
-      case BEGIN:
-        if (input == '*')
-          state = IN_COMMENT;
-        else if (input == '/')
-          state = IN_CXX_COMMENT;
-        else
-          return;
-        break;
-
-      case IN_COMMENT:
-        if (input == '*')
-          state = MAYBE_END;
-        break;
-
-      case IN_CXX_COMMENT:
-        if (input == '\n')
-          return;
-        break;
-
-      case MAYBE_END:
-        if (input == '/')
-          state = END;
-        else if (input != '*')
-          state = IN_COMMENT;
-        break;
-
-      case END:
-        return;
-    }
-
-    if (outputText) {
-      output << input;
-      ++input;
-
-    } else if (input == '\n') {
-      output << '\n';
-      ++input;
-      output.mark(input.inputPosition());
-
-    } else {
-      output << ' ';
-      ++input;
-    }
-  }
-}
-
-uint pp_skip_identifier::operator()(Stream& input)
-{
-  KDevVarLengthArray<char, 100> identifier;
-  
-  IndexedString::RunningHash hash;
-
-  while (!input.atEnd()) {
-    if(!isCharacter(input.current())) {
-      //Do a more complex merge, where also tokenized identifiers can be merged
-      IndexedString ret;
-      if(!identifier.isEmpty())
-        ret = IndexedString(identifier.constData(), identifier.size(), hash.hash);
-      
-      while (!input.atEnd()) {
-        uint current = input.current();
-        
-        if (!isLetterOrNumber(current) && input != '_' && isCharacter(current))
-          break;
-        
-        if(ret.isEmpty())
-          ret = IndexedString::fromIndex(current); //The most common fast path
-        else ///@todo Be better to build up a complete buffer and then append it all, so we don't get he intermediate strings into the repository
-          ret = IndexedString(ret.byteArray() + IndexedString::fromIndex(input.current()).byteArray());
-        
-        ++input;
-      }
-      return ret.index();
-    }
-    //Collect characters and connect them to an IndexedString
-    
-    if (!isLetterOrNumber(input.current()) && input != '_')
-        break;
-
-    char c = characterFromIndex(input);
-    hash.append(c);
-    identifier.append(c);
-    ++input;
-  }
-
-  return IndexedString(identifier.constData(), identifier.size(), hash.hash).index();
-}
-
-void pp_skip_number::operator()(Stream& input, Stream& output)
-{
-  while (!input.atEnd()) {
-    if (!isLetterOrNumber(input.current()) && input != '_')
-        return;
-
-    output << input;
-    ++input;
-  }
-}
-
-void pp_skip_string_literal::operator()(Stream& input, Stream& output)
-{
-  enum {
-    BEGIN,
-    IN_STRING,
-    QUOTE,
-    END
-  } state (BEGIN);
-
-  while (!input.atEnd()) {
-    switch (state) {
-      case BEGIN:
-        if (input != '\"')
-          return;
-        state = IN_STRING;
-        break;
-
-      case IN_STRING:
-//         Q_ASSERT(input != '\n');
-
-        if (input == '\"')
-          state = END;
-        else if (input == '\\')
-          state = QUOTE;
-        break;
-
-      case QUOTE:
-        state = IN_STRING;
-        break;
-
-      case END:
-        return;
-    }
-
-    output << input;
-    ++input;
-  }
-}
-
-void pp_skip_char_literal::operator()(Stream& input, Stream& output)
-{
-  enum {
-    BEGIN,
-    IN_STRING,
-    QUOTE,
-    END
-  } state (BEGIN);
-  int inner_count = 0;
-
-  while (!input.atEnd()) {
-    if (state == END)
-      break;
-
-    switch (state) {
-      case BEGIN:
-        if (input != '\'')
-          return;
-        state = IN_STRING;
-        break;
-
-      case IN_STRING:
-        if(input == '\n' || inner_count > 3)
-          return; //Probably this isn't a string literal. Example: "#warning What's up"
-
-        if (input == '\'')
-          state = END;
-        else if (input == '\\')
-          state = QUOTE;
-
-        ++inner_count;
-        break;
-      case QUOTE:
-        state = IN_STRING;
-        break;
-
-      default:
-        Q_ASSERT(0);
-        break;
-    }
-
-    output << input;
-    ++input;
-  }
-}
-
-///@todo Can this deal with comments? like /*(*/
-void pp_skip_argument::operator()(Stream& input, Stream& output)
-{
-  int depth = 0;
-
-  while (!input.atEnd()) {
-    if (!depth && (input == ')' || input == ',')) {
-      return;
-
-    } else if (input == '(') {
-      ++depth;
-
-    } else if (input == ')') {
-      --depth;
-
-    } else if (input == '\"') {
-      skip_string_literal(input, output);
-      continue;
-
-    } else if (input == '\'') {
-      skip_char_literal (input, output);
-      continue;
-
-    } else if (input == '/') {
-      skip_comment_or_divop (input, output, true);
-      continue;
-
-    } else if (isLetter(input.current()) || input == '_') {
-      Anchor inputPosition = input.inputPosition();
-      output.appendString(inputPosition, IndexedString::fromIndex(skip_identifier(input)));
-      continue;
-
-    } else if (isNumber(input.current())) {
-      output.mark(input.inputPosition());
-      skip_number(input, output);
-      continue;
-
-    }
-
-    output << input;
-    ++input;
-  }
-
-  return;
-}
+/*
+  Copyright 2005 Roberto Raggi <roberto@kdevelop.org>
+  Copyright 2006 Hamish Rodda <rodda@kde.org>
+
+  Permission to use, copy, modify, distribute, and sell this software and its
+  documentation for any purpose is hereby granted without fee, provided that
+  the above copyright notice appear in all copies and that both that
+  copyright notice and this permission notice appear in supporting
+  documentation.
+
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+  KDEVELOP TEAM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+  AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#include "pp-scanner.h"
+#include "chartools.h"
+#include "../indexedstring.h"
+#include "../kdevvarlengtharray.h"
+
+using namespace rpp;
+
+void pp_skip_blanks::operator()(Stream& input, Stream& output)
+{
+  while (!input.atEnd()) {
+    if (input == '\\') {
+      ++input;
+      if (input != '\n') {
+        --input;
+        return;
+
+      } else {
+        ++input;
+        continue;
+      }
+    }
+
+    if (input == '\n' || !isSpace(input.current()))
+      return;
+
+    output << input;
+    ++input;
+  }
+}
+
+void pp_skip_whitespaces::operator()(Stream& input, Stream& output)
+{
+  while (!input.atEnd()) {
+    if (!isSpace(input.current()))
+      return;
+
+    output << input;
+    ++input;
+  }
+}
+
+void pp_skip_comment_or_divop::operator()(Stream& input, Stream& output, bool outputText)
+{
+  enum {
+    MAYBE_BEGIN,
+    BEGIN,
+    MAYBE_END,
+    END,
+    IN_COMMENT,
+    IN_CXX_COMMENT
+  } state (MAYBE_BEGIN);
+
+  while (!input.atEnd()) {
+    switch (state) {
+      case MAYBE_BEGIN:
+        if (input != '/')
+          return;
+
+        state = BEGIN;
+        break;
+
+      case BEGIN:
+        if (input == '*')
+          state = IN_COMMENT;
+        else if (input == '/')
+          state = IN_CXX_COMMENT;
+        else
+          return;
+        break;
+
+      case IN_COMMENT:
+        if (input == '*')
+          state = MAYBE_END;
+        break;
+
+      case IN_CXX_COMMENT:
+        if (input == '\n')
+          return;
+        break;
+
+      case MAYBE_END:
+        if (input == '/')
+          state = END;
+        else if (input != '*')
+          state = IN_COMMENT;
+        break;
+
+      case END:
+        return;
+    }
+
+    if (outputText) {
+      output << input;
+      ++input;
+
+    } else if (input == '\n') {
+      output << '\n';
+      ++input;
+      output.mark(input.inputPosition());
+
+    } else {
+      output << ' ';
+      ++input;
+    }
+  }
+}
+
+uint pp_skip_identifier::operator()(Stream& input)
+{
+  KDevVarLengthArray<char, 100> identifier;
+  
+  IndexedString::RunningHash hash;
+
+  while (!input.atEnd()) {
+    if(!isCharacter(input.current())) {
+      //Do a more complex merge, where also tokenized identifiers can be merged
+      IndexedString ret;
+      if(!identifier.isEmpty())
+        ret = IndexedString(identifier.constData(), identifier.size(), hash.hash);
+      
+      while (!input.atEnd()) {
+        uint current = input.current();
+        
+        if (!isLetterOrNumber(current) && input != '_' && isCharacter(current))
+          break;
+        
+        if(ret.isEmpty())
+          ret = IndexedString::fromIndex(current); //The most common fast path
+        else ///@todo Be better to build up a complete buffer and then append it all, so we don't get he intermediate strings into the repository
+          ret = IndexedString(ret.byteArray() + IndexedString::fromIndex(input.current()).byteArray());
+        
+        ++input;
+      }
+      return ret.index();
+    }
+    //Collect characters and connect them to an IndexedString
+    
+    if (!isLetterOrNumber(input.current()) && input != '_')
+        break;
+
+    char c = characterFromIndex(input);
+    hash.append(c);
+    identifier.append(c);
+    ++input;
+  }
+
+  return IndexedString(identifier.constData(), identifier.size(), hash.hash).index();
+}
+
+void pp_skip_number::operator()(Stream& input, Stream& output)
+{
+  while (!input.atEnd()) {
+    if (!isLetterOrNumber(input.current()) && input != '_')
+        return;
+
+    output << input;
+    ++input;
+  }
+}
+
+void pp_skip_string_literal::operator()(Stream& input, Stream& output)
+{
+  enum {
+    BEGIN,
+    IN_STRING,
+    QUOTE,
+    END
+  } state (BEGIN);
+
+  while (!input.atEnd()) {
+    switch (state) {
+      case BEGIN:
+        if (input != '\"')
+          return;
+        state = IN_STRING;
+        break;
+
+      case IN_STRING:
+//         Q_ASSERT(input != '\n');
+
+        if (input == '\"')
+          state = END;
+        else if (input == '\\')
+          state = QUOTE;
+        break;
+
+      case QUOTE:
+        state = IN_STRING;
+        break;
+
+      case END:
+        return;
+    }
+
+    output << input;
+    ++input;
+  }
+}
+
+void pp_skip_char_literal::operator()(Stream& input, Stream& output)
+{
+  enum {
+    BEGIN,
+    IN_STRING,
+    QUOTE,
+    END
+  } state (BEGIN);
+  int inner_count = 0;
+
+  while (!input.atEnd()) {
+    if (state == END)
+      break;
+
+    switch (state) {
+      case BEGIN:
+        if (input != '\'')
+          return;
+        state = IN_STRING;
+        break;
+
+      case IN_STRING:
+        if(input == '\n' || inner_count > 3)
+          return; //Probably this isn't a string literal. Example: "#warning What's up"
+
+        if (input == '\'')
+          state = END;
+        else if (input == '\\')
+          state = QUOTE;
+
+        ++inner_count;
+        break;
+      case QUOTE:
+        state = IN_STRING;
+        break;
+
+      default:
+        Q_ASSERT(0);
+        break;
+    }
+
+    output << input;
+    ++input;
+  }
+}
+
+///@todo Can this deal with comments? like /*(*/
+void pp_skip_argument::operator()(Stream& input, Stream& output)
+{
+  int depth = 0;
+
+  while (!input.atEnd()) {
+    if (!depth && (input == ')' || input == ',')) {
+      return;
+
+    } else if (input == '(') {
+      ++depth;
+
+    } else if (input == ')') {
+      --depth;
+
+    } else if (input == '\"') {
+      skip_string_literal(input, output);
+      continue;
+
+    } else if (input == '\'') {
+      skip_char_literal (input, output);
+      continue;
+
+    } else if (input == '/') {
+      skip_comment_or_divop (input, output, true);
+      continue;
+
+    } else if (isLetter(input.current()) || input == '_') {
+      Anchor inputPosition = input.inputPosition();
+      output.appendString(inputPosition, IndexedString::fromIndex(skip_identifier(input)));
+      continue;
+
+    } else if (isNumber(input.current())) {
+      output.mark(input.inputPosition());
+      skip_number(input, output);
+      continue;
+
+    }
+
+    output << input;
+    ++input;
+  }
+
+  return;
+}