refactor

Author: Try

zenload/parserImplASCII.cpp

@@ -21,20 +21,18 @@ bool ParserImplASCII::readChunkStart(ZenParser::ChunkHeader& header)
     m_pParser->skipSpaces();
 
     // Early exit if this is a chunk-end or not a chunk header
-    if(m_pParser->m_Data[m_pParser->m_Seek] != '[' || m_pParser->m_Data[m_pParser->m_Seek + 1] == ']')
-    {
+    if(m_pParser->m_Data[m_pParser->m_Seek] != '[' || m_pParser->m_Data[m_pParser->m_Seek + 1] == ']') {
       m_pParser->setSeek(seek);
       return false;
-    }
+      }
 
     size_t tmpSeek = m_pParser->m_Seek;
-    while (m_pParser->m_Data[tmpSeek] != ']')
-    {
-        if (m_pParser->m_Data[tmpSeek] == '\r' || m_pParser->m_Data[tmpSeek] == '\n')
-            throw std::runtime_error("Invalid vob descriptor");
+    while(m_pParser->m_Data[tmpSeek] != ']') {
+      if(m_pParser->m_Data[tmpSeek] == '\r' || m_pParser->m_Data[tmpSeek] == '\n')
+        throw std::runtime_error("Invalid vob descriptor");
 
-        ++tmpSeek;
-    }
+      ++tmpSeek;
+      }
 
     // Parse chunk-header
     char        vobDescStk[256] = {};

zenload/zenParser.cpp

@@ -16,14 +16,6 @@
 
 using namespace ZenLoad;
 
-static void THROW(const char* msg) {
-#ifdef __ANDROID__
-  LogError() << msg;
-#else
-  throw std::runtime_error(msg);
-#endif
-  }
-
 /**
  * @brief reads a zen from a vdf
  */
@@ -44,14 +36,6 @@ ZenParser::ZenParser(const uint8_t* data, size_t size) {
 ZenParser::~ZenParser() {
   }
 
-/**
-* @brief returns whether the given string is a number
-*/
-bool ZenParser::isNumber(const std::string& expr)
-{
-    return !expr.empty() && std::find_if(expr.begin(), expr.end(), [](unsigned char c) { return !std::isdigit(c); }) == expr.end();
-}
-
 /**
 * @brief Reads the main ZEN-Header
 */
@@ -77,10 +61,10 @@ void ZenParser::skipHeader()
 */
 void ZenParser::readHeader(ZenHeader& header, ParserImpl*& impl) {
   if(!skipString("ZenGin Archive"))
-    THROW("Not a valid format");
+    throw std::runtime_error("Not a valid format");
 
   if(!skipString("ver"))
-    THROW("Not a valid header");
+    throw std::runtime_error("Not a valid header");
 
   // Version should be always 1...
   header.version = readIntASCII();
@@ -93,7 +77,7 @@ void ZenParser::readHeader(ZenHeader& header, ParserImpl*& impl) {
 
   // Read string of the format "savegame b", where b is 0 or 1
   if(!skipString("saveGame"))
-    THROW("Unsupported file format");
+    throw std::runtime_error("Unsupported file format");
   header.saveGame = readBoolASCII();
 
   // Read possible date
@@ -108,7 +92,7 @@ void ZenParser::readHeader(ZenHeader& header, ParserImpl*& impl) {
 
   // Reached the end of the main header
   if(!skipString("END"))
-    THROW("No END in header(1)");
+    throw std::runtime_error("No END in header(1)");
 
   // Continue with the implementationspecific header
   skipSpaces();
@@ -126,7 +110,7 @@ void ZenParser::readHeader(ZenHeader& header, ParserImpl*& impl) {
     impl = new ParserImplBinSafe(this);
     }
   else {
-    THROW("Unsupported file format");
+    throw std::runtime_error("Unsupported file format");
     }
 
   impl->readImplHeader();
@@ -222,7 +206,7 @@ bool ZenParser::readBoolASCII()
     skipSpaces();
     bool retVal = false;
     if (m_Data[m_Seek] != '0' && m_Data[m_Seek] != '1')
-        THROW("Value is not a bool"); else
+        throw std::runtime_error("Value is not a bool"); else
         retVal = m_Data[m_Seek] == '0' ? false : true;
 
     ++m_Seek;
@@ -428,7 +412,7 @@ void ZenParser::readWorld(oCWorldData& info, FileVersion version) {
   readChunkStart(worldHeader);
 
   if(worldHeader.classId!=ZenParser::zCWorld)
-    THROW("Expected oCWorld:zCWorld-Chunk not found!");
+    throw std::runtime_error("Expected oCWorld:zCWorld-Chunk not found!");
 
   while(!readChunkEnd()) {
     ZenParser::ChunkHeader header;

zenload/zenParser.h

@@ -233,11 +233,6 @@ class ZenParser
   int32_t readIntASCII();
   bool readBoolASCII();
 
-  /**
-     * @brief returns whether the given string is a number
-     */
-  bool isNumber(const std::string& expr);
-
   /**
      * @brief returns the current implementatio
      */