qtbindings 4.8.6.3 → 4.8.6.4

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

@@ -1,183 +1,183 @@
-/*
-  Copyright 2006 Hamish Rodda <rodda@kde.org>
-  Copyright 2008-2009 David Nolden <david.nolden.kdevelop@art-master.de>
-
-  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 STREAM_H
-#define STREAM_H
-
-#include <QtCore/QIODevice>
-
-#include "../cppparser_export.h"
-#include "../simplecursor.h"
-#include "../indexedstring.h"
-#include "anchor.h"
-#include "chartools.h"
-
-typedef QVector<unsigned int> PreprocessedContents;
-
-namespace KDevelop {
-  class IndexedString;
-}
-
-namespace rpp {
-
-class LocationTable;
-
-/**
- * Stream designed for character-at-a-time processing
- *
- * @author Hamish Rodda <rodda@kde.org>
- */
-class CPPPARSER_EXPORT Stream
-{
-    static const uint newline;
-
-  public:
-    Stream();
-    //If the given offset anchor has the member "collapsed" set to true, the position will be locked.
-    explicit Stream( const uint * string, uint stringSize, const Anchor& offset = Anchor(0,0), LocationTable* table = 0 );
-    explicit Stream( PreprocessedContents * string, const Anchor& offset = Anchor(0,0), LocationTable* table = 0 );
-    explicit Stream( PreprocessedContents * string, LocationTable* table );
-    virtual ~Stream();
-
-    bool isNull() const;
-
-    bool atEnd() const;
-
-    void toEnd();
-
-    /// Returns true if toEnd was called on this stream.
-    bool skippedToEnd() const;
-
-    int offset() const;
-
-    const uint& peek(uint offset = 1) const;
-    
-    char peekNextCharacter() const {
-      const unsigned int* next = c+1;
-      if (next >= end || !isCharacter(*next))
-        return (char)0;
-
-      return characterFromIndex(*next);
-    }
-
-    //Slow, just for debugging
-    QByteArray stringFrom(int offset) const;
-
-    /// \warning the input and output lines are not updated when calling this function.
-    ///          if you're seek()ing over a line boundary, you'll need to fix the line and column
-    ///          numbers.
-    void seek(int offset);
-
-    /// Start from the beginning again
-    void reset();
-
-    /// Lock/unlock the input position. If the input position is locked, it will not be moved forwards.
-    void lockInputPosition(bool lock);
-
-    /// If a macro-expansion is set, all anchors given to mark() will get that macro-expansion set.
-    /// It marks the position from where the macro-expansion was started that leads to the current output @see rpp::Anchor
-    void setMacroExpansion(const SimpleCursor&);
-    SimpleCursor macroExpansion() const;
-    
-    //Checks whether the current index represents a character, and eventually compares it
-    bool operator==(const char otherc) const {
-      return isCharacter(*c) && *c == indexFromCharacter(otherc);
-    }
-
-    //Checks whether the current index represents a character, and eventually compares it
-    bool operator!=(const char otherc) const {
-      return !isCharacter(*c) || *c != indexFromCharacter(otherc);
-    }
-    
-    inline const uint& current() const { return *c; } //krazy:exclude=inline
-    inline operator const uint&() const { return *c; } //krazy:exclude=inline
-    inline Stream& operator++() //krazy:exclude=inline
-    {
-      if (c == end)
-        return *this;
-
-      if(m_inputPositionLocked)
-        ++m_inputLineStartedAt;
-      else if (*c == newline) {
-        ++m_inputLine;
-        m_inputLineStartedAt = m_pos + 1;
-      }else if(!isCharacter(*c)) {
-        //We have to do some special hacking here to keep the column-number correct.
-        m_inputLineStartedAt += 1-IndexedString::fromIndex(*c).length();
-      }
-
-      ++c;
-      ++m_pos;
-
-      return *this;
-    }
-
-    ///@warning Doesn't handle newlines correctly!
-    Stream& operator--();
-
-    ///Removes the last added item from the output, and returns it
-    uint popLastOutput();
-    
-    ///Allows peeking at the items that were added to the output recently
-    uint peekLastOutput(uint backOffset = 0) const;
-
-    ///Returns the cursor that points to the current input position.
-    Anchor inputPosition() const;
-    ///If the input position is collapsed, the input position will be locked from now on. It will stay the same until a new one is set.
-    void setInputPosition(const Anchor& position);
-
-    ///Input-position that marks the start of the topmost currently expanding macro in the original document
-    SimpleCursor originalInputPosition() const;
-    void setOriginalInputPosition(const SimpleCursor& position);
-
-    ///Used for output streams to mark stream positions with input position
-    ///The macroExpansion member may have no effect if macroExpansion is set for this stream.
-    void mark(const Anchor& position);
-
-    ///Returns the anchor for the current output position.
-    Anchor currentOutputAnchor() const;
-    
-    Stream & operator<< ( const char& c ) {
-      return operator<<(indexFromCharacter(c));
-    }
-    Stream & operator<< ( const unsigned int& c );
-    Stream & operator<< ( const Stream& input );
-    Stream& appendString( const Anchor& inputPosition, const PreprocessedContents & string );
-    Stream& appendString( const Anchor& inputPosition, IndexedString index );
-
-  private:
-    Q_DISABLE_COPY(Stream)
-
-    PreprocessedContents* m_string;
-    const unsigned int* c;
-    const unsigned int* end;
-    bool m_isNull, m_skippedToEnd, m_inputPositionLocked, m_onwsString;
-    SimpleCursor m_macroExpansion;
-    int m_pos;
-    int m_inputLine;
-    int m_inputLineStartedAt;
-    LocationTable* m_locationTable;
-    SimpleCursor m_originalInputPosition;
-};
-
-}
-
-#endif
+/*
+  Copyright 2006 Hamish Rodda <rodda@kde.org>
+  Copyright 2008-2009 David Nolden <david.nolden.kdevelop@art-master.de>
+
+  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 STREAM_H
+#define STREAM_H
+
+#include <QtCore/QIODevice>
+
+#include "../cppparser_export.h"
+#include "../simplecursor.h"
+#include "../indexedstring.h"
+#include "anchor.h"
+#include "chartools.h"
+
+typedef QVector<unsigned int> PreprocessedContents;
+
+namespace KDevelop {
+  class IndexedString;
+}
+
+namespace rpp {
+
+class LocationTable;
+
+/**
+ * Stream designed for character-at-a-time processing
+ *
+ * @author Hamish Rodda <rodda@kde.org>
+ */
+class CPPPARSER_EXPORT Stream
+{
+    static const uint newline;
+
+  public:
+    Stream();
+    //If the given offset anchor has the member "collapsed" set to true, the position will be locked.
+    explicit Stream( const uint * string, uint stringSize, const Anchor& offset = Anchor(0,0), LocationTable* table = 0 );
+    explicit Stream( PreprocessedContents * string, const Anchor& offset = Anchor(0,0), LocationTable* table = 0 );
+    explicit Stream( PreprocessedContents * string, LocationTable* table );
+    virtual ~Stream();
+
+    bool isNull() const;
+
+    bool atEnd() const;
+
+    void toEnd();
+
+    /// Returns true if toEnd was called on this stream.
+    bool skippedToEnd() const;
+
+    int offset() const;
+
+    const uint& peek(uint offset = 1) const;
+    
+    char peekNextCharacter() const {
+      const unsigned int* next = c+1;
+      if (next >= end || !isCharacter(*next))
+        return (char)0;
+
+      return characterFromIndex(*next);
+    }
+
+    //Slow, just for debugging
+    QByteArray stringFrom(int offset) const;
+
+    /// \warning the input and output lines are not updated when calling this function.
+    ///          if you're seek()ing over a line boundary, you'll need to fix the line and column
+    ///          numbers.
+    void seek(int offset);
+
+    /// Start from the beginning again
+    void reset();
+
+    /// Lock/unlock the input position. If the input position is locked, it will not be moved forwards.
+    void lockInputPosition(bool lock);
+
+    /// If a macro-expansion is set, all anchors given to mark() will get that macro-expansion set.
+    /// It marks the position from where the macro-expansion was started that leads to the current output @see rpp::Anchor
+    void setMacroExpansion(const SimpleCursor&);
+    SimpleCursor macroExpansion() const;
+    
+    //Checks whether the current index represents a character, and eventually compares it
+    bool operator==(const char otherc) const {
+      return isCharacter(*c) && *c == indexFromCharacter(otherc);
+    }
+
+    //Checks whether the current index represents a character, and eventually compares it
+    bool operator!=(const char otherc) const {
+      return !isCharacter(*c) || *c != indexFromCharacter(otherc);
+    }
+    
+    inline const uint& current() const { return *c; } //krazy:exclude=inline
+    inline operator const uint&() const { return *c; } //krazy:exclude=inline
+    inline Stream& operator++() //krazy:exclude=inline
+    {
+      if (c == end)
+        return *this;
+
+      if(m_inputPositionLocked)
+        ++m_inputLineStartedAt;
+      else if (*c == newline) {
+        ++m_inputLine;
+        m_inputLineStartedAt = m_pos + 1;
+      }else if(!isCharacter(*c)) {
+        //We have to do some special hacking here to keep the column-number correct.
+        m_inputLineStartedAt += 1-IndexedString::fromIndex(*c).length();
+      }
+
+      ++c;
+      ++m_pos;
+
+      return *this;
+    }
+
+    ///@warning Doesn't handle newlines correctly!
+    Stream& operator--();
+
+    ///Removes the last added item from the output, and returns it
+    uint popLastOutput();
+    
+    ///Allows peeking at the items that were added to the output recently
+    uint peekLastOutput(uint backOffset = 0) const;
+
+    ///Returns the cursor that points to the current input position.
+    Anchor inputPosition() const;
+    ///If the input position is collapsed, the input position will be locked from now on. It will stay the same until a new one is set.
+    void setInputPosition(const Anchor& position);
+
+    ///Input-position that marks the start of the topmost currently expanding macro in the original document
+    SimpleCursor originalInputPosition() const;
+    void setOriginalInputPosition(const SimpleCursor& position);
+
+    ///Used for output streams to mark stream positions with input position
+    ///The macroExpansion member may have no effect if macroExpansion is set for this stream.
+    void mark(const Anchor& position);
+
+    ///Returns the anchor for the current output position.
+    Anchor currentOutputAnchor() const;
+    
+    Stream & operator<< ( const char& c ) {
+      return operator<<(indexFromCharacter(c));
+    }
+    Stream & operator<< ( const unsigned int& c );
+    Stream & operator<< ( const Stream& input );
+    Stream& appendString( const Anchor& inputPosition, const PreprocessedContents & string );
+    Stream& appendString( const Anchor& inputPosition, IndexedString index );
+
+  private:
+    Q_DISABLE_COPY(Stream)
+
+    PreprocessedContents* m_string;
+    const unsigned int* c;
+    const unsigned int* end;
+    bool m_isNull, m_skippedToEnd, m_inputPositionLocked, m_onwsString;
+    SimpleCursor m_macroExpansion;
+    int m_pos;
+    int m_inputLine;
+    int m_inputLineStartedAt;
+    LocationTable* m_locationTable;
+    SimpleCursor m_originalInputPosition;
+};
+
+}
+
+#endif

data/ext/generator/parser/rpp/preprocessor.cpp

@@ -1,65 +1,65 @@
-/*
-  Copyright 2005 Harald Fernengel <harry@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 "preprocessor.h"
-
-#include <QFile>
-#include <QTextStream>
-
-#include "pp-stream.h"
-#include "pp-engine.h"
-#include "pp-environment.h"
-
-using namespace rpp;
-
-Preprocessor::~Preprocessor()
-{
-}
-
-// QString Preprocessor::processString(const QString& string)
-// {
-//     pp proc(this);
-// 
-//     QString ret = QString::fromUtf8(proc.processFile("anonymous", string.toUtf8()));
-// 
-//     proc.environment()->cleanup();
-// 
-//     return ret;
-// }
-
-Stream * Preprocessor::sourceNeeded( QString & fileName, IncludeType type, int sourceLine, bool skipCurrentPath )
-{
-  Q_UNUSED(fileName)
-  Q_UNUSED(type)
-  Q_UNUSED(sourceLine)
-  Q_UNUSED(skipCurrentPath)
-
-  return 0;
-}
-
-void Preprocessor::headerSectionEnded(rpp::Stream& stream)
-{
-  Q_UNUSED(stream)
-}
-
-void Preprocessor::foundHeaderGuard(rpp::Stream& /*stream*/, IndexedString /*guardName*/)
-{
-}
+/*
+  Copyright 2005 Harald Fernengel <harry@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 "preprocessor.h"
+
+#include <QFile>
+#include <QTextStream>
+
+#include "pp-stream.h"
+#include "pp-engine.h"
+#include "pp-environment.h"
+
+using namespace rpp;
+
+Preprocessor::~Preprocessor()
+{
+}
+
+// QString Preprocessor::processString(const QString& string)
+// {
+//     pp proc(this);
+// 
+//     QString ret = QString::fromUtf8(proc.processFile("anonymous", string.toUtf8()));
+// 
+//     proc.environment()->cleanup();
+// 
+//     return ret;
+// }
+
+Stream * Preprocessor::sourceNeeded( QString & fileName, IncludeType type, int sourceLine, bool skipCurrentPath )
+{
+  Q_UNUSED(fileName)
+  Q_UNUSED(type)
+  Q_UNUSED(sourceLine)
+  Q_UNUSED(skipCurrentPath)
+
+  return 0;
+}
+
+void Preprocessor::headerSectionEnded(rpp::Stream& stream)
+{
+  Q_UNUSED(stream)
+}
+
+void Preprocessor::foundHeaderGuard(rpp::Stream& /*stream*/, IndexedString /*guardName*/)
+{
+}