commit 41bf0733c6dd7d39edf8ca1d8ebc572722239fba
author Lei Zhang <antiagainst@google.com> Mon Sep 14 12:26:15 2015 -0400
committer David Neto <dneto@google.com> Mon Oct 26 12:55:33 2015 -0400
tree 43099a7d27be37017f3e27d0f4a064f5466c4781
parent 2136ff70cc524f164133d0ab57391a743bc761e9

Simplify code for handling literals in disassembler.

source/binary.cpp

diff --git a/source/binary.cpp b/source/binary.cpp
index e89ff9f..707cc87 100644
--- a/source/binary.cpp
+++ b/source/binary.cpp
@@ -234,16 +234,6 @@
       index++;
       position->index++;
     } break;
-    case SPV_OPERAND_TYPE_LITERAL:
-    case SPV_OPERAND_TYPE_OPTIONAL_LITERAL:
-    case SPV_OPERAND_TYPE_LITERAL_IN_OPTIONAL_TUPLE: {
-      // TODO: Need to support multiple word literals
-      stream.get() << (color ? clr::red() : "");
-      stream.get() << spvFixWord(words[index], endian);
-      stream.get() << (color ? clr::reset() : "");
-      index++;
-      position->index++;
-    } break;
     case SPV_OPERAND_TYPE_LITERAL_NUMBER: {
       // NOTE: Special case for extended instruction use
       if (OpExtInst == opcode) {
@@ -257,11 +247,18 @@
         stream.get() << (color ? clr::red() : "");
         stream.get() << extInst->name;
         stream.get() << (color ? clr::reset() : "");
-      } else {
-        stream.get() << (color ? clr::red() : "");
-        stream.get() << spvFixWord(words[index], endian);
-        stream.get() << (color ? clr::reset() : "");
+        index++;
+        position->index++;
+        break;
       }
+    }  // Fall through for the general case.
+    case SPV_OPERAND_TYPE_LITERAL:
+    case SPV_OPERAND_TYPE_OPTIONAL_LITERAL:
+    case SPV_OPERAND_TYPE_LITERAL_IN_OPTIONAL_TUPLE: {
+      // TODO: Need to support multiple word literals
+      stream.get() << (color ? clr::red() : "");
+      stream.get() << spvFixWord(words[index], endian);
+      stream.get() << (color ? clr::reset() : "");
       index++;
       position->index++;
     } break;