[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    playground/devtools/kdevelop4-extra-plugins/erlang/parser
From:       Jonathan Schmidt-Dominé <devel () the-user ! org>
Date:       2011-10-06 18:50:00
Message-ID: 20111006185000.4A644AC886 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1257640 by schmidt-domine:

fixed for kdev-pg-qt changes (but does not build because of kate changes)


 M  +1 -1      editorintegrator.cpp  
 M  +2 -2      erlang.g  
 M  +1 -1      main.cpp  
 M  +4 -4      parsesession.cpp  


--- trunk/playground/devtools/kdevelop4-extra-plugins/erlang/parser/editorintegrator.cpp #1257639:1257640
@@ -43,7 +43,7 @@
 
 KDevelop::SimpleCursor EditorIntegrator::findPosition(qint64 token, Edge edge) const
 {
-    const KDevPG::TokenStream::Token& t = m_session->tokenStream()->token(token);
+    const KDevPG::TokenStream::Token& t = m_session->tokenStream()->at(token);
     return findPosition(t, edge);
 }
 
--- trunk/playground/devtools/kdevelop4-extra-plugins/erlang/parser/erlang.g #1257639:1257640
@@ -586,7 +586,7 @@
         {
             kind = Parser::Token_EOF;
         }
-        Parser::Token &t = tokenStream->next();
+        Parser::Token &t = tokenStream->push();
         t.begin = lexer.tokenBegin();
         t.end = lexer.tokenEnd();
         t.kind = kind;
@@ -648,7 +648,7 @@
     qint64 line;
     qint64 col;
     qint64 index = tokenStream->index()-1;
-    Token &token = tokenStream->token(index);
+    Token &token = tokenStream->at(index);
     kDebug() << "token starts at:" << token.begin;
     kDebug() << "index is:" << index;
     tokenStream->startPosition(index, &line, &col);
--- trunk/playground/devtools/kdevelop4-extra-plugins/erlang/parser/main.cpp #1257639:1257640
@@ -82,7 +82,7 @@
             Lexer lexer(&tokenStream, m_session.contents());
             int token;
             while ((token = lexer.nextTokenKind())) {
-                Parser::Token &t = tokenStream.next();
+                Parser::Token &t = tokenStream.push();
                 //t.begin = lexer.tokenBegin();
                 //t.end = lexer.tokenEnd();
                 t.kind = token;
--- trunk/playground/devtools/kdevelop4-extra-plugins/erlang/parser/parsesession.cpp #1257639:1257640
@@ -120,20 +120,20 @@
 
 QString ParseSession::symbol(qint64 token) const
 {
-    const TokenStream::Token& tok = m_tokenStream->token(token);
+    const TokenStream::Token& tok = m_tokenStream->at(token);
     return m_contents.mid(tok.begin, tok.end - tok.begin + 1);
 }
 
 QString ParseSession::symbol(AstNode* node) const
 {
-    const TokenStream::Token& startTok = m_tokenStream->token(node->startToken);
-    const TokenStream::Token& endTok = m_tokenStream->token(node->endToken);
+    const TokenStream::Token& startTok = m_tokenStream->at(node->startToken);
+    const TokenStream::Token& endTok = m_tokenStream->at(node->endToken);
     return m_contents.mid(startTok.begin, endTok.end - startTok.begin + 1);
 }
 
 QString ParseSession::docComment(qint64 token) const
 {
-    const TokenStream::Token& tok = m_tokenStream->token(token);
+    const TokenStream::Token& tok = m_tokenStream->at(token);
     if (!tok.docCommentEnd) return QString();
     return m_contents.mid(tok.docCommentBegin, tok.docCommentEnd - tok.docCommentBegin + 1);
 }

[prev in list] [next in list] [prev in thread] [next in thread]