Changeset 560

Show
Ignore:
Timestamp:
06/21/08 13:16:15 (5 months ago)
Author:
moenicke
Message:

* parser name is lowercased in kdevelop-pg
* ParserState? is named parser_state

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/rphp/compiler/parser/php.g

    r559 r560  
    5656      Info 
    5757  }; 
    58   void reportProblem( Parser::ProblemType type, const std::string& message ); 
     58  void reportProblem( parser::ProblemType type, const std::string& message ); 
    5959  std::string tokenText(qint64 begin, qint64 end); 
    6060  void setDebug(bool debug); 
    …… 
    7272    bool m_debug; 
    7373 
    74     struct ParserState { 
     74    struct parser_state { 
    7575        VarExpressionState varExpressionState; 
    7676        bool varExpressionIsVariable; 
    7777    }; 
    78     ParserState m_state; 
     78    parser_state m_state; 
    7979:] 
    8080 
    …… 
    711711{ 
    712712 
    713 void Parser::tokenize( const std::string& contents ) 
     713void parser::tokenize( const std::string& contents ) 
    714714{ 
    715715    m_contents = contents; 
    716716    Lexer lexer( this, contents ); 
    717     int kind = Parser::Token_EOF; 
     717    int kind = parser::Token_EOF; 
    718718 
    719719    do 
    720720    { 
    721721        kind = lexer.nextTokenKind(); 
    722         while (kind == Parser::Token_WHITESPACE || kind == Parser::Token_COMMENT || kind == Parser::Token_DOC_COMMENT) { 
     722        while (kind == parser::Token_WHITESPACE || kind == parser::Token_COMMENT || kind == parser::Token_DOC_COMMENT) { 
    723723            kind = lexer.nextTokenKind(); 
    724724        } 
    725725        if ( !kind ) // when the lexer returns 0, the end of file is reached 
    726726        { 
    727             kind = Parser::Token_EOF; 
     727            kind = parser::Token_EOF; 
    728728        } 
    729         Parser::Token &t = tokenStream->next(); 
     729        parser::Token &t = tokenStream->next(); 
    730730        t.begin = lexer.tokenBegin(); 
    731731        t.end = lexer.tokenEnd(); 
    …… 
    733733        //if ( m_debug ) qDebug() << kind << tokenText(t.begin,t.end) << t.begin << t.end; 
    734734    } 
    735     while ( kind != Parser::Token_EOF ); 
     735    while ( kind != parser::Token_EOF ); 
    736736 
    737737    yylex(); // produce the look ahead token 
    …… 
    739739 
    740740 
    741 std::string Parser::tokenText(qint64 begin, qint64 end) 
     741std::string parser::tokenText(qint64 begin, qint64 end) 
    742742{ 
    743743    return m_contents.mid(begin,end-begin+1); 
    …… 
    745745 
    746746 
    747 void Parser::reportProblem( Parser::ProblemType type, const std::string& message ) 
     747void parser::reportProblem( parser::ProblemType type, const std::string& message ) 
    748748{ 
    749749    if (type == Error) 
    …… 
    757757 
    758758// custom error recovery 
    759 void Parser::expectedToken(int /*expected*/, qint64 /*where*/, const std::string& name) 
     759void parser::expectedToken(int /*expected*/, qint64 /*where*/, const std::string& name) 
    760760{ 
    761761// TODO port me 
    762 //    reportProblem( Parser::Error, QString("Expected token \"%1\"").arg(name)); 
     762//    reportProblem( parser::Error, QString("Expected token \"%1\"").arg(name)); 
    763763} 
    764764 
    765 void Parser::expectedSymbol(int /*expectedSymbol*/, const std::string& name) 
     765void parser::expectedSymbol(int /*expectedSymbol*/, const std::string& name) 
    766766{ 
    767767    qint64 line; 
    …… 
    774774    tokenStream->startPosition(index, &line, &col); 
    775775    std::string tokenValue = tokenText(token.begin, token.end); 
    776     reportProblem( Parser::Error, 
     776    reportProblem( parser::Error, 
    777777// TODO port me 
    778778//                   QString("Expected symbol \"%1\" (current token: \"%2\" [%3] at line: %4 col: %5)") 
    …… 
    784784} 
    785785 
    786 void Parser::setDebug( bool debug ) 
     786void parser::setDebug( bool debug ) 
    787787{ 
    788788    m_debug = debug; 
    789789} 
    790790 
    791 Parser::ParserState *Parser::copyCurrentState() 
    792 { 
    793     ParserState *state = new ParserState(); 
     791parser::parser_state *parser::copyCurrentState() 
     792{ 
     793    parser_state *state = new parser_state(); 
    794794    state->varExpressionState = m_state.varExpressionState; 
    795795    state->varExpressionIsVariable = m_state.varExpressionIsVariable; 
    …… 
    797797} 
    798798 
    799 void Parser::restoreState( Parser::ParserState* state) 
     799void parser::restoreState( parser::parser_state* state) 
    800800{ 
    801801    m_state.varExpressionState = state->varExpressionState; 

  • trunk/rphp/compiler/parser/rphp_parser.cpp

    r559 r560  
    66 
    77#include "phplexer.h" 
     8#include <string> 
    89 
    910namespace rphp 
    1011  { 
    1112 
    12   void Parser::tokenize( const std::string& contents ) 
     13  void parser::tokenize( const std::string& contents ) 
    1314  { 
    1415    m_contents =  contents; 
    1516    Lexer lexer( this,  contents ); 
    16     int kind =  Parser::Token_EOF; 
     17    int kind =  parser::Token_EOF; 
    1718 
    1819    do 
    …… 
    2021        kind =  lexer.nextTokenKind(); 
    2122 
    22         while  (kind ==  Parser::Token_WHITESPACE ||  kind ==  Parser::Token_COMMENT ||  kind ==  Parser::Token_DOC_COMMENT) 
     23        while  (kind ==  parser::Token_WHITESPACE ||  kind ==  parser::Token_COMMENT ||  kind ==  parser::Token_DOC_COMMENT) 
    2324          { 
    2425            kind =  lexer.nextTokenKind(); 
    …… 
    2728        if  ( !kind ) // when the lexer returns 0, the end of file is reached 
    2829          { 
    29             kind =  Parser::Token_EOF; 
    30           } 
    31         Parser::Token &t =  tokenStream->next(); 
     30            kind =  parser::Token_EOF; 
     31          } 
     32        parser::Token &t =  tokenStream->next(); 
    3233        t.begin =  lexer.tokenBegin(); 
    3334        t.end =  lexer.tokenEnd(); 
    …… 
    3637      } 
    3738 
    38     while  ( kind !=  Parser::Token_EOF ); 
     39    while  ( kind !=  parser::Token_EOF ); 
    3940 
    4041    yylex(); // produce the look ahead token 
    …… 
    4243 
    4344 
    44   std::string Parser::tokenText(qint64 begin,  qint64 end) 
     45  std::string parser::tokenText(qint64 begin,  qint64 end) 
    4546  { 
    4647    return  m_contents.mid(begin, end - begin + 1); 
    …… 
    4849 
    4950 
    50   void Parser::reportProblem( Parser::ProblemType type,  const std::string& message ) 
     51  void parser::reportProblem( parser::ProblemType type,  const std::string& message ) 
    5152  { 
    5253    if  (type ==  Error) 
    …… 
    6061 
    6162  // custom error recovery 
    62   void Parser::expectedToken(int /*expected*/,  qint64 /*where*/,  const std::string& name) 
     63  void parser::expectedToken(int /*expected*/,  qint64 /*where*/,  const std::string& name) 
    6364  { 
    6465    // TODO port me 
    65     //    reportProblem( Parser::Error, QString("Expected token \"%1\"").arg(name)); 
     66    //    reportProblem( parser::Error, QString("Expected token \"%1\"").arg(name)); 
    6667  } 
    6768 
    68   void Parser::expectedSymbol(int /*expectedSymbol*/,  const std::string& name) 
     69  void parser::expectedSymbol(int /*expectedSymbol*/,  const std::string& name) 
    6970  { 
    7071    qint64 line; 
    …… 
    7778    tokenStream->startPosition(index,  &line,  &col); 
    7879    std::string tokenValue =  tokenText(token.begin,  token.end); 
    79     reportProblem( Parser::Error, 
     80    reportProblem( parser::Error, 
    8081                   // TODO port me 
    8182                   //                   QString("Expected symbol \"%1\" (current token: \"%2\" [%3] at line: %4 col: %5)") 
    …… 
    8788  } 
    8889 
    89   void Parser::setDebug( bool debug ) 
     90  void parser::setDebug( bool debug ) 
    9091  { 
    9192    m_debug =  debug; 
    9293  } 
    9394 
    94   Parser::ParserState *Parser::copyCurrentState() 
     95  parser::parser_state *parser::copyCurrentState() 
    9596  { 
    96     ParserState *state =  new ParserState(); 
     97    parser_state *state =  new parser_state(); 
    9798    state->varExpressionState =  m_state.varExpressionState; 
    9899    state->varExpressionIsVariable =  m_state.varExpressionIsVariable; 
    …… 
    100101  } 
    101102 
    102   void Parser::restoreState( Parser::ParserState* state) 
     103  void parser::restoreState( parser::parser_state* state) 
    103104  { 
    104105    m_state.varExpressionState =  state->varExpressionState; 

  • trunk/rphp/compiler/parser/rphp_parser.h

    r559 r560  
    44#ifndef rphp_H_INCLUDED 
    55#define rphp_H_INCLUDED 
    6  
     6#include <string> 
    77#include "rphp_ast.h" 
    88#include <kdev-pg-memory-pool.h> 
    …… 
    240240        Info 
    241241      }; 
    242       void reportProblem( Parser::ProblemType type,  const std::string& message ); 
     242      void reportProblem( parser::ProblemType type,  const std::string& message ); 
    243243      std::string tokenText(qint64 begin,  qint64 end); 
    244244      void setDebug(bool debug); 
    …… 
    255255      bool m_debug; 
    256256 
    257       struct ParserState 
     257      struct parser_state 
    258258        { 
    259259          VarExpressionState varExpressionState; 
    …… 
    261261        }; 
    262262 
    263       ParserState m_state; 
     263      parser_state m_state; 
    264264 
    265265 

  • trunk/rphp/tools/kdevelop-pg/CMakeLists.txt

    r558 r560  
    11project(kdevelop-pg) 
    22 
    3 find_package(KDE4) 
     3#find_package(KDE4) 
    44 
    55if(NOT KDE4_FOUND)