Change the namespace names to avoid ambiguity

Author: aakoshh

acvm-repo/acir/codegen/witness.cpp

@@ -4,7 +4,7 @@
 #include "msgpack.hpp"
 #include "bincode.hpp"
 
-namespace WitnessStack {
+namespace Witnesses {
 
     struct Witness {
         uint32_t value;
@@ -18,7 +18,7 @@ namespace WitnessStack {
     };
 
     struct WitnessMap {
-        std::map<WitnessStack::Witness, std::string> value;
+        std::map<Witnesses::Witness, std::string> value;
 
         friend bool operator==(const WitnessMap&, const WitnessMap&);
         std::vector<uint8_t> bincodeSerialize() const;
@@ -30,7 +30,7 @@ namespace WitnessStack {
 
     struct StackItem {
         uint32_t index;
-        WitnessStack::WitnessMap witness;
+        Witnesses::WitnessMap witness;
 
         friend bool operator==(const StackItem&, const StackItem&);
         std::vector<uint8_t> bincodeSerialize() const;
@@ -40,7 +40,7 @@ namespace WitnessStack {
     };
 
     struct WitnessStack {
-        std::vector<WitnessStack::StackItem> stack;
+        std::vector<Witnesses::StackItem> stack;
 
         friend bool operator==(const WitnessStack&, const WitnessStack&);
         std::vector<uint8_t> bincodeSerialize() const;
@@ -49,10 +49,10 @@ namespace WitnessStack {
         MSGPACK_FIELDS(stack);
     };
 
-} // end of namespace WitnessStack
+} // end of namespace Witnesses
 
 
-namespace WitnessStack {
+namespace Witnesses {
 
     inline bool operator==(const StackItem &lhs, const StackItem &rhs) {
         if (!(lhs.index == rhs.index)) { return false; }
@@ -75,11 +75,11 @@ namespace WitnessStack {
         return value;
     }
 
-} // end of namespace WitnessStack
+} // end of namespace Witnesses
 
 template <>
 template <typename Serializer>
-void serde::Serializable<WitnessStack::StackItem>::serialize(const WitnessStack::StackItem &obj, Serializer &serializer) {
+void serde::Serializable<Witnesses::StackItem>::serialize(const Witnesses::StackItem &obj, Serializer &serializer) {
     serializer.increase_container_depth();
     serde::Serializable<decltype(obj.index)>::serialize(obj.index, serializer);
     serde::Serializable<decltype(obj.witness)>::serialize(obj.witness, serializer);
@@ -88,16 +88,16 @@ void serde::Serializable<WitnessStack::StackItem>::serialize(const WitnessStack:
 
 template <>
 template <typename Deserializer>
-WitnessStack::StackItem serde::Deserializable<WitnessStack::StackItem>::deserialize(Deserializer &deserializer) {
+Witnesses::StackItem serde::Deserializable<Witnesses::StackItem>::deserialize(Deserializer &deserializer) {
     deserializer.increase_container_depth();
-    WitnessStack::StackItem obj;
+    Witnesses::StackItem obj;
     obj.index = serde::Deserializable<decltype(obj.index)>::deserialize(deserializer);
     obj.witness = serde::Deserializable<decltype(obj.witness)>::deserialize(deserializer);
     deserializer.decrease_container_depth();
     return obj;
 }
 
-namespace WitnessStack {
+namespace Witnesses {
 
     inline bool operator==(const Witness &lhs, const Witness &rhs) {
         if (!(lhs.value == rhs.value)) { return false; }
@@ -119,27 +119,27 @@ namespace WitnessStack {
         return value;
     }
 
-} // end of namespace WitnessStack
+} // end of namespace Witnesses
 
 template <>
 template <typename Serializer>
-void serde::Serializable<WitnessStack::Witness>::serialize(const WitnessStack::Witness &obj, Serializer &serializer) {
+void serde::Serializable<Witnesses::Witness>::serialize(const Witnesses::Witness &obj, Serializer &serializer) {
     serializer.increase_container_depth();
     serde::Serializable<decltype(obj.value)>::serialize(obj.value, serializer);
     serializer.decrease_container_depth();
 }
 
 template <>
 template <typename Deserializer>
-WitnessStack::Witness serde::Deserializable<WitnessStack::Witness>::deserialize(Deserializer &deserializer) {
+Witnesses::Witness serde::Deserializable<Witnesses::Witness>::deserialize(Deserializer &deserializer) {
     deserializer.increase_container_depth();
-    WitnessStack::Witness obj;
+    Witnesses::Witness obj;
     obj.value = serde::Deserializable<decltype(obj.value)>::deserialize(deserializer);
     deserializer.decrease_container_depth();
     return obj;
 }
 
-namespace WitnessStack {
+namespace Witnesses {
 
     inline bool operator==(const WitnessMap &lhs, const WitnessMap &rhs) {
         if (!(lhs.value == rhs.value)) { return false; }
@@ -161,27 +161,27 @@ namespace WitnessStack {
         return value;
     }
 
-} // end of namespace WitnessStack
+} // end of namespace Witnesses
 
 template <>
 template <typename Serializer>
-void serde::Serializable<WitnessStack::WitnessMap>::serialize(const WitnessStack::WitnessMap &obj, Serializer &serializer) {
+void serde::Serializable<Witnesses::WitnessMap>::serialize(const Witnesses::WitnessMap &obj, Serializer &serializer) {
     serializer.increase_container_depth();
     serde::Serializable<decltype(obj.value)>::serialize(obj.value, serializer);
     serializer.decrease_container_depth();
 }
 
 template <>
 template <typename Deserializer>
-WitnessStack::WitnessMap serde::Deserializable<WitnessStack::WitnessMap>::deserialize(Deserializer &deserializer) {
+Witnesses::WitnessMap serde::Deserializable<Witnesses::WitnessMap>::deserialize(Deserializer &deserializer) {
     deserializer.increase_container_depth();
-    WitnessStack::WitnessMap obj;
+    Witnesses::WitnessMap obj;
     obj.value = serde::Deserializable<decltype(obj.value)>::deserialize(deserializer);
     deserializer.decrease_container_depth();
     return obj;
 }
 
-namespace WitnessStack {
+namespace Witnesses {
 
     inline bool operator==(const WitnessStack &lhs, const WitnessStack &rhs) {
         if (!(lhs.stack == rhs.stack)) { return false; }
@@ -203,21 +203,21 @@ namespace WitnessStack {
         return value;
     }
 
-} // end of namespace WitnessStack
+} // end of namespace Witnesses
 
 template <>
 template <typename Serializer>
-void serde::Serializable<WitnessStack::WitnessStack>::serialize(const WitnessStack::WitnessStack &obj, Serializer &serializer) {
+void serde::Serializable<Witnesses::WitnessStack>::serialize(const Witnesses::WitnessStack &obj, Serializer &serializer) {
     serializer.increase_container_depth();
     serde::Serializable<decltype(obj.stack)>::serialize(obj.stack, serializer);
     serializer.decrease_container_depth();
 }
 
 template <>
 template <typename Deserializer>
-WitnessStack::WitnessStack serde::Deserializable<WitnessStack::WitnessStack>::deserialize(Deserializer &deserializer) {
+Witnesses::WitnessStack serde::Deserializable<Witnesses::WitnessStack>::deserialize(Deserializer &deserializer) {
     deserializer.increase_container_depth();
-    WitnessStack::WitnessStack obj;
+    Witnesses::WitnessStack obj;
     obj.stack = serde::Deserializable<decltype(obj.stack)>::deserialize(deserializer);
     deserializer.decrease_container_depth();
     return obj;

acvm-repo/acir/src/lib.rs

@@ -89,7 +89,7 @@ mod reflection {
         tracer.trace_simple_type::<MemoryAddress>().unwrap();
 
         serde_cpp_codegen(
-            "Program",
+            "Acir",
             PathBuf::from("./codegen/acir.cpp").as_path(),
             &tracer.registry().unwrap(),
         );
@@ -103,7 +103,7 @@ mod reflection {
         tracer.trace_simple_type::<WitnessStack<FieldElement>>().unwrap();
 
         serde_cpp_codegen(
-            "WitnessStack",
+            "Witnesses",
             PathBuf::from("./codegen/witness.cpp").as_path(),
             &tracer.registry().unwrap(),
         );