From ee5f6c05d0778f960aaf53f62a5553c0254432c4 Mon Sep 17 00:00:00 2001
From: Minchul Lee <bab2min@gmail.com>
Date: Sat, 11 Sep 2021 19:21:24 +0900
Subject: [PATCH 1/2] update file encoding to UTF-8 BOM

---
 include/kiwi/BitEncoder.hpp   | 2 +-
 include/kiwi/BitUtils.h       | 2 +-
 include/kiwi/FixedVector.hpp  | 2 +-
 include/kiwi/Form.h           | 2 +-
 include/kiwi/FrozenTrie.h     | 2 +-
 include/kiwi/Knlm.h           | 2 +-
 include/kiwi/Mmap.h           | 2 +-
 include/kiwi/PatternMatcher.h | 2 +-
 include/kiwi/ThreadPool.h     | 2 +-
 include/kiwi/Trainer.h        | 2 +-
 include/kiwi/Trie.hpp         | 2 +-
 include/kiwi/Types.h          | 2 +-
 include/kiwi/Utils.h          | 2 +-
 include/kiwi/WordDetector.h   | 2 +-
 14 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/include/kiwi/BitEncoder.hpp b/include/kiwi/BitEncoder.hpp
index f2402716..a1330f99 100644
--- a/include/kiwi/BitEncoder.hpp
+++ b/include/kiwi/BitEncoder.hpp
@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 
 #include <vector>
 #include <array>
diff --git a/include/kiwi/BitUtils.h b/include/kiwi/BitUtils.h
index 619c8662..924eafbe 100644
--- a/include/kiwi/BitUtils.h
+++ b/include/kiwi/BitUtils.h
@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 #include <cstdint>
 
 #if defined(__SSE2__) || defined(__AVX2__)
diff --git a/include/kiwi/FixedVector.hpp b/include/kiwi/FixedVector.hpp
index 1a711074..c0b6419e 100644
--- a/include/kiwi/FixedVector.hpp
+++ b/include/kiwi/FixedVector.hpp
@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 #include <memory>
 
 namespace kiwi
diff --git a/include/kiwi/Form.h b/include/kiwi/Form.h
index e1a6480e..f954045c 100644
--- a/include/kiwi/Form.h
+++ b/include/kiwi/Form.h
@@ -1,4 +1,4 @@
-/**
+/**
  * @file Form.h
  * @author bab2min (bab2min@gmail.com)
  * @brief 형태 및 형태소에 관한 정보를 담는 구조체들이 선언된 헤더
diff --git a/include/kiwi/FrozenTrie.h b/include/kiwi/FrozenTrie.h
index 1108b37c..0752b195 100644
--- a/include/kiwi/FrozenTrie.h
+++ b/include/kiwi/FrozenTrie.h
@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 
 #include <array>
 #include <vector>
diff --git a/include/kiwi/Knlm.h b/include/kiwi/Knlm.h
index 89d1afae..702673d7 100644
--- a/include/kiwi/Knlm.h
+++ b/include/kiwi/Knlm.h
@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 
 #include <array>
 #include <vector>
diff --git a/include/kiwi/Mmap.h b/include/kiwi/Mmap.h
index 13104cfd..93503c58 100644
--- a/include/kiwi/Mmap.h
+++ b/include/kiwi/Mmap.h
@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 #include <string>
 #include <iostream>
 
diff --git a/include/kiwi/PatternMatcher.h b/include/kiwi/PatternMatcher.h
index 939622cf..bd72389b 100644
--- a/include/kiwi/PatternMatcher.h
+++ b/include/kiwi/PatternMatcher.h
@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 
 #include <vector>
 #include <string>
diff --git a/include/kiwi/ThreadPool.h b/include/kiwi/ThreadPool.h
index 87df6790..a2188133 100644
--- a/include/kiwi/ThreadPool.h
+++ b/include/kiwi/ThreadPool.h
@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 
 /*
 A simple C++11 Thread Pool implementation(https://github.com/progschj/ThreadPool)
diff --git a/include/kiwi/Trainer.h b/include/kiwi/Trainer.h
index 6f70f09b..73b4b866 100644
--- a/include/kiwi/Trainer.h
+++ b/include/kiwi/Trainer.h
@@ -1 +1 @@
-#pragma once
+#pragma once
diff --git a/include/kiwi/Trie.hpp b/include/kiwi/Trie.hpp
index 77da8345..daf66aea 100644
--- a/include/kiwi/Trie.hpp
+++ b/include/kiwi/Trie.hpp
@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 #include <vector>
 #include <map>
 #include <unordered_map>
diff --git a/include/kiwi/Types.h b/include/kiwi/Types.h
index 57aa06cb..6520c9dc 100644
--- a/include/kiwi/Types.h
+++ b/include/kiwi/Types.h
@@ -1,4 +1,4 @@
-/**
+/**
  * @file Types.h
  * @author bab2min (bab2min@gmail.com)
  * @brief Kiwi C++ API에 쓰이는 주요 타입들을 모아놓은 헤더 파일
diff --git a/include/kiwi/Utils.h b/include/kiwi/Utils.h
index 9df8c8d9..204da914 100644
--- a/include/kiwi/Utils.h
+++ b/include/kiwi/Utils.h
@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 #include <iostream>
 #include <string>
 #include <memory>
diff --git a/include/kiwi/WordDetector.h b/include/kiwi/WordDetector.h
index 07ce97b9..d54cc3d4 100644
--- a/include/kiwi/WordDetector.h
+++ b/include/kiwi/WordDetector.h
@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 
 #include <kiwi/Types.h>
 

From 5a52c6fc7bf9987ada0ac3418c82a05a4538f586 Mon Sep 17 00:00:00 2001
From: Minchul Lee <bab2min@gmail.com>
Date: Sat, 11 Sep 2021 19:21:45 +0900
Subject: [PATCH 2/2] implemented Kiwi versioning

---
 include/kiwi/Kiwi.h                 |  3 ++-
 include/kiwi/Macro.h                | 10 ++++++++++
 include/kiwi/capi.h                 |  4 +++-
 kiwi_shared_library.vcxproj         |  1 +
 kiwi_shared_library.vcxproj.filters |  3 +++
 src/capi/kiwi_c.cpp                 |  3 +--
 6 files changed, 20 insertions(+), 4 deletions(-)
 create mode 100644 include/kiwi/Macro.h

diff --git a/include/kiwi/Kiwi.h b/include/kiwi/Kiwi.h
index 23819c88..aff82d05 100644
--- a/include/kiwi/Kiwi.h
+++ b/include/kiwi/Kiwi.h
@@ -1,4 +1,4 @@
-/**
+/**
  * @file Kiwi.h
  * @author bab2min (bab2min@gmail.com)
  * @brief Kiwi C++ API를 담고 있는 헤더 파일
@@ -11,6 +11,7 @@
 
 #include <iostream>
 #include <future>
+#include "Macro.h"
 #include "Types.h"
 #include "Form.h"
 #include "Utils.h"
diff --git a/include/kiwi/Macro.h b/include/kiwi/Macro.h
new file mode 100644
index 00000000..d25563a2
--- /dev/null
+++ b/include/kiwi/Macro.h
@@ -0,0 +1,10 @@
+#pragma once
+
+#define KIWI_STR_HELPER(x) #x
+#define KIWI_STR(x) KIWI_STR_HELPER(x)
+
+#define KIWI_VERSION_MAJOR 0
+#define KIWI_VERSION_MINOR 10
+#define KIWI_VERSION_PATCH 1
+
+#define KIWI_VERSION_STRING KIWI_STR(KIWI_VERSION_MAJOR) "." KIWI_STR(KIWI_VERSION_MINOR) "." KIWI_STR(KIWI_VERSION_PATCH)
diff --git a/include/kiwi/capi.h b/include/kiwi/capi.h
index d0fa11c0..bbc4b8f0 100644
--- a/include/kiwi/capi.h
+++ b/include/kiwi/capi.h
@@ -1,4 +1,4 @@
-/**
+/**
  * @file capi.h
  * @author bab2min (bab2min@gmail.com)
  * @brief Kiwi C API를 담고 있는 헤더 파일
@@ -10,6 +10,8 @@
 
 #pragma once
 
+#include "Macro.h"
+
 #define KIWIERR_FAIL -1
 #define KIWIERR_INVALID_HANDLE -2
 #define KIWIERR_INVALID_INDEX -3
diff --git a/kiwi_shared_library.vcxproj b/kiwi_shared_library.vcxproj
index 5250834d..0818edd3 100644
--- a/kiwi_shared_library.vcxproj
+++ b/kiwi_shared_library.vcxproj
@@ -34,6 +34,7 @@
     <ClInclude Include="include\kiwi\FrozenTrie.h" />
     <ClInclude Include="include\kiwi\Kiwi.h" />
     <ClInclude Include="include\kiwi\Knlm.h" />
+    <ClInclude Include="include\kiwi\Macro.h" />
     <ClInclude Include="include\kiwi\Mmap.h" />
     <ClInclude Include="include\kiwi\PatternMatcher.h" />
     <ClInclude Include="include\kiwi\ThreadPool.h" />
diff --git a/kiwi_shared_library.vcxproj.filters b/kiwi_shared_library.vcxproj.filters
index 02b6c51e..e97ef528 100644
--- a/kiwi_shared_library.vcxproj.filters
+++ b/kiwi_shared_library.vcxproj.filters
@@ -87,6 +87,9 @@
     <ClInclude Include="include\kiwi\BitUtils.h">
       <Filter>Header Files\kiwi</Filter>
     </ClInclude>
+    <ClInclude Include="include\kiwi\Macro.h">
+      <Filter>Header Files\kiwi</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\Form.cpp">
diff --git a/src/capi/kiwi_c.cpp b/src/capi/kiwi_c.cpp
index a7357150..d6f120da 100644
--- a/src/capi/kiwi_c.cpp
+++ b/src/capi/kiwi_c.cpp
@@ -8,8 +8,7 @@ using namespace kiwi;
 
 const char* kiwi_version()
 {
-	//return Kiwi::getVersion();
-	return nullptr;
+	return KIWI_VERSION_STRING;
 }
 
 struct ResultBuffer