diff options
| author | Takeshi Abe <tabe@fixedpoint.jp> | 2016-06-17 11:47:46 +0900 |
|---|---|---|
| committer | Takeshi Abe <tabe@fixedpoint.jp> | 2016-06-21 05:39:31 +0000 |
| commit | 2fb88cb41e9d606280271c8dd78d2a776aa06ce2 (patch) | |
| tree | 5d5acca7c1b501a98ca78cbba3f4f86182d570df /starmath | |
| parent | 5d336fb1d515b0967bc730e47ac3e4b850cf9872 (diff) | |
This can be an assert()
Change-Id: I2b0a8f50359e5b12fa27bf48c355f736e2b05033
Reviewed-on: https://gerrit.libreoffice.org/26491
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Takeshi Abe <tabe@fixedpoint.jp>
Diffstat (limited to 'starmath')
| -rw-r--r-- | starmath/source/parse.cxx | 47 |
1 files changed, 22 insertions, 25 deletions
diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx index 5092532edf82..7d02badf4e46 100644 --- a/starmath/source/parse.cxx +++ b/starmath/source/parse.cxx @@ -1987,39 +1987,36 @@ void SmParser::DoBrace() } else { - if (TokenInGroup(TG::LBrace)) - { - pLeft = new SmMathSymbolNode(m_aCurToken); + assert(TokenInGroup(TG::LBrace)); - NextToken(); - DoBracebody(false); - pBody = popOrZero(m_aNodeStack); + pLeft = new SmMathSymbolNode(m_aCurToken); - SmTokenType eExpectedType = TUNKNOWN; - switch (pLeft->GetToken().eType) - { case TLPARENT : eExpectedType = TRPARENT; break; - case TLBRACKET : eExpectedType = TRBRACKET; break; - case TLBRACE : eExpectedType = TRBRACE; break; - case TLDBRACKET : eExpectedType = TRDBRACKET; break; - case TLLINE : eExpectedType = TRLINE; break; - case TLDLINE : eExpectedType = TRDLINE; break; - case TLANGLE : eExpectedType = TRANGLE; break; - case TLFLOOR : eExpectedType = TRFLOOR; break; - case TLCEIL : eExpectedType = TRCEIL; break; - default : - SAL_WARN("starmath", "unknown case"); + NextToken(); + DoBracebody(false); + pBody = popOrZero(m_aNodeStack); + + SmTokenType eExpectedType = TUNKNOWN; + switch (pLeft->GetToken().eType) + { case TLPARENT : eExpectedType = TRPARENT; break; + case TLBRACKET : eExpectedType = TRBRACKET; break; + case TLBRACE : eExpectedType = TRBRACE; break; + case TLDBRACKET : eExpectedType = TRDBRACKET; break; + case TLLINE : eExpectedType = TRLINE; break; + case TLDLINE : eExpectedType = TRDLINE; break; + case TLANGLE : eExpectedType = TRANGLE; break; + case TLFLOOR : eExpectedType = TRFLOOR; break; + case TLCEIL : eExpectedType = TRCEIL; break; + default : + SAL_WARN("starmath", "unknown case"); } - if (m_aCurToken.eType == eExpectedType) - { + if (m_aCurToken.eType == eExpectedType) + { pRight = new SmMathSymbolNode(m_aCurToken); NextToken(); - } - else - eError = PE_PARENT_MISMATCH; } else - eError = PE_LBRACE_EXPECTED; + eError = PE_PARENT_MISMATCH; } if (eError == PE_NONE) |