[Libreoffice-commits] core.git: basic/source

[Stephan Bergmann]

 basic/source/comp/exprtree.cxx |   11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

New commits:
commit 4b4a7c0d87eb580272aba0777c9021789025bdc0
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Sep 8 10:48:43 2015 +0200

    Revert a fix that can never have worked in the first place?
    
    clang-analyzer-deadcode.DeadStores finds that conditionally assigning
    
      eTok = SYMBOL
    
    inside the "if( SbiTokenizer::IsKws( eTok ) )" block is useless, as the directly
    following
    
      if( DoParametersFollow( pParser, eCurExpr, eTok = eNextTok ) )
    
    will unconditionally assign into eTok again, without intermediate use of the old
    eTok value.
    
    Now, the conditional "eTok = SYMBOL" assignment was added as
    5d98ed5c6a4afc0a7943318c510e56aef8c45193 "INTEGRATION: CWS ab12fixes: #118234#
    SbiExpression::Term(): Allow Input as symbol for action option compatible,"
    while the unconditional "eTok = eNextTok" assignment had followed that block
    ever since c25ec0608a167bcf1d891043f02273761c351701 "initial import."
    
    The referenced "#118234#" was a Sun-internal bug and is no longer available, but
    it does very much look as if this alleged bugfix never worked in the first
    place.  So revert the code back to what it looked before
    5d98ed5c6a4afc0a7943318c510e56aef8c45193, for now.
    
    Change-Id: I1fe1178d2c5b0c0372da32b8dd0f2dfbdb22a1ae

diff --git a/basic/source/comp/exprtree.cxx b/basic/source/comp/exprtree.cxx
index 190822c..8b22257 100644
--- a/basic/source/comp/exprtree.cxx
+++ b/basic/source/comp/exprtree.cxx
@@ -217,15 +217,8 @@ SbiExprNode* SbiExpression::Term( const KeywordSymbolInfo* pKeywordSymbolInfo )
     // no keywords allowed from here on!
     if( SbiTokenizer::IsKwd( eTok ) )
     {
-        if( pParser->IsCompatible() && eTok == INPUT )
-        {
-            eTok = SYMBOL;
-        }
-        else
-        {
-            pParser->Error( ERRCODE_BASIC_SYNTAX );
-            bError = true;
-        }
+        pParser->Error( ERRCODE_BASIC_SYNTAX );
+        bError = true;
     }
 
     if( DoParametersFollow( pParser, eCurExpr, eTok = eNextTok ) )