add namespace ipaddress to the cpp

cpp/src/crunchy.cpp

@@ -1,5 +1,7 @@
 #include "crunchy.hpp"
 
+namespace ipaddress {
+
 std::ostream& operator<<(std::ostream &o, const Crunchy &crunchy) {
     o << crunchy.toString();
       return o;
@@ -17,3 +19,5 @@ static auto _two = Crunchy::from_8bit({2});
 const Crunchy& Crunchy::two(){
   return _two;
 }
+
+}

cpp/src/crunchy.hpp

@@ -10,6 +10,7 @@
 
 #include "result.hpp"
 
+namespace ipaddress {
 /**
  * based
  * Crunch - Arbitrary-precision integer arithmetic library
@@ -217,5 +218,6 @@ class Crunchy {
 
 std::ostream& operator<<(std::ostream &o, const Crunchy &crunchy);
 
+}
 
 #endif

cpp/src/ip_bits.cpp

@@ -1,6 +1,7 @@
 
 #include "ip_bits.hpp"
 
+namespace ipaddress {
 
 static std::string ipv4_as_compressed(const IpBits *ip_bits, const Crunchy &host_address) {
     std::stringstream ret;
@@ -83,3 +84,5 @@ const IpBits* IpBits::v6() {
       Crunchy::zero());
   return v6Ptr;
 }
+
+}

cpp/src/ip_bits.hpp

@@ -9,6 +9,9 @@
 #include <functional>
 #include <vector>
 
+namespace ipaddress {
+
+
 class IpBits {
 public:
   typedef std::function<std::string(const IpBits *source, const Crunchy &num)> ToString;
@@ -33,7 +36,7 @@ class IpBits {
     rev_domain(rev_domain), part_mod(part_mod), host_ofs(host_ofs) {
   }
 public:
-  
+
     const IpBits* clone() const {
       return this;
         // IpBits my;
@@ -84,5 +87,6 @@ class IpBits {
 };
 
 std::ostream& operator<<(std::ostream &o, const IpBits &ip_bits);
+}
 
 #endif

cpp/src/ip_version.hpp

@@ -1,9 +1,12 @@
 #ifndef __IP_VERSION__
 #define __IP_VERSION__
 
+namespace ipaddress {
+
 typedef enum {
     V4 = 4,
     V6 = 6
 } IpVersion;
 
+}
 #endif

cpp/src/ipaddress.cpp

@@ -5,6 +5,7 @@
 #include "ipv6.hpp"
 #include "ipv6_mapped.hpp"
 
+namespace ipaddress {
 
 std::ostream& operator<<(std::ostream &o, const IPAddress &ipaddress) {
     o << "<ipaddress@"
@@ -110,52 +111,30 @@ std::vector<IPAddress> IPAddress::aggregate(const std::vector<IPAddress> &networ
   //         &stack[i].to_string_uncompressed());
   // }
   for (ssize_t pos = 0; true;) {
-    if (pos < 0) {
-      pos = 0;
-    }
+    if (pos < 0) { pos = 0; }
     auto stack_len = static_cast<ssize_t>(stack.size()); // borrow checker
-    // println!("loop:{}:{}", pos, stack_len);
-    // if stack_len == 1 {
-    //     println!("exit 1");
-    //     break;
-    // }
-    if (pos >= stack_len) {
-      // println!("exit first:{}:{}", stack_len, pos);
-      break;
-    }
+    if (pos >= stack_len) { break; }
     auto first = IPAddress::pos_to_idx(pos, stack_len);
     pos = pos + 1;
-    if (pos >= stack_len) {
-      // println!("exit second:{}:{}", stack_len, pos);
-      break;
-    }
+    if (pos >= stack_len) { break; }
     auto second = IPAddress::pos_to_idx(pos, stack_len);
     pos = pos + 1;
-    //auto firstUnwrap = first;
     if (stack[first].includes(stack[second])) {
       pos = pos - 2;
-      // println!("remove:1:{}:{}:{}=>{}", first, second, stack_len, pos + 1);
       auto pidx = IPAddress::pos_to_idx(pos + 1, stack_len);
-      // std::cout << "-1:" << pidx << ":" << stack.size() << std::endl;
       stack.erase(stack.begin() + pidx);
     } else {
       stack[first].prefix = stack[first].prefix.sub(1).unwrap();
-      // println!("complex:{}:{}:{}:{}:P1:{}:P2:{}", pos, stack_len,
-      // first, second,
-      // stack[first].to_string(), stack[second].to_string());
       if ((stack[first].prefix.num + 1) == stack[second].prefix.num &&
           stack[first].includes(stack[second])) {
         pos = pos - 2;
         auto idx = IPAddress::pos_to_idx(pos, stack_len);
         stack[idx] = stack[first].clone(); // kaputt
         auto pidx = IPAddress::pos_to_idx(pos + 1, stack_len);
-        // std::cout << "-1:" << pidx << ":" << stack.size() << std::endl;
         stack.erase(stack.begin() + pidx);
-        // println!("remove-2:{}:{}", pos + 1, stack_len);
         pos = pos - 1; // backtrack
       } else {
         stack[first].prefix = stack[first].prefix.add(1).unwrap(); //reset prefix
-        // println!("easy:{}:{}=>{}", pos, stack_len, stack[first].to_string());
         pos = pos - 1; // do it with second as first
       }
     }
@@ -164,3 +143,5 @@ std::vector<IPAddress> IPAddress::aggregate(const std::vector<IPAddress> &networ
   //return stack.erase(0, stack.size());
   return std::vector<IPAddress>(stack.begin(), stack.end());
 }
+
+}

cpp/src/ipaddress.hpp

@@ -25,7 +25,7 @@
 #include "result.hpp"
 #include "option.hpp"
 
-
+namespace ipaddress {
 
 class ResultCrunchyParts {
   public:
@@ -1295,4 +1295,6 @@ class IPAddress {
 
 std::ostream& operator<<(std::ostream &o, const IPAddress &ipa);
 
+}
+
 #endif

cpp/src/ipv4.cpp

@@ -3,6 +3,8 @@
 #include "ipv6.hpp"
 #include "prefix128.hpp"
 
+namespace ipaddress {
+
 IPAddress Ipv4::to_ipv6(const IPAddress &ia) {
     return IPAddress(
         IpBits::v6(),
@@ -14,3 +16,5 @@ IPAddress Ipv4::to_ipv6(const IPAddress &ia) {
         Ipv6::to_ipv6
     );
 }
+
+}

cpp/src/ipv4.hpp

@@ -7,7 +7,7 @@
 #include "ip_bits.hpp"
 #include "prefix128.hpp"
 // #include "ipv6.hpp"
-
+namespace ipaddress {
 class Ipv4 {
     public:
     static Result<IPAddress> from_number(const Crunchy &addr, size_t prefix_num) {
@@ -181,4 +181,6 @@ class Ipv4 {
         return Ok(ip);
     }
 };
+
+}
 #endif

cpp/src/ipv6.hpp

@@ -10,6 +10,7 @@
 
 #include <string>
 
+namespace ipaddress {
 class Ipv6 {
 public:
     //  =Name
@@ -209,4 +210,5 @@ class Ipv6 {
     }
 
 };
+}
 #endif

cpp/src/ipv6_loopback.hpp

@@ -5,6 +5,7 @@
 #include "ipv6.hpp"
 #include "crunchy.hpp"
 
+namespace ipaddress {
 
 class Ipv6Loopback {
   public:
@@ -55,5 +56,5 @@ class Ipv6Loopback {
         return Ipv6::from_int(Crunchy::one(), 128).unwrap();
     }
 };
-
+}
 #endif

cpp/src/ipv6_mapped.cpp

@@ -1,5 +1,7 @@
 #include "ipv6_mapped.hpp"
 
+namespace ipaddress {
+
 Result<IPAddress> Ipv6Mapped::create(const std::string &str) {
     // console.log("mapped-1");
     auto i = IPAddress::split_at_slash(str);
@@ -87,3 +89,4 @@ Result<IPAddress> Ipv6Mapped::create(const std::string &str) {
     // console.log("mapped-9");
     return Err<IPAddress>("not a valid mapped string");
 }
+}

cpp/src/ipv6_mapped.hpp

@@ -5,6 +5,8 @@
 #include "ip_bits.hpp"
 #include "ipaddress.hpp"
 
+namespace ipaddress {
+
 class Ipv6Mapped {
 public:
     //  Ac
@@ -85,4 +87,5 @@ class Ipv6Mapped {
     //
     static Result<IPAddress> create(const std::string &str);
 };
+}
 #endif

cpp/src/ipv6_unspec.hpp

@@ -2,7 +2,7 @@
 #define __IPV6_UNSPEC__
 
 #include "ipaddress.hpp"
-
+namespace ipaddress {
 class Ipv6Unspec {
 public:
     //  The address with all zero bits is called the +unspecified+ address
@@ -59,4 +59,5 @@ class Ipv6Unspec {
     }
     //  class IPv6::Unspecified
 };
+}
 #endif

cpp/src/option.hpp

@@ -5,6 +5,7 @@
 #include <string>
 #include <memory>
 
+namespace ipaddress {
 class OptionError : public std::exception {
     const std::string msg;
   public:
@@ -72,5 +73,6 @@ std::ostream& operator<<(std::ostream &o, const Option<T> &option) {
   }
   return o;
 }
+}
 
 #endif

cpp/src/prefix.hpp

@@ -8,7 +8,7 @@
 #include "ip_bits.hpp"
 #include "crunchy.hpp"
 
-
+namespace ipaddress {
 class Prefix {
 public:
     typedef std::function<Result<Prefix>(const size_t num)> From;
@@ -171,4 +171,5 @@ class Prefix {
 };
 
 std::ostream& operator<<(std::ostream &o, const Prefix &prefix);
+}
 #endif

cpp/src/prefix128.hpp

@@ -5,6 +5,8 @@
 
 #include "result.hpp"
 
+namespace ipaddress {
+
 class Prefix128 {
 public:
     // #[derive(Ord,PartialOrd,Eq,PartialEq,Debug,Copy,Clone)]
@@ -41,4 +43,6 @@ class Prefix128 {
     }
 };
 
+}
+
 #endif

cpp/src/prefix32.hpp

@@ -5,6 +5,7 @@
 #include "prefix.hpp"
 #include "ip_bits.hpp"
 
+namespace ipaddress {
 class Prefix32 {
     public:
     static Result<Prefix> from(size_t num) {
@@ -30,5 +31,6 @@ class Prefix32 {
     }
 
 };
+}
 
 #endif

cpp/src/result.hpp

@@ -3,6 +3,8 @@
 
 #include "option.hpp"
 
+namespace ipaddress {
+
 class ResultError : public std::exception {
     const char *msg;
   public:
@@ -59,5 +61,5 @@ template<typename T> Result<T> Ok(T &t) {
 template<typename T> Result<T> Err(const char *msg) {
   return Result<T>(0, msg);
 }
-
+}
 #endif

cpp/src/rle.cpp

@@ -4,6 +4,8 @@
 
 #include "rle.hpp"
 
+namespace ipaddress{
+
 std::ostream& operator<<(std::ostream &o, const Rle &rle) {
     o << rle.toString();
     return o;
@@ -68,3 +70,4 @@ std::vector<Rle> Rle::code(const std::vector<size_t> &parts) {
     last.handle_last();
     return last.ret;
 }
+}

cpp/src/rle.hpp

@@ -8,6 +8,7 @@
 #include <string>
 #include <sstream>
 
+namespace ipaddress {
 
 class Rle {
 public:
@@ -50,5 +51,5 @@ class Rle {
 };
 
 std::ostream& operator<<(std::ostream &o, const Rle &rle);
-
+}
 #endif

cpp/test/mocha.hpp

@@ -14,7 +14,7 @@ static int okCount = 0;
 
 
 int exit() {
-  std::cout << std::endl;
+
   std::stringstream s2;
   s2 << std::dec << "Total " << okCount+failCount
     << " Ok " << okCount

cpp/test/test_crunchy.cpp

@@ -3,6 +3,7 @@
 #include "chai.hpp"
 #include "mocha.hpp"
 
+using namespace ipaddress;
 int main(int, char **) {
 
   describe("#compare", []() {