[coco] Rename Read and Update (#1410)

This commit renames Read and Update as Reader and Updater, respectively.

Signed-off-by: Jonghyun Park <jh1302.park@samsung.com>

diff --git a/contrib/coco/core/include/coco/IR/Bag.h b/contrib/coco/core/include/coco/IR/Bag.h
index 4eb45fc..dcd30fe 100644 (file)
--- a/contrib/coco/core/include/coco/IR/Bag.h
+++ b/contrib/coco/core/include/coco/IR/Bag.h
@@ -27,19 +27,19 @@ namespace coco
 class Bag
 {
 public:
-  struct Update : public Locatable
+  struct Updater : public Locatable
   {
-    virtual ~Update() = default;
+    virtual ~Updater() = default;
   };
 
-  using UpdateSet = std::set<Update *>;
+  using UpdaterSet = std::set<Updater *>;
 
-  struct Read : public Locatable
+  struct Reader : public Locatable
   {
-    virtual ~Read() = default;
+    virtual ~Reader() = default;
   };
 
-  using ReadSet = std::set<Read *>;
+  using ReaderSet = std::set<Reader *>;
 
 public:
   explicit Bag(std::unique_ptr<BagInfo> &&info);
@@ -58,8 +58,10 @@ public:
   bool isOutput(void) const;
 
 public:
-  ReadSet reads(void) const;
-  UpdateSet updates(void) const;
+  // TODO Rename as readers
+  ReaderSet reads(void) const;
+  // TODO Rename as updaters
+  UpdaterSet updates(void) const;
 
 private:
   std::unique_ptr<BagInfo> _info;

diff --git a/contrib/coco/core/include/coco/IR/BagInfo.h b/contrib/coco/core/include/coco/IR/BagInfo.h
index 69fcf61..ba77cff 100644 (file)
--- a/contrib/coco/core/include/coco/IR/BagInfo.h
+++ b/contrib/coco/core/include/coco/IR/BagInfo.h
@@ -62,12 +62,12 @@ private:
   ObjectSet _object;
 
 public:
-  Bag::ReadSet *reads(void) { return &_reads; }
-  const Bag::ReadSet *reads(void) const { return &_reads; }
+  Bag::ReaderSet *reads(void) { return &_reads; }
+  const Bag::ReaderSet *reads(void) const { return &_reads; }
 
 public:
-  Bag::UpdateSet *updates(void) { return &_updates; }
-  const Bag::UpdateSet *updates(void) const { return &_updates; }
+  Bag::UpdaterSet *updates(void) { return &_updates; }
+  const Bag::UpdaterSet *updates(void) const { return &_updates; }
 
 public:
   BagMask *mask(void) { return &_mask; }
@@ -75,9 +75,9 @@ public:
 
 private:
   /** @brief Direct reads (not through Object) */
-  Bag::ReadSet _reads;
+  Bag::ReaderSet _reads;
   /** @brief Direct updates (not through Object) */
-  Bag::UpdateSet _updates;
+  Bag::UpdaterSet _updates;
 
   BagMask _mask;
 };

diff --git a/contrib/coco/core/include/coco/IR/Object.h b/contrib/coco/core/include/coco/IR/Object.h
index 308e3f7..630f905 100644 (file)
--- a/contrib/coco/core/include/coco/IR/Object.h
+++ b/contrib/coco/core/include/coco/IR/Object.h
@@ -21,12 +21,12 @@ namespace coco
 class Object
 {
 public:
-  struct Def : public Bag::Update
+  struct Def : public Bag::Updater
   {
     virtual ~Def() = default;
   };
 
-  struct Use : public Bag::Read
+  struct Use : public Bag::Reader
   {
     virtual ~Use() = default;
   };

diff --git a/contrib/coco/core/include/coco/IR/ReadHook.h b/contrib/coco/core/include/coco/IR/ReadHook.h
index 87a2e9f..653530f 100644 (file)
--- a/contrib/coco/core/include/coco/IR/ReadHook.h
+++ b/contrib/coco/core/include/coco/IR/ReadHook.h
@@ -12,7 +12,7 @@ namespace coco
 class ReadHook final
 {
 public:
-  ReadHook(const PtrLink<Bag, BagInfo> *bag_link, Bag::Read *read)
+  ReadHook(const PtrLink<Bag, BagInfo> *bag_link, Bag::Reader *read)
       : _bag_link{bag_link}, _read{read}
   {
     // DO NOTHING
@@ -27,7 +27,7 @@ public:
 
 private:
   const PtrLink<Bag, BagInfo> *const _bag_link;
-  Bag::Read *const _read;
+  Bag::Reader *const _read;
 };
 
 } // namespace coco

diff --git a/contrib/coco/core/include/coco/IR/ReadSlot.h b/contrib/coco/core/include/coco/IR/ReadSlot.h
index eb4f1a6..1c7d6c6 100644 (file)
--- a/contrib/coco/core/include/coco/IR/ReadSlot.h
+++ b/contrib/coco/core/include/coco/IR/ReadSlot.h
@@ -11,7 +11,7 @@ namespace coco
 template <typename T> class ReadSlot final
 {
 public:
-  ReadSlot(const PtrLink<Bag, BagInfo> *bag_link, Bag::Read *read)
+  ReadSlot(const PtrLink<Bag, BagInfo> *bag_link, Bag::Reader *read)
       : _hook{bag_link, read}, _value{nullptr}
   {
     // DO NOTHING

diff --git a/contrib/coco/core/include/coco/IR/Shuffle.h b/contrib/coco/core/include/coco/IR/Shuffle.h
index f5ad240..e94ca38 100644 (file)
--- a/contrib/coco/core/include/coco/IR/Shuffle.h
+++ b/contrib/coco/core/include/coco/IR/Shuffle.h
@@ -15,7 +15,7 @@
 namespace coco
 {
 
-class Shuffle final : public Instr, public Bag::Read, public Bag::Update
+class Shuffle final : public Instr, public Bag::Reader, public Bag::Updater
 {
 public:
   Shuffle(const PtrLink<Instr, Block> *instr_link, const PtrLink<Bag, BagInfo> *bag_link)

diff --git a/contrib/coco/core/include/coco/IR/UpdateHook.h b/contrib/coco/core/include/coco/IR/UpdateHook.h
index d4437d3..004c401 100644 (file)
--- a/contrib/coco/core/include/coco/IR/UpdateHook.h
+++ b/contrib/coco/core/include/coco/IR/UpdateHook.h
@@ -12,7 +12,7 @@ namespace coco
 class UpdateHook final
 {
 public:
-  UpdateHook(const PtrLink<Bag, BagInfo> *bag_link, Bag::Update *update)
+  UpdateHook(const PtrLink<Bag, BagInfo> *bag_link, Bag::Updater *update)
       : _bag_link{bag_link}, _update{update}
   {
     // DO NOTHING
@@ -27,7 +27,7 @@ public:
 
 private:
   const PtrLink<Bag, BagInfo> *const _bag_link;
-  Bag::Update *const _update;
+  Bag::Updater *const _update;
 };
 
 } // namespace coco

diff --git a/contrib/coco/core/include/coco/IR/UpdateSlot.h b/contrib/coco/core/include/coco/IR/UpdateSlot.h
index ca0fbfa..2df04a6 100644 (file)
--- a/contrib/coco/core/include/coco/IR/UpdateSlot.h
+++ b/contrib/coco/core/include/coco/IR/UpdateSlot.h
@@ -11,7 +11,7 @@ namespace coco
 template <typename T> class UpdateSlot final
 {
 public:
-  UpdateSlot(const PtrLink<Bag, BagInfo> *bag_link, Bag::Update *update)
+  UpdateSlot(const PtrLink<Bag, BagInfo> *bag_link, Bag::Updater *update)
       : _hook{bag_link, update}, _value{nullptr}
   {
     // DO NOTHING

diff --git a/contrib/coco/core/src/IR/Bag.cpp b/contrib/coco/core/src/IR/Bag.cpp
index 78e6704..8927d61 100644 (file)
--- a/contrib/coco/core/src/IR/Bag.cpp
+++ b/contrib/coco/core/src/IR/Bag.cpp
@@ -25,9 +25,9 @@ const ObjectSet *Bag::object(void) const { return _info->object(); }
 bool Bag::isInput(void) const { return _info->mask()->masked(BagMask::Input); }
 bool Bag::isOutput(void) const { return _info->mask()->masked(BagMask::Output); }
 
-Bag::ReadSet Bag::reads(void) const
+Bag::ReaderSet Bag::reads(void) const
 {
-  Bag::ReadSet res;
+  Bag::ReaderSet res;
 
   for (auto obj : *object())
   {
@@ -45,9 +45,9 @@ Bag::ReadSet Bag::reads(void) const
   return res;
 }
 
-Bag::UpdateSet Bag::updates(void) const
+Bag::UpdaterSet Bag::updates(void) const
 {
-  Bag::UpdateSet res;
+  Bag::UpdaterSet res;
 
   for (auto obj : *object())
   {

diff --git a/contrib/coco/core/src/IR/Read.mock.h b/contrib/coco/core/src/IR/Read.mock.h
index 3d7fa62..5e52877 100644 (file)
--- a/contrib/coco/core/src/IR/Read.mock.h
+++ b/contrib/coco/core/src/IR/Read.mock.h
@@ -7,7 +7,8 @@ namespace
 {
 namespace mock
 {
-struct Read final : public coco::Bag::Read
+// TODO Rename as Reader
+struct Read final : public coco::Bag::Reader
 {
   coco::Instr *loc(void) override { return nullptr; }
 };

diff --git a/contrib/coco/core/src/IR/Update.mock.h b/contrib/coco/core/src/IR/Update.mock.h
index d886b37..fe8ff11 100644 (file)
--- a/contrib/coco/core/src/IR/Update.mock.h
+++ b/contrib/coco/core/src/IR/Update.mock.h
@@ -7,7 +7,8 @@ namespace
 {
 namespace mock
 {
-struct Update final : public coco::Bag::Update
+// TODO Rename as Updater
+struct Update final : public coco::Bag::Updater
 {
   coco::Instr *loc(void) override { return nullptr; }
 };