commit d50be3231d4d2e4d7ca96b892b04f2d71af8a398
author Shih-wei Liao <sliao@google.com> Fri Jul 01 22:53:31 2011 -0700
committer Shih-wei Liao <sliao@google.com> Fri Jul 01 22:55:53 2011 -0700
tree 1d7841ec959136404b65a5c9242c6947ff807f31
parent 54bdd6f0a0a3bd14b1e3d524b7a64cb841923707

Code cleanup: Improve code readability and remove dead code.

Change-Id: Ic7fc159eb19a9eef210afc1fca45b8a646321f2c

lib/ExecutionEngine/Script.cpp

diff --git a/lib/ExecutionEngine/Script.cpp b/lib/ExecutionEngine/Script.cpp
index afcc0ea..a2039e5 100644
--- a/lib/ExecutionEngine/Script.cpp
+++ b/lib/ExecutionEngine/Script.cpp
@@ -470,80 +470,115 @@
 
 void *Script::lookup(const char *name) {
   switch (mStatus) {
-  case ScriptStatus::Compiled:  return mCompiled->lookup(name);
+    case ScriptStatus::Compiled: {
+      return mCompiled->lookup(name);
+    }
 
 #if USE_CACHE
-  case ScriptStatus::Cached:    return mCached->lookup(name);
+    case ScriptStatus::Cached: {
+      return mCached->lookup(name);
+    }
 #endif
 
-  default:
-    mErrorCode = BCC_INVALID_OPERATION;
-    return NULL;
+    default: {
+      mErrorCode = BCC_INVALID_OPERATION;
+      return NULL;
+    }
   }
 }
 
 
 size_t Script::getExportVarCount() const {
   switch (mStatus) {
-  case ScriptStatus::Compiled:  return mCompiled->getExportVarCount();
+    case ScriptStatus::Compiled: {
+      return mCompiled->getExportVarCount();
+    }
 
 #if USE_CACHE
-  case ScriptStatus::Cached:    return mCached->getExportVarCount();
+    case ScriptStatus::Cached: {
+      return mCached->getExportVarCount();
+    }
 #endif
 
-  default:                      return 0;
+    default: {
+      return 0;
+    }
   }
 }
 
 
 size_t Script::getExportFuncCount() const {
   switch (mStatus) {
-  case ScriptStatus::Compiled:  return mCompiled->getExportFuncCount();
+    case ScriptStatus::Compiled: {
+      return mCompiled->getExportFuncCount();
+    }
 
 #if USE_CACHE
-  case ScriptStatus::Cached:    return mCached->getExportFuncCount();
+    case ScriptStatus::Cached: {
+      return mCached->getExportFuncCount();
+    }
 #endif
 
-  default:                      return 0;
+    default: {
+      return 0;
+    }
   }
 }
 
 
 size_t Script::getPragmaCount() const {
   switch (mStatus) {
-  case ScriptStatus::Compiled:  return mCompiled->getPragmaCount();
+    case ScriptStatus::Compiled: {
+      return mCompiled->getPragmaCount();
+    }
 
 #if USE_CACHE
-  case ScriptStatus::Cached:    return mCached->getPragmaCount();
+    case ScriptStatus::Cached: {
+      return mCached->getPragmaCount();
+    }
 #endif
 
-  default:                      return 0;
+    default: {
+      return 0;
+    }
   }
 }
 
 
 size_t Script::getFuncCount() const {
   switch (mStatus) {
-  case ScriptStatus::Compiled:  return mCompiled->getFuncCount();
+    case ScriptStatus::Compiled: {
+      return mCompiled->getFuncCount();
+    }
 
 #if USE_CACHE
-  case ScriptStatus::Cached:    return mCached->getFuncCount();
+    case ScriptStatus::Cached: {
+      return mCached->getFuncCount();
+    }
 #endif
 
-  default:                      return 0;
+    default: {
+      return 0;
+    }
   }
 }
 
 
 size_t Script::getObjectSlotCount() const {
   switch (mStatus) {
-  case ScriptStatus::Compiled:  return mCompiled->getObjectSlotCount();
+    case ScriptStatus::Compiled: {
+      return mCompiled->getObjectSlotCount();
+    }
 
 #if USE_CACHE
-  case ScriptStatus::Cached:    return mCached->getObjectSlotCount();
+    case ScriptStatus::Cached: {
+      return mCached->getObjectSlotCount();
+    }
 #endif
 
-  default:                      return 0;
+    default: {
+      return 0;
+    }
   }
 }
 
@@ -551,19 +586,20 @@
 void Script::getExportVarList(size_t varListSize, void **varList) {
   switch (mStatus) {
 #define DELEGATE(STATUS) \
-  case ScriptStatus::STATUS: \
-    m##STATUS->getExportVarList(varListSize, varList); \
-    break;
+    case ScriptStatus::STATUS:                           \
+      m##STATUS->getExportVarList(varListSize, varList); \
+      break;
 
 #if USE_CACHE
-  DELEGATE(Cached);
+    DELEGATE(Cached);
 #endif
 
-  DELEGATE(Compiled);
+    DELEGATE(Compiled);
 #undef DELEGATE
 
-  default:
-    mErrorCode = BCC_INVALID_OPERATION;
+    default: {
+      mErrorCode = BCC_INVALID_OPERATION;
+    }
   }
 }
 
@@ -571,19 +607,20 @@
 void Script::getExportFuncList(size_t funcListSize, void **funcList) {
   switch (mStatus) {
 #define DELEGATE(STATUS) \
-  case ScriptStatus::STATUS: \
-    m##STATUS->getExportFuncList(funcListSize, funcList); \
-    break;
+    case ScriptStatus::STATUS:                              \
+      m##STATUS->getExportFuncList(funcListSize, funcList); \
+      break;
 
 #if USE_CACHE
-  DELEGATE(Cached);
+    DELEGATE(Cached);
 #endif
 
-  DELEGATE(Compiled);
+    DELEGATE(Compiled);
 #undef DELEGATE
 
-  default:
-    mErrorCode = BCC_INVALID_OPERATION;
+    default: {
+      mErrorCode = BCC_INVALID_OPERATION;
+    }
   }
 }
 
@@ -593,19 +630,20 @@
                            char const **valueList) {
   switch (mStatus) {
 #define DELEGATE(STATUS) \
-  case ScriptStatus::STATUS: \
-    m##STATUS->getPragmaList(pragmaListSize, keyList, valueList); \
-    break;
+    case ScriptStatus::STATUS:                                      \
+      m##STATUS->getPragmaList(pragmaListSize, keyList, valueList); \
+      break;
 
 #if USE_CACHE
-  DELEGATE(Cached);
+    DELEGATE(Cached);
 #endif
 
-  DELEGATE(Compiled);
+    DELEGATE(Compiled);
 #undef DELEGATE
 
-  default:
-    mErrorCode = BCC_INVALID_OPERATION;
+    default: {
+      mErrorCode = BCC_INVALID_OPERATION;
+    }
   }
 }
 
@@ -614,19 +652,20 @@
                              FuncInfo *funcInfoList) {
   switch (mStatus) {
 #define DELEGATE(STATUS) \
-  case ScriptStatus::STATUS: \
-    m##STATUS->getFuncInfoList(funcInfoListSize, funcInfoList); \
-    break;
+    case ScriptStatus::STATUS:                                    \
+      m##STATUS->getFuncInfoList(funcInfoListSize, funcInfoList); \
+      break;
 
 #if USE_CACHE
-  DELEGATE(Cached);
+    DELEGATE(Cached);
 #endif
 
-  DELEGATE(Compiled);
+    DELEGATE(Compiled);
 #undef DELEGATE
 
-  default:
-    mErrorCode = BCC_INVALID_OPERATION;
+    default: {
+      mErrorCode = BCC_INVALID_OPERATION;
+    }
   }
 }
 
@@ -634,20 +673,21 @@
 void Script::getObjectSlotList(size_t objectSlotListSize,
                                uint32_t *objectSlotList) {
   switch (mStatus) {
-#define DELEGATE(STATUS) \
-  case ScriptStatus::STATUS: \
-    m##STATUS->getObjectSlotList(objectSlotListSize, objectSlotList); \
-    break;
+#define DELEGATE(STATUS)     \
+    case ScriptStatus::STATUS:                                          \
+      m##STATUS->getObjectSlotList(objectSlotListSize, objectSlotList); \
+      break;
 
 #if USE_CACHE
-  DELEGATE(Cached);
+    DELEGATE(Cached);
 #endif
 
-  DELEGATE(Compiled);
+    DELEGATE(Compiled);
 #undef DELEGATE
 
-  default:
-    mErrorCode = BCC_INVALID_OPERATION;
+    default: {
+      mErrorCode = BCC_INVALID_OPERATION;
+    }
   }
 }
 
@@ -656,14 +696,19 @@
   switch (mStatus) {
 
 #if USE_CACHE
-  case ScriptStatus::Cached:    return mCached->getContext();
+    case ScriptStatus::Cached: {
+      return mCached->getContext();
+    }
 #endif
 
-  case ScriptStatus::Compiled:  return mCompiled->getContext();
+    case ScriptStatus::Compiled: {
+      return mCompiled->getContext();
+    }
 
-  default:
-    mErrorCode = BCC_INVALID_OPERATION;
-    return NULL;
+    default: {
+      mErrorCode = BCC_INVALID_OPERATION;
+      return NULL;
+    }
   }
 }
 
@@ -683,20 +728,25 @@
 #if USE_MCJIT
 size_t Script::getELFSize() const {
   switch (mStatus) {
-  case ScriptStatus::Compiled:  return mCompiled->getELFSize();
+    case ScriptStatus::Compiled: {
+      return mCompiled->getELFSize();
+    }
 
-  default:
-    return 0;
+    default: {
+      return 0;
+    }
   }
-  return 0;
 }
 
 const char *Script::getELF() const {
   switch (mStatus) {
-  case ScriptStatus::Compiled:  return mCompiled->getELF();
+    case ScriptStatus::Compiled: {
+      return mCompiled->getELF();
+    }
 
-  default:
-    return NULL;
+    default: {
+      return NULL;
+    }
   }
 }
 #endif