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

[Takeshi Abe]

 starmath/source/parse.cxx |   47 +++++++++++++++++++++-------------------------
 1 file changed, 22 insertions(+), 25 deletions(-)

New commits:
commit 2fb88cb41e9d606280271c8dd78d2a776aa06ce2
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date:   Fri Jun 17 11:47:46 2016 +0900

    This can be an assert()
    
    Change-Id: I2b0a8f50359e5b12fa27bf48c355f736e2b05033
    Reviewed-on: https://gerrit.libreoffice.org/26491
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Takeshi Abe <tabe at fixedpoint.jp>

diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx
index 5092532..7d02bad 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)