merge

# Conflicts:
#	include/bstl/bstl.hpp
#	src/BigDecimal.cpp
#	src/BigInteger.cpp

CMakeLists.txt

@@ -4,8 +4,8 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
 # 定义源文件
 set(BETTERSTL_SOURCES
-    src/BigInteger.cpp
+        src/big_integer.cpp
-    src/BigDecimal.cpp)
+        src/big_decimal.cpp)
 
 # 生成静态库 (.a 文件)
 add_library(BetterSTL_static STATIC ${BETTERSTL_SOURCES})
@@ -26,12 +26,12 @@ add_library(BetterSTL ALIAS BetterSTL_static)
 
 enable_testing()
 
-add_executable(BigIntegerTests tests/BigIntegerTest.cpp)
+add_executable(BigIntegerTests tests/big_integer_test.cpp)
 target_include_directories(BigIntegerTests PRIVATE include)
 target_link_libraries(BigIntegerTests PRIVATE BetterSTL_static)
 add_test(NAME BigIntegerTests COMMAND BigIntegerTests)
 
-add_executable(BigDecimalTests tests/BigDecimalTest.cpp)
+add_executable(BigDecimalTests tests/big_decimal_test.cpp)
 target_include_directories(BigDecimalTests PRIVATE include)
 target_link_libraries(BigDecimalTests PRIVATE BetterSTL_static)
 add_test(NAME BigDecimalTests COMMAND BigDecimalTests)

include/bstl.hpp

@@ -1,7 +0,0 @@
-#pragma once
-#include<BigDecimal.hpp>
-#include<BigInteger.hpp>
-#include <bstlint.hpp>
-#ifndef BETTERSTL_BSTL_HPP
-#define BETTERSTL_BSTL_HPP
-#endif //BETTERSTL_BSTL_HPP

include/bstl/big_decimal.hpp

@@ -1,11 +1,11 @@
-#pragma once
+#ifndef BETTERSTL_BIG_DECIMAL_H
+#define BETTERSTL_BIG_DECIMAL_H
 
 #include <string>
-#include "BigInteger.hpp"
+#include <bstl/big_integer.hpp>
 
 namespace bstl {
-
+    class BigDecimal {
-class BigDecimal {
 public:
     BigDecimal();
     BigDecimal(int value);
@@ -70,3 +70,5 @@ private:
 };
 
 } // namespace bstl
+
+#endif //BETTERSTL_BIG_DECIMAL_H

include/bstl/big_integer.hpp

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef BETTERSTL_BIG_INTEGER_HPP
+#define BETTERSTL_BIG_INTEGER_HPP
 
 #include <string>
 
@@ -64,6 +65,6 @@ private:
     static std::string divAbs(const std::string& a, const std::string& b);
 };
 
-using BitInteger = BigInteger;
-
 } // namespace bstl
+
+#endif //BETTERSTL_BIG_INTEGER_HPP

include/bstl/big_number.hpp

@@ -0,0 +1,7 @@
+#ifndef BETTERSTL_BIG_NUMBERS_HPP
+#define BETTERSTL_BIG_NUMBERS_HPP
+
+#include <bstl/biginteger.hpp>
+#include <bstl/bigdecimal.hpp>
+
+#endif // BETTERSTL_BIG_NUMBERS_HPP

include/bstl/bstl.hpp

@@ -0,0 +1,8 @@
+#ifndef BETTERSTL_BSTL_HPP
+
+#include<bstl/big_decimal.hpp>
+#include<bstl/big_integer.hpp>
+#include <bstl/bstlint.hpp>
+
+#define BETTERSTL_BSTL_HPP
+#endif //BETTERSTL_BSTL_HPP

include/bstl/bstlint.hpp

@@ -2,7 +2,6 @@
 #define BETTERSTL_BSTLINT_HPP
 
 #include <cstdint>
-#include <>
 
 typedef std::int8_t i8;
 typedef std::int16_t i16;

src/big_decimal.cpp

@@ -1,4 +1,4 @@
-#include "BigDecimal.hpp"
+#include <bstl/big_decimal.hpp>
 
 #include <stdexcept>
 #include <sstream>

src/big_integer.cpp

@@ -1,4 +1,4 @@
-#include "BigInteger.hpp"
+#include <bstl/big_integer.hpp>
 
 #include <algorithm>
 #include <stdexcept>

tests/big_decimal_test.cpp

@@ -1,4 +1,4 @@
-#include <BigDecimal.hpp>
+#include <bstl/big_decimal.hpp>
 
 #include <cassert>
 #include <iostream>

tests/big_integer_test.cpp

@@ -1,4 +1,4 @@
-#include <BigInteger.hpp>
+#include <bstl/big_integer.hpp>
 
 #include <cassert>
 #include <iostream>