Merge branch 'add_encoder'

tetengo · Dec 20, 2020 · 9dac7ad · 9dac7ad
2 parents 1112ecb + 0365498
commit 9dac7ad
Show file tree

Hide file tree

Showing 18 changed files with 32 additions and 29 deletions.
diff --git a/library/platform_dependent/cpp/include/tetengo/Makefile.am b/library/platform_dependent/cpp/include/tetengo/Makefile.am
@@ -2,7 +2,7 @@
 # Copyright (C) 2019-2020 kaoru  https://www.tetengo.org/
 
 pkg_headers = \
-    platform_dependent/text_encoder.hpp
+    platform_dependent/text_encX.hpp
 
 extra_headers = \
     platform_dependent/0namespace.dox

diff --git a/...tengo/platform_dependent/text_encoder.hpp → .../tetengo/platform_dependent/text_encX.hpp b/...tengo/platform_dependent/text_encoder.hpp → .../tetengo/platform_dependent/text_encX.hpp
diff --git a/library/platform_dependent/cpp/src/unixos/Makefile.am b/library/platform_dependent/cpp/src/unixos/Makefile.am
@@ -4,7 +4,7 @@
 headers =
 
 sources = \
-    tetengo.platform_dependent.text_encoder.cpp
+    tetengo.platform_dependent.text_X.cpp
 
 lib_LIBRARIES = libtetengo.platform_dependent.cpp.a
 

diff --git a/...tengo.platform_dependent.text_encoder.cpp → ...xos/tetengo.platform_dependent.text_X.cpp b/...tengo.platform_dependent.text_encoder.cpp → ...xos/tetengo.platform_dependent.text_X.cpp
@@ -21,7 +21,7 @@
 #include <boost/preprocessor.hpp>
 #include <boost/scope_exit.hpp>
 
-#include <tetengo/platform_dependent/text_encoder.hpp>
+#include <tetengo/platform_dependent/text_encX.hpp>
 
 
 namespace tetengo::platform_dependent

diff --git a/library/platform_dependent/cpp/src/windows/Makefile.am b/library/platform_dependent/cpp/src/windows/Makefile.am
@@ -4,7 +4,7 @@
 headers =
 
 sources = \
-    tetengo.platform_dependent.text_encoder.cpp
+    tetengo.platform_dependent.textX.cpp
 
 EXTRA_DIST = \
     ${headers} ${sources}

diff --git a/...tengo.platform_dependent.text_encoder.cpp → ...dows/tetengo.platform_dependent.textX.cpp b/...tengo.platform_dependent.text_encoder.cpp → ...dows/tetengo.platform_dependent.textX.cpp
@@ -19,7 +19,7 @@
 
 #include <boost/core/noncopyable.hpp>
 
-#include <tetengo/platform_dependent/text_encoder.hpp>
+#include <tetengo/platform_dependent/text_encX.hpp>
 
 
 namespace tetengo::platform_dependent

diff --git a/library/platform_dependent/cpp/tetengo.platform_dependent.cpp.vcxproj b/library/platform_dependent/cpp/tetengo.platform_dependent.cpp.vcxproj
@@ -99,20 +99,20 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\precompiled\precompiled.h" />
-    <ClInclude Include="include\tetengo\platform_dependent\text_encoder.hpp" />
+    <ClInclude Include="include\tetengo\platform_dependent\text_encX.hpp" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\precompiled\precompiled.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="src\unixos\tetengo.platform_dependent.text_encoder.cpp">
+    <ClCompile Include="src\unixos\tetengo.platform_dependent.text_X.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\windows\tetengo.platform_dependent.text_encoder.cpp" />
+    <ClCompile Include="src\windows\tetengo.platform_dependent.textX.cpp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

diff --git a/library/platform_dependent/cpp/tetengo.platform_dependent.cpp.vcxproj.filters b/library/platform_dependent/cpp/tetengo.platform_dependent.cpp.vcxproj.filters
@@ -25,21 +25,21 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="include\tetengo\platform_dependent\text_encoder.hpp">
-      <Filter>header\tetengo::platform_dependent</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\precompiled\precompiled.h">
       <Filter>src\windows</Filter>
     </ClInclude>
+    <ClInclude Include="include\tetengo\platform_dependent\text_encX.hpp">
+      <Filter>header\tetengo::platform_dependent</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="src\unixos\tetengo.platform_dependent.text_encoder.cpp">
-      <Filter>src\unixos</Filter>
-    </ClCompile>
-    <ClCompile Include="src\windows\tetengo.platform_dependent.text_encoder.cpp">
+    <ClCompile Include="..\..\..\precompiled\precompiled.cpp">
       <Filter>src\windows</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\precompiled\precompiled.cpp">
+    <ClCompile Include="src\unixos\tetengo.platform_dependent.text_X.cpp">
+      <Filter>src\unixos</Filter>
+    </ClCompile>
+    <ClCompile Include="src\windows\tetengo.platform_dependent.textX.cpp">
       <Filter>src\windows</Filter>
     </ClCompile>
   </ItemGroup>

diff --git a/library/platform_dependent/test/src/Makefile.am b/library/platform_dependent/test/src/Makefile.am
@@ -5,7 +5,7 @@ headers =
 
 sources = \
     master.cpp \
-    test_tetengo.platform_dependent.text_encoder.cpp
+    test_tetengo.platform_dependent.text_eX.cpp
 
 check_PROGRAMS = test_tetengo.platform_dependent
 

diff --git a/...tengo.platform_dependent.text_encoder.cpp → ...st_tetengo.platform_dependent.text_eX.cpp b/...tengo.platform_dependent.text_encoder.cpp → ...st_tetengo.platform_dependent.text_eX.cpp
@@ -14,7 +14,7 @@
 #include <boost/preprocessor.hpp>
 #include <boost/test/unit_test.hpp>
 
-#include <tetengo/platform_dependent/text_encoder.hpp>
+#include <tetengo/platform_dependent/text_encX.hpp>
 
 
 namespace

diff --git a/library/platform_dependent/test/test_tetengo.platform_dependent.vcxproj b/library/platform_dependent/test/test_tetengo.platform_dependent.vcxproj
@@ -116,7 +116,7 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
     </ClCompile>
     <ClCompile Include="src\master.cpp" />
-    <ClCompile Include="src\test_tetengo.platform_dependent.text_encoder.cpp" />
+    <ClCompile Include="src\test_tetengo.platform_dependent.text_eX.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\precompiled\precompiled.h" />

diff --git a/library/platform_dependent/test/test_tetengo.platform_dependent.vcxproj.filters b/library/platform_dependent/test/test_tetengo.platform_dependent.vcxproj.filters
@@ -10,10 +10,10 @@
     <ClCompile Include="src\master.cpp">
       <Filter>src</Filter>
     </ClCompile>
-    <ClCompile Include="src\test_tetengo.platform_dependent.text_encoder.cpp">
+    <ClCompile Include="..\..\..\precompiled\precompiled.cpp">
       <Filter>src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\precompiled\precompiled.cpp">
+    <ClCompile Include="src\test_tetengo.platform_dependent.text_eX.cpp">
       <Filter>src</Filter>
     </ClCompile>
   </ItemGroup>

diff --git a/library/text/cpp/src/tetengo.text.encoding.cp932.cpp b/library/text/cpp/src/tetengo.text.encoding.cp932.cpp
@@ -8,7 +8,7 @@
 
 #include <boost/core/noncopyable.hpp>
 
-#include <tetengo/platform_dependent/text_encoder.hpp>
+#include <tetengo/platform_dependent/text_encX.hpp>
 #include <tetengo/text/encoding/cp932.hpp>
 
 

diff --git a/precompiled/precompiled.h b/precompiled/precompiled.h
@@ -45,6 +45,7 @@
 #include <map>
 #include <memory>
 #include <mutex>
+#include <numeric>
 #include <optional>
 #include <queue>
 #include <regex>

diff --git a/tools/install_tetengo_library.bat b/tools/install_tetengo_library.bat
@@ -20,15 +20,17 @@ if not ""%INSTALL_PATH%""=="""" (
 
     echo Installing tetengo...
 
-    xcopy /s /i /f /y "%~dp0"..\library\text\c\include\tetengo\text   %INSTALL_PATH%\include\tetengo\text\
-    xcopy /s /i /f /y "%~dp0"..\library\text\cpp\include\tetengo\text %INSTALL_PATH%\include.cpp\tetengo\text\
-
     xcopy /s /i /f /y "%~dp0"..\library\json\c\include\tetengo\json   %INSTALL_PATH%\include\tetengo\json\
     xcopy /s /i /f /y "%~dp0"..\library\json\cpp\include\tetengo\json %INSTALL_PATH%\include.cpp\tetengo\json\
 
     xcopy /s /i /f /y "%~dp0"..\library\lattice\c\include\tetengo\lattice   %INSTALL_PATH%\include\tetengo\lattice\
     xcopy /s /i /f /y "%~dp0"..\library\lattice\cpp\include\tetengo\lattice %INSTALL_PATH%\include.cpp\tetengo\lattice\
 
+    xcopy /s /i /f /y "%~dp0"..\library\platform_dependent\cpp\include\tetengo\platform_dependent %INSTALL_PATH%\include.cpp\tetengo\platform_dependent\
+
+    xcopy /s /i /f /y "%~dp0"..\library\text\c\include\tetengo\text   %INSTALL_PATH%\include\tetengo\text\
+    xcopy /s /i /f /y "%~dp0"..\library\text\cpp\include\tetengo\text %INSTALL_PATH%\include.cpp\tetengo\text\
+
     xcopy /s /i /f /y "%~dp0"..\library\trie\c\include\tetengo\trie   %INSTALL_PATH%\include\tetengo\trie\
     xcopy /s /i /f /y "%~dp0"..\library\trie\cpp\include\tetengo\trie %INSTALL_PATH%\include.cpp\tetengo\trie\
 

diff --git a/tools/make_character_property_map_cpp.bat b/tools/make_character_property_map_cpp.bat
@@ -8,4 +8,4 @@ curl http://www.unicode.org/Public/13.0.0/ucd/auxiliary/GraphemeBreakProperty.tx
 
 python3 %~dp0\make_character_property_map.py %~dp0\EastAsianWidth.txt %~dp0\emoji-data.txt %~dp0\GraphemeBreakProperty.txt %~dp0\character_property_map.txt
 
-python3 %~dp0\make_character_property_map_cpp.py %~dp0\character_property_map.txt %~dp0\..\library\text\cpp\src\tetengo.text.character_property_map.cpp
+python3 %~dp0\make_character_property_map_cpp.py %~dp0\character_property_map.txt %~dp0\..\library\text\cpp\src\tetengo.text.grapheme_splitting.character_property_map.cpp
diff --git a/tools/make_character_property_map_cpp.py b/tools/make_character_property_map_cpp.py
@@ -96,10 +96,10 @@ def make_cpp_source(elements):
 
 #include <cstddef>
 
-#include "tetengo.text.character_property_map.hpp"
+#include "tetengo.text.grapheme_splitting.character_property_map.hpp"
 
 
-namespace tetengo::text
+namespace tetengo::text::grapheme_splitting
 {
 '''
     content += "    const std::size_t character_property_map_size = {};\n\n".format(len(elements))

diff --git a/tools/make_character_property_map_cpp.sh b/tools/make_character_property_map_cpp.sh
@@ -10,4 +10,4 @@ curl http://www.unicode.org/Public/13.0.0/ucd/auxiliary/GraphemeBreakProperty.tx
 
 $TOOLS_DIR/make_character_property_map.py $TOOLS_DIR/EastAsianWidth.txt $TOOLS_DIR/emoji-data.txt $TOOLS_DIR/GraphemeBreakProperty.txt $TOOLS_DIR/character_property_map.txt
 
-$TOOLS_DIR/make_character_property_map_cpp.py $TOOLS_DIR/character_property_map.txt $TOOLS_DIR/../library/text/cpp/src/tetengo.text.character_property_map.cpp
+$TOOLS_DIR/make_character_property_map_cpp.py $TOOLS_DIR/character_property_map.txt $TOOLS_DIR/../library/text/cpp/src/tetengo.text.grapheme_splitting.character_property_map.cpp