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

List:       kde-commits
Subject:    extragear/sdk/kdevelop/languages/cpp/parser
From:       Olivier Jean de Gaalon <olivier.jg () gmail ! com>
Date:       2009-12-22 6:21:45
Message-ID: 1261462905.107900.32392.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1064891 by olivierjg:

Fix DuChain tests broken by rev. 1062837


 M  +3 -3      parser.cpp  
 M  +1 -1      parser.h  


--- trunk/extragear/sdk/kdevelop/languages/cpp/parser/parser.cpp #1064890:1064891
@@ -1335,7 +1335,7 @@
     {
       rewind(start);
       
-      if (!parseConditionalExpression(expr))
+      if (!parseConditionalExpression(expr, true))
         return false;
     }
   }
@@ -4548,11 +4548,11 @@
   return true;
 }
 
-bool Parser::parseConditionalExpression(ExpressionAST *&node)
+bool Parser::parseConditionalExpression(ExpressionAST *&node, bool templArgs)
 {
   std::size_t start = session->token_stream->cursor();
 
-  if (!parseLogicalOrExpression(node))
+  if (!parseLogicalOrExpression(node, templArgs))
     return false;
 
   if (session->token_stream->lookAhead() == '?')
--- trunk/extragear/sdk/kdevelop/languages/cpp/parser/parser.h #1064890:1064891
@@ -114,7 +114,7 @@
   bool parseCommaExpression(ExpressionAST *&node);
   bool parseCompoundStatement(StatementAST *&node);
   bool parseCondition(ConditionAST *&node, bool initRequired = true);
-  bool parseConditionalExpression(ExpressionAST *&node);
+  bool parseConditionalExpression(ExpressionAST *&node, bool templArgs = false);
   bool parseConstantExpression(ExpressionAST *&node);
   bool parseCtorInitializer(CtorInitializerAST *&node);
   bool parseCvQualify(const ListNode<std::size_t> *&node);
[prev in list] [next in list] [prev in thread] [next in thread]