Rename RawCatch to CatchClause

Author: SoniEx2

include/wabt/binary-reader-logging.h

@@ -234,7 +234,8 @@ class BinaryReaderLogging : public BinaryReaderDelegate {
   Result OnThrowExpr(Index tag_index) override;
   Result OnThrowRefExpr() override;
   Result OnTryExpr(Type sig_type) override;
-  Result OnTryTableExpr(Type sig_type, const RawCatchVector& catches) override;
+  Result OnTryTableExpr(Type sig_type,
+                        const CatchClauseVector& catches) override;
   Result OnUnaryExpr(Opcode opcode) override;
   Result OnTernaryExpr(Opcode opcode) override;
   Result OnUnreachableExpr() override;

include/wabt/binary-reader-nop.h

@@ -321,7 +321,8 @@ class BinaryReaderNop : public BinaryReaderDelegate {
   Result OnThrowExpr(Index depth) override { return Result::Ok; }
   Result OnThrowRefExpr() override { return Result::Ok; }
   Result OnTryExpr(Type sig_type) override { return Result::Ok; }
-  Result OnTryTableExpr(Type sig_type, const RawCatchVector& catches) override {
+  Result OnTryTableExpr(Type sig_type,
+                        const CatchClauseVector& catches) override {
     return Result::Ok;
   }
   Result OnUnaryExpr(Opcode opcode) override { return Result::Ok; }

include/wabt/binary-reader.h

@@ -59,12 +59,12 @@ struct TypeMut {
 };
 using TypeMutVector = std::vector<TypeMut>;
 
-struct RawCatch {
+struct CatchClause {
   CatchKind kind;
   Index tag;
   Index depth;
 };
-using RawCatchVector = std::vector<RawCatch>;
+using CatchClauseVector = std::vector<CatchClause>;
 
 class BinaryReaderDelegate {
  public:
@@ -312,7 +312,7 @@ class BinaryReaderDelegate {
   virtual Result OnThrowRefExpr() = 0;
   virtual Result OnTryExpr(Type sig_type) = 0;
   virtual Result OnTryTableExpr(Type sig_type,
-                                const RawCatchVector& catches) = 0;
+                                const CatchClauseVector& catches) = 0;
 
   virtual Result OnUnaryExpr(Opcode opcode) = 0;
   virtual Result OnTernaryExpr(Opcode opcode) = 0;

src/binary-reader-ir.cc

@@ -260,7 +260,8 @@ class BinaryReaderIR : public BinaryReaderNop {
   Result OnThrowExpr(Index tag_index) override;
   Result OnThrowRefExpr() override;
   Result OnTryExpr(Type sig_type) override;
-  Result OnTryTableExpr(Type sig_type, const RawCatchVector& catches) override;
+  Result OnTryTableExpr(Type sig_type,
+                        const CatchClauseVector& catches) override;
   Result OnUnaryExpr(Opcode opcode) override;
   Result OnTernaryExpr(Opcode opcode) override;
   Result OnUnreachableExpr() override;
@@ -1259,7 +1260,7 @@ Result BinaryReaderIR::OnCatchAllExpr() {
 }
 
 Result BinaryReaderIR::OnTryTableExpr(Type sig_type,
-                                      const RawCatchVector& catches) {
+                                      const CatchClauseVector& catches) {
   auto expr_ptr = std::make_unique<TryTableExpr>();
   TryTableExpr* expr = expr_ptr.get();
   expr->catches.reserve(catches.size());

src/binary-reader-logging.cc

@@ -395,7 +395,7 @@ Result BinaryReaderLogging::OnTryExpr(Type sig_type) {
 }
 
 Result BinaryReaderLogging::OnTryTableExpr(Type sig_type,
-                                           const RawCatchVector& catches) {
+                                           const CatchClauseVector& catches) {
   LOGF("OnTryTableExpr(sig: ");
   LogType(sig_type);
   Index count = catches.size();

src/binary-reader-objdump.cc

@@ -548,7 +548,8 @@ class BinaryReaderObjdumpDisassemble : public BinaryReaderObjdumpBase {
   Result OnOpcodeBlockSig(Type sig_type) override;
   Result OnOpcodeType(Type type) override;
 
-  Result OnTryTableExpr(Type sig_type, const RawCatchVector& catches) override;
+  Result OnTryTableExpr(Type sig_type,
+                        const CatchClauseVector& catches) override;
   Result OnBrTableExpr(Index num_targets,
                        Index* target_depths,
                        Index default_target_depth) override;
@@ -906,7 +907,7 @@ Result BinaryReaderObjdumpDisassemble::OnOpcodeType(Type type) {
 
 Result BinaryReaderObjdumpDisassemble::OnTryTableExpr(
     Type sig_type,
-    const RawCatchVector& catches) {
+    const CatchClauseVector& catches) {
   if (!in_function_body) {
     return Result::Ok;
   }

src/binary-reader.cc

@@ -192,7 +192,7 @@ class BinaryReader {
   TypeVector result_types_;
   TypeMutVector fields_;
   std::vector<Index> target_depths_;
-  RawCatchVector catches_;
+  CatchClauseVector catches_;
   const ReadBinaryOptions& options_;
   BinarySection last_known_section_ = BinarySection::Invalid;
   bool did_read_names_section_ = false;
@@ -1546,7 +1546,7 @@ Result BinaryReader::ReadInstructions(Offset end_offset, const char* context) {
           }
           Index depth;
           CHECK_RESULT(ReadIndex(&depth, "catch depth"));
-          RawCatch catch_;
+          CatchClause catch_;
           catch_.kind = CatchKind(handler);
           catch_.tag = tag;
           catch_.depth = depth;