Resolve issue #2 and issue #3. Remove dead code. Remove unused files …

…that will not be part of uint128 library. Refactor name violations.
cpsusie · Dec 30, 2020 · 5d3373b · 5d3373b
1 parent d8340b5
commit 5d3373b
Show file tree

Hide file tree

Showing 15 changed files with 295 additions and 2,843 deletions.
diff --git a/cpp/src/WinInt128/WinInt128.vcxproj b/cpp/src/WinInt128/WinInt128.vcxproj
@@ -178,20 +178,15 @@
     <ClCompile Include="..\cpp\uint128.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\headers\boost_uint_compare_test.hpp" />
     <ClInclude Include="..\headers\cjm_numeric_concepts.hpp" />
     <ClInclude Include="..\headers\cjm_string.hpp" />
-    <ClInclude Include="..\headers\fixed_uint.hpp" />
     <ClInclude Include="..\headers\int128_tests.hpp" />
     <ClInclude Include="..\headers\numerics.hpp" />
-    <ClInclude Include="..\headers\streams.hpp" />
     <ClInclude Include="..\headers\testing.hpp" />
     <ClInclude Include="..\headers\uint128.hpp" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\asm\asmops.asm" />
     <None Include="..\headers\cjm_string.inl" />
-    <None Include="..\headers\fixed_uint.inl" />
     <None Include="..\headers\numerics.inl" />
     <None Include="..\headers\uint128.inl" />
   </ItemGroup>

diff --git a/cpp/src/WinInt128/WinInt128.vcxproj.filters b/cpp/src/WinInt128/WinInt128.vcxproj.filters
@@ -29,27 +29,18 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\headers\boost_uint_compare_test.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\headers\cjm_numeric_concepts.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\headers\cjm_string.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\headers\fixed_uint.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\headers\int128_tests.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\headers\numerics.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\headers\streams.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\headers\testing.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -61,18 +52,12 @@
     <None Include="..\headers\cjm_string.inl">
       <Filter>Header Files</Filter>
     </None>
-    <None Include="..\headers\fixed_uint.inl">
-      <Filter>Header Files</Filter>
-    </None>
     <None Include="..\headers\numerics.inl">
       <Filter>Header Files</Filter>
     </None>
     <None Include="..\headers\uint128.inl">
       <Filter>Header Files</Filter>
     </None>
-    <None Include="..\asm\asmops.asm">
-      <Filter>Source Files</Filter>
-    </None>
   </ItemGroup>
   <ItemGroup>
     <Text Include="..\cpp\llvm_int_typedefs.txt">

diff --git a/cpp/src/cpp/int128_tests.cpp b/cpp/src/cpp/int128_tests.cpp
@@ -18,11 +18,14 @@ cjm::uint128_tests::uint128_t cjm::uint128_tests::to_test(const ctrl_uint128_t&
 {
     std::uint64_t low_part = static_cast<std::uint64_t>(convert);
     std::uint64_t high_part = static_cast<std::uint64_t>(convert >> 64);
-    return uint128_t::MakeUint128(high_part, low_part);
+    return uint128_t::make_uint128(high_part, low_part);
 }
 
 void cjm::uint128_tests::execute_uint128_tests()
 {
+    constexpr auto two_fifty_five = 0xff_u128;
+	constexpr auto all_at_ends = 0xff00'0000'0000'0000'0000'0000'0000'0000_u128;
+    static_assert(((two_fifty_five << (15 * 8)) == all_at_ends) && ((all_at_ends >> (15 * 8)) == two_fifty_five));
     print_uint128_eval_mode();
     execute_test(execute_basic_test_one, "basic_test_one"sv);
     execute_test(execute_string_parse_test, "string_parse_text"sv);

diff --git a/cpp/src/cpp/uint128.cpp b/cpp/src/cpp/uint128.cpp
@@ -57,7 +57,7 @@ void cjm::numerics::uint128::instrumented_div_mod(std::basic_ostream<char>& stre
 	stream << "divisor: 0x" << divisor << newl;
 
 	auto denominator = divisor;
-	auto quotient = MakeUint128(0, 0);
+	auto quotient = make_uint128(0, 0);
 
 	stream << "denominator: 0x" << denominator << newl;
 	stream << "quotient: 0x" << quotient << newl;

diff --git a/cpp/src/headers/cjm_numeric_concepts.hpp b/cpp/src/headers/cjm_numeric_concepts.hpp
@@ -86,7 +86,7 @@ namespace cjm::numerics::concepts
     ///     3- be trivially copyable
     /// </summary>
     template<typename To, typename From>
-    concept bit_castable = sizeof(To) == sizeof(From) && alignof(To) == alignof(From)
+    concept bit_castable = sizeof(To) == sizeof(From) 
         && std::is_trivially_copyable_v<To> && std::is_trivially_copyable_v<From> && !std::is_polymorphic_v<To> && !std::is_polymorphic_v<From> && std::is_nothrow_default_constructible_v<To> && std::is_nothrow_default_constructible_v<From>;
 
 

diff --git a/cpp/src/headers/cjm_string.hpp b/cpp/src/headers/cjm_string.hpp
@@ -1,8 +1,11 @@
-#ifndef  cjm_string_hpp
-#define cjm_string_hpp
+#ifndef CJM_STRING_HPP_
+#define CJM_STRING_HPP_
+#include <iostream>
+#include <iomanip>
 #include <string>
 #include <string_view>
 #include <sstream>
+#include <algorithm>
 #include <locale>
 #include "cjm_numeric_concepts.hpp"
 namespace cjm::string
@@ -59,5 +62,5 @@ namespace cjm::string
 
 }
 #include "cjm_string.inl"
-#endif // ! cjm_string_hpp
+#endif // ! CJM_STRING_HPP_
 
diff --git a/cpp/src/headers/cjm_string.inl b/cpp/src/headers/cjm_string.inl
@@ -1,7 +1,6 @@
-#ifndef cjm_string_inl
-#define cjm_string_inl
-#include <algorithm>
-#include <locale>
+#ifndef CJM_STRING_INL_
+#define CJM_STRING_INL_
+
 #include "cjm_string.hpp"
 
 template<typename Char, typename CharTraits, typename Allocator>