Kaydet (Commit) 4b4a7c0d authored tarafından Stephan Bergmann's avatar Stephan Bergmann

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
5d98ed5c "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 c25ec060 "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
5d98ed5c, for now.

Change-Id: I1fe1178d2c5b0c0372da32b8dd0f2dfbdb22a1ae
üst 607197f6
...@@ -217,15 +217,8 @@ SbiExprNode* SbiExpression::Term( const KeywordSymbolInfo* pKeywordSymbolInfo ) ...@@ -217,15 +217,8 @@ SbiExprNode* SbiExpression::Term( const KeywordSymbolInfo* pKeywordSymbolInfo )
// no keywords allowed from here on! // no keywords allowed from here on!
if( SbiTokenizer::IsKwd( eTok ) ) if( SbiTokenizer::IsKwd( eTok ) )
{ {
if( pParser->IsCompatible() && eTok == INPUT ) pParser->Error( ERRCODE_BASIC_SYNTAX );
{ bError = true;
eTok = SYMBOL;
}
else
{
pParser->Error( ERRCODE_BASIC_SYNTAX );
bError = true;
}
} }
if( DoParametersFollow( pParser, eCurExpr, eTok = eNextTok ) ) if( DoParametersFollow( pParser, eCurExpr, eTok = eNextTok ) )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment