Merge pull request #23.

Fixing some C++ conversion errors.
* Implicit conversion from int to bool.
* Implicit conversion from size_t to uint32_t.
* Implicit conversion from char* to uint8_t.

Adding no-op color operators so unhandled platforms can still link.

diff --git a/include/util/hex_float.h b/include/util/hex_float.h
index b0f7522..a3bdc31 100644 (file)
--- a/include/util/hex_float.h
+++ b/include/util/hex_float.h
@@ -226,9 +226,13 @@ inline uint8_t get_nibble_from_character(char character) {
   const char* dec = "0123456789";
   const char* lower = "abcdef";
   const char* upper = "ABCDEF";
-  if (auto p = strchr(dec, character)) return p - dec;
-  if (auto p = strchr(lower, character)) return p - lower + 0xa;
-  if (auto p = strchr(upper, character)) return p - upper + 0xa;
+  if (auto p = strchr(dec, character)) {
+    return static_cast<uint8_t>(p - dec);
+  } else if (auto p = strchr(lower, character)) {
+    return static_cast<uint8_t>(p - lower + 0xa);
+  } else if (auto p = strchr(upper, character)) {
+    return static_cast<uint8_t>(p - upper + 0xa);
+  }
 
   assert(false && "This was called with a non-hex character");
   return 0;

diff --git a/source/print.cpp b/source/print.cpp
index 9269e41..baffc50 100644 (file)
--- a/source/print.cpp
+++ b/source/print.cpp
@@ -108,4 +108,20 @@ clr::blue::operator const char*() {
 }
 
 }  // namespace libspirv
+#else
+namespace libspirv {
+
+clr::reset::operator const char*() { return ""; }
+
+clr::grey::operator const char*() { return ""; }
+
+clr::red::operator const char*() { return ""; }
+
+clr::green::operator const char*() { return ""; }
+
+clr::yellow::operator const char*() { return ""; }
+
+clr::blue::operator const char*() { return ""; }
+
+}  // namespace libspirv
 #endif

diff --git a/source/text.cpp b/source/text.cpp
index 18c4d50..f7d1fe2 100755 (executable)
--- a/source/text.cpp
+++ b/source/text.cpp
@@ -176,7 +176,7 @@ spv_result_t encodeImmediate(libspirv::AssemblyContext* context,
                                "Invalid immediate integer: !"))
     return error;
   context->binaryEncodeU32(parse_result, pInst);
-  context->seekForward(strlen(text));
+  context->seekForward(static_cast<uint32_t>(strlen(text)));
   return SPV_SUCCESS;
 }
 

diff --git a/source/text_handler.cpp b/source/text_handler.cpp
index b7ee587..16639b7 100644 (file)
--- a/source/text_handler.cpp
+++ b/source/text_handler.cpp
@@ -499,7 +499,7 @@ spv_result_t AssemblyContext::checkRangeAndIfHexThenSignExtend(
       // Hex values are a bit special. They decode as unsigned values, but
       // may represent a negative number.  In this case, the overflow bits
       // should be zero.
-      failed = (value & overflow_mask);
+      failed = (value & overflow_mask) != 0;
     } else {
       const uint64_t value_as_u64 = static_cast<uint64_t>(value);
       // Check overflow in the ordinary case.

diff --git a/source/validate_id.cpp b/source/validate_id.cpp
index 3244c11..9d9a7eb 100644 (file)
--- a/source/validate_id.cpp
+++ b/source/validate_id.cpp
@@ -417,7 +417,7 @@ bool idUsage::isValid<SpvOpTypeArray>(const spv_instruction_t* inst,
   } else if (5 == constInst->words.size()) {
     uint64_t value =
         constInst->words[3] | ((uint64_t)constInst->words[4]) << 32;
-    bool signedness = constResultType->second.inst->words[3];
+    bool signedness = constResultType->second.inst->words[3] != 0;
     if (signedness) {
       spvCheck(1 > (int64_t)value, DIAG(lengthIndex)
                                        << "OpTypeArray Length <id> '"
@@ -598,7 +598,7 @@ bool idUsage::isValid<SpvOpConstantComposite>(const spv_instruction_t* inst,
                                  << "' is not a composite type.";
            return false);
 
-  uint32_t constituentCount = inst->words.size() - 3;
+  auto constituentCount = inst->words.size() - 3;
   switch (resultType->second.opcode) {
     case SpvOpTypeVector: {
       auto componentCount = resultType->second.inst->words[3];
@@ -731,7 +731,7 @@ bool idUsage::isValid<SpvOpConstantComposite>(const spv_instruction_t* inst,
       }
     } break;
     case SpvOpTypeStruct: {
-      uint32_t memberCount = resultType->second.inst->words.size() - 2;
+      auto memberCount = resultType->second.inst->words.size() - 2;
       spvCheck(memberCount != constituentCount,
                DIAG(resultTypeIndex)
                    << "OpConstantComposite Constituent <id> '"