From e78f5e69ceacdd40319263babae644db0c70060f Mon Sep 17 00:00:00 2001
From: Dzmitry Malyshau <kvarkus@gmail.com>
Date: Sun, 2 May 2021 00:40:37 -0400
Subject: [PATCH] [spv-in] derive Error

---
 src/front/spv/error.rs | 54 +++++++++++++++++++++++++++++++++++++++---
 src/front/spv/mod.rs   |  2 +-
 2 files changed, 52 insertions(+), 4 deletions(-)

diff --git a/src/front/spv/error.rs b/src/front/spv/error.rs
index 4f4e6b1665..b1651e8471 100644
--- a/src/front/spv/error.rs
+++ b/src/front/spv/error.rs
@@ -1,57 +1,105 @@
 use super::ModuleState;
 use crate::arena::Handle;
 
-//TODO: use `thiserror`
-#[derive(Debug)]
+#[derive(Debug, thiserror::Error)]
 pub enum Error {
+    #[error("invalid header")]
     InvalidHeader,
+    #[error("invalid word count")]
     InvalidWordCount,
+    #[error("unknown instruction {0}")]
     UnknownInstruction(u16),
+    #[error("unknown capability {0}")]
     UnknownCapability(spirv::Word),
+    #[error("unsupported instruction {1:?} at {0:?}")]
     UnsupportedInstruction(ModuleState, spirv::Op),
+    #[error("unsupported capability {0:?}")]
     UnsupportedCapability(spirv::Capability),
+    #[error("unsupported extension {0}")]
     UnsupportedExtension(String),
+    #[error("unsupported extension set {0}")]
     UnsupportedExtSet(String),
+    #[error("unsupported extension instantiation set {0}")]
     UnsupportedExtInstSet(spirv::Word),
+    #[error("unsupported extension instantiation {0}")]
     UnsupportedExtInst(spirv::Word),
+    #[error("unsupported type {0:?}")]
     UnsupportedType(Handle<crate::Type>),
+    #[error("unsupported execution model {0}")]
     UnsupportedExecutionModel(spirv::Word),
+    #[error("unsupported execution mode {0}")]
     UnsupportedExecutionMode(spirv::Word),
+    #[error("unsupported storage class {0}")]
     UnsupportedStorageClass(spirv::Word),
+    #[error("unsupported image dimension {0}")]
     UnsupportedImageDim(spirv::Word),
+    #[error("unsupported image format {0}")]
     UnsupportedImageFormat(spirv::Word),
+    #[error("unsupported builtin {0}")]
     UnsupportedBuiltIn(spirv::Word),
+    #[error("unsupported control flow {0}")]
     UnsupportedControlFlow(spirv::Word),
+    #[error("unsupported binary operator {0}")]
     UnsupportedBinaryOperator(spirv::Word),
+    #[error("unknown binary operator {0:?}")]
     UnknownBinaryOperator(spirv::Op),
+    #[error("unknown relational function {0:?}")]
     UnknownRelationalFunction(spirv::Op),
+    #[error("invalid parameter {0:?}")]
     InvalidParameter(spirv::Op),
+    #[error("invalid operand count {1} for {0:?}")]
     InvalidOperandCount(spirv::Op, u16),
+    #[error("invalid operand")]
     InvalidOperand,
+    #[error("invalid id {0}")]
     InvalidId(spirv::Word),
+    #[error("invalid decoration {0}")]
     InvalidDecoration(spirv::Word),
+    #[error("invalid type width {0}")]
     InvalidTypeWidth(spirv::Word),
+    #[error("invalid sign {0}")]
     InvalidSign(spirv::Word),
+    #[error("invalid inner type {0}")]
     InvalidInnerType(spirv::Word),
+    #[error("invalid vector size {0}")]
     InvalidVectorSize(spirv::Word),
+    #[error("invalid access type {0}")]
     InvalidAccessType(spirv::Word),
+    #[error("invalid access {0:?}")]
     InvalidAccess(crate::Expression),
+    #[error("invalid access index {0}")]
     InvalidAccessIndex(spirv::Word),
+    #[error("invalid binding {0}")]
     InvalidBinding(spirv::Word),
+    #[error("invalid global var {0:?}")]
     InvalidGlobalVar(crate::Expression),
+    #[error("invalid image base type {0:?}")]
     InvalidImageBaseType(Handle<crate::Type>),
+    #[error("invalid image {0:?}")]
     InvalidImage(Handle<crate::Type>),
+    #[error("invalid as type {0:?}")]
     InvalidAsType(Handle<crate::Type>),
+    #[error("invalid vector type {0:?}")]
     InvalidVectorType(Handle<crate::Type>),
+    #[error("inconsistent comparison sampling {0:?}")]
     InconsistentComparisonSampling(Handle<crate::GlobalVariable>),
+    #[error("wrong function result type {0}")]
     WrongFunctionResultType(spirv::Word),
+    #[error("wrong function argument type {0}")]
     WrongFunctionArgumentType(spirv::Word),
+    #[error("missing decoration {0:?}")]
     MissingDecoration(spirv::Decoration),
+    #[error("bad string")]
     BadString,
+    #[error("incomplete data")]
     IncompleteData,
+    #[error("invalid terminator")]
     InvalidTerminator,
+    #[error("invalid edge classification")]
     InvalidEdgeClassification,
+    #[error("recursive function call {0}")]
     FunctionCallCycle(spirv::Word),
-    // incomplete implementation error
+    // incomplete implementation errors
+    #[error("unsupported matrix stride {0}")]
     UnsupportedMatrixStride(spirv::Word),
 }
diff --git a/src/front/spv/mod.rs b/src/front/spv/mod.rs
index 868b2f45d4..a4a696acdf 100644
--- a/src/front/spv/mod.rs
+++ b/src/front/spv/mod.rs
@@ -33,7 +33,7 @@ mod function;
 mod image;
 
 use convert::*;
-use error::Error;
+pub use error::Error;
 use flow::*;
 use function::*;