From cc078810f1b359f548969e6f464c04e2015df4aa Mon Sep 17 00:00:00 2001
From: revsic <revsic99@gmail.com>
Date: Mon, 18 Feb 2019 05:24:30 +0900
Subject: [PATCH] obfs, string: Modify file name

---
 obfuscator/impl/string.hpp      | 65 +++++++++++++++++++++++++++++++++
 obfuscator/impl/string_obfs.hpp | 38 -------------------
 2 files changed, 65 insertions(+), 38 deletions(-)
 create mode 100644 obfuscator/impl/string.hpp
 delete mode 100644 obfuscator/impl/string_obfs.hpp

diff --git a/obfuscator/impl/string.hpp b/obfuscator/impl/string.hpp
new file mode 100644
index 0000000..b50e74b
--- /dev/null
+++ b/obfuscator/impl/string.hpp
@@ -0,0 +1,65 @@
+#ifndef STRING_OBFS
+#define STRING_OBFS
+
+#include "random.hpp"
+#include "sequence.hpp"
+
+#include <utility>
+
+namespace obfs {
+    using Encoder = char(*)(char);
+    using Decoder = char(*)(char);
+
+    template <std::size_t size, Encoder encoder, Decoder decoder>
+    class String {
+    public:
+        template <std::size_t... Idx>
+        constexpr String(char const* str,
+                         std::index_sequence<Idx...>):
+            str{ encoder(str[Idx])... } {
+            // Do Nothing
+        }
+
+        constexpr std::size_t len() const {
+            return size;
+        }
+
+        inline char const* decode() const {
+            for (char& chr : str) {
+                chr = decoder(chr);
+            }
+            return str;
+        }
+
+    private:
+        mutable char str[size];
+    };
+
+    template <Encoder encoder, Decoder decoder, std::size_t size>
+    constexpr auto make_string(char const (&str)[size]) {
+        return String<size, encoder, decoder>(str, std::make_index_sequence<size>());
+    }
+
+    template <Encoder... encoders>
+    using encoder_seq = Sequence<Encoder, encoders...>;
+
+    template <Decoder... decoders>
+    using decoder_seq = Sequence<Decoder, decoders...>;
+
+    template <typename EncoderSeq, typename DecoderSeq>
+    using make_table = SeqPack<EncoderSeq, DecoderSeq>;
+
+    template <typename Table, std::size_t size>
+    constexpr auto make_string(char const (&str)[size]) {
+        using pair = Table::get<OBFS_RAND_VAL(Table::size)>;
+        // constexpr Encoder encoder = pair::get<0>::value;
+        // constexpr Decoder decoder = pair::get<1>::value;
+
+        constexpr Encoder encoder = pair::type::value;
+        constexpr Decoder decoder = pair::next::type::value;
+
+        return make_string<encoder, decoder>(str);
+    }
+}
+
+#endif
\ No newline at end of file
diff --git a/obfuscator/impl/string_obfs.hpp b/obfuscator/impl/string_obfs.hpp
deleted file mode 100644
index 0269252..0000000
--- a/obfuscator/impl/string_obfs.hpp
+++ /dev/null
@@ -1,38 +0,0 @@
-#ifndef STRING_OBFS
-#define STRING_OBFS
-
-#include <utility>
-
-namespace obfs {
-    template <std::size_t size, char(*encoder)(char), char(*decoder)(char)>
-    class String {
-    public:
-        template <std::size_t... Idx>
-        constexpr String(char const* str,
-                         std::index_sequence<Idx...>):
-            str{ encoder(str[Idx])... } {
-            // Do Nothing
-        }
-
-        constexpr std::size_t len() const {
-            return size;
-        }
-
-        inline char const* decode() const {
-            for (char& chr : str) {
-                chr = decoder(chr);
-            }
-            return str;
-        }
-
-    private:
-        mutable char str[size];
-    };
-
-    template <char(*encoder)(char), char(*decoder)(char), std::size_t size>
-    constexpr auto make_string(char const (&str)[size]) {
-        return String<size, encoder, decoder>(str, std::make_index_sequence<size>());
-    }
-}
-
-#endif
\ No newline at end of file