From ad09fe3a94e539993a111046a154169c2b4d4e80 Mon Sep 17 00:00:00 2001 From: Yuriy Glukhov Date: Tue, 8 May 2018 16:51:55 +0300 Subject: [PATCH] Corrected package structure --- benchmarks/bench_mod.nim | 2 +- src/stint.nim => stint.nim | 4 ++-- stint.nimble | 3 +-- {src => stint}/int_public.nim | 0 {src => stint}/io.nim | 0 {src => stint}/private/as_signed_words.nim | 0 {src => stint}/private/as_words.nim | 0 {src => stint}/private/bithacks.nim | 0 {src => stint}/private/conversion.nim | 0 {src => stint}/private/datatypes.nim | 0 {src => stint}/private/initialization.nim | 0 {src => stint}/private/int_addsub.nim | 0 {src => stint}/private/int_bitwise_ops.nim | 0 {src => stint}/private/int_comparison.nim | 0 {src => stint}/private/int_div.nim | 0 {src => stint}/private/int_highlow.nim | 0 {src => stint}/private/int_mul.nim | 0 {src => stint}/private/int_negabs.nim | 0 {src => stint}/private/stdlib_bitops.nim | 0 {src => stint}/private/uint_addsub.nim | 0 {src => stint}/private/uint_bitwise_ops.nim | 0 {src => stint}/private/uint_comparison.nim | 0 {src => stint}/private/uint_div.nim | 0 {src => stint}/private/uint_highlow.nim | 0 {src => stint}/private/uint_mul.nim | 0 {src => stint}/uint_public.nim | 0 tests/internal_uint_div.nim | 2 +- tests/property_based.nim | 2 +- tests/property_based_uint256.nim | 2 +- tests/test_int_addsub.nim | 2 +- tests/test_int_comparison.nim | 2 +- tests/test_int_endianness.nim | 2 +- tests/test_int_muldiv.nim | 2 +- tests/test_io.nim | 2 +- tests/test_uint_addsub.nim | 2 +- tests/test_uint_bitwise.nim | 2 +- tests/test_uint_comparison.nim | 2 +- tests/test_uint_endianness.nim | 2 +- tests/test_uint_muldiv.nim | 2 +- tests/ttmath_compat.nim | 2 +- 40 files changed, 18 insertions(+), 19 deletions(-) rename src/stint.nim => stint.nim (93%) rename {src => stint}/int_public.nim (100%) rename {src => stint}/io.nim (100%) rename {src => stint}/private/as_signed_words.nim (100%) rename {src => stint}/private/as_words.nim (100%) rename {src => stint}/private/bithacks.nim (100%) rename {src => stint}/private/conversion.nim (100%) rename {src => stint}/private/datatypes.nim (100%) rename {src => stint}/private/initialization.nim (100%) rename {src => stint}/private/int_addsub.nim (100%) rename {src => stint}/private/int_bitwise_ops.nim (100%) rename {src => stint}/private/int_comparison.nim (100%) rename {src => stint}/private/int_div.nim (100%) rename {src => stint}/private/int_highlow.nim (100%) rename {src => stint}/private/int_mul.nim (100%) rename {src => stint}/private/int_negabs.nim (100%) rename {src => stint}/private/stdlib_bitops.nim (100%) rename {src => stint}/private/uint_addsub.nim (100%) rename {src => stint}/private/uint_bitwise_ops.nim (100%) rename {src => stint}/private/uint_comparison.nim (100%) rename {src => stint}/private/uint_div.nim (100%) rename {src => stint}/private/uint_highlow.nim (100%) rename {src => stint}/private/uint_mul.nim (100%) rename {src => stint}/uint_public.nim (100%) diff --git a/benchmarks/bench_mod.nim b/benchmarks/bench_mod.nim index f09fc6c..95c0d07 100644 --- a/benchmarks/bench_mod.nim +++ b/benchmarks/bench_mod.nim @@ -1,4 +1,4 @@ -import ../src/mpint, times +import ../stint/mpint, times # Warmup on normal int diff --git a/src/stint.nim b/stint.nim similarity index 93% rename from src/stint.nim rename to stint.nim index d201ed5..925453b 100644 --- a/src/stint.nim +++ b/stint.nim @@ -7,8 +7,8 @@ # # at your option. This file may not be copied, modified, or distributed except according to those terms. -import ./uint_public, ./int_public, ./io -export uint_public, int_public, io +import stint/[uint_public, int_public, io] +export uint_public, int_public, io type Int128* = Stint[128] diff --git a/stint.nimble b/stint.nimble index f74c9ef..d043285 100644 --- a/stint.nimble +++ b/stint.nimble @@ -3,8 +3,7 @@ version = "0.0.1" author = "Status Research & Development GmbH" description = "Efficient stack-based multiprecision int in Nim" license = "Apache License 2.0 or MIT" -srcDir = "src" - +skipDirs = @["tests", "benchmarks"] ### Dependencies # TODO remove quicktest and ttmath test only requirements: https://github.com/nim-lang/nimble/issues/482 diff --git a/src/int_public.nim b/stint/int_public.nim similarity index 100% rename from src/int_public.nim rename to stint/int_public.nim diff --git a/src/io.nim b/stint/io.nim similarity index 100% rename from src/io.nim rename to stint/io.nim diff --git a/src/private/as_signed_words.nim b/stint/private/as_signed_words.nim similarity index 100% rename from src/private/as_signed_words.nim rename to stint/private/as_signed_words.nim diff --git a/src/private/as_words.nim b/stint/private/as_words.nim similarity index 100% rename from src/private/as_words.nim rename to stint/private/as_words.nim diff --git a/src/private/bithacks.nim b/stint/private/bithacks.nim similarity index 100% rename from src/private/bithacks.nim rename to stint/private/bithacks.nim diff --git a/src/private/conversion.nim b/stint/private/conversion.nim similarity index 100% rename from src/private/conversion.nim rename to stint/private/conversion.nim diff --git a/src/private/datatypes.nim b/stint/private/datatypes.nim similarity index 100% rename from src/private/datatypes.nim rename to stint/private/datatypes.nim diff --git a/src/private/initialization.nim b/stint/private/initialization.nim similarity index 100% rename from src/private/initialization.nim rename to stint/private/initialization.nim diff --git a/src/private/int_addsub.nim b/stint/private/int_addsub.nim similarity index 100% rename from src/private/int_addsub.nim rename to stint/private/int_addsub.nim diff --git a/src/private/int_bitwise_ops.nim b/stint/private/int_bitwise_ops.nim similarity index 100% rename from src/private/int_bitwise_ops.nim rename to stint/private/int_bitwise_ops.nim diff --git a/src/private/int_comparison.nim b/stint/private/int_comparison.nim similarity index 100% rename from src/private/int_comparison.nim rename to stint/private/int_comparison.nim diff --git a/src/private/int_div.nim b/stint/private/int_div.nim similarity index 100% rename from src/private/int_div.nim rename to stint/private/int_div.nim diff --git a/src/private/int_highlow.nim b/stint/private/int_highlow.nim similarity index 100% rename from src/private/int_highlow.nim rename to stint/private/int_highlow.nim diff --git a/src/private/int_mul.nim b/stint/private/int_mul.nim similarity index 100% rename from src/private/int_mul.nim rename to stint/private/int_mul.nim diff --git a/src/private/int_negabs.nim b/stint/private/int_negabs.nim similarity index 100% rename from src/private/int_negabs.nim rename to stint/private/int_negabs.nim diff --git a/src/private/stdlib_bitops.nim b/stint/private/stdlib_bitops.nim similarity index 100% rename from src/private/stdlib_bitops.nim rename to stint/private/stdlib_bitops.nim diff --git a/src/private/uint_addsub.nim b/stint/private/uint_addsub.nim similarity index 100% rename from src/private/uint_addsub.nim rename to stint/private/uint_addsub.nim diff --git a/src/private/uint_bitwise_ops.nim b/stint/private/uint_bitwise_ops.nim similarity index 100% rename from src/private/uint_bitwise_ops.nim rename to stint/private/uint_bitwise_ops.nim diff --git a/src/private/uint_comparison.nim b/stint/private/uint_comparison.nim similarity index 100% rename from src/private/uint_comparison.nim rename to stint/private/uint_comparison.nim diff --git a/src/private/uint_div.nim b/stint/private/uint_div.nim similarity index 100% rename from src/private/uint_div.nim rename to stint/private/uint_div.nim diff --git a/src/private/uint_highlow.nim b/stint/private/uint_highlow.nim similarity index 100% rename from src/private/uint_highlow.nim rename to stint/private/uint_highlow.nim diff --git a/src/private/uint_mul.nim b/stint/private/uint_mul.nim similarity index 100% rename from src/private/uint_mul.nim rename to stint/private/uint_mul.nim diff --git a/src/uint_public.nim b/stint/uint_public.nim similarity index 100% rename from src/uint_public.nim rename to stint/uint_public.nim diff --git a/tests/internal_uint_div.nim b/tests/internal_uint_div.nim index 1ed2fc9..b9b405d 100644 --- a/tests/internal_uint_div.nim +++ b/tests/internal_uint_div.nim @@ -9,7 +9,7 @@ # Test implementation of internal proc: -include ../src/private/uint_div +include ../stint/private/uint_div import unittest suite "implementation of internal division procecures": diff --git a/tests/property_based.nim b/tests/property_based.nim index a903afc..e77f1e3 100644 --- a/tests/property_based.nim +++ b/tests/property_based.nim @@ -7,7 +7,7 @@ # # at your option. This file may not be copied, modified, or distributed except according to those terms. -import ../src/stint, unittest, quicktest +import ../stint, unittest, quicktest const itercount = 1000 diff --git a/tests/property_based_uint256.nim b/tests/property_based_uint256.nim index 7966886..1688fdd 100644 --- a/tests/property_based_uint256.nim +++ b/tests/property_based_uint256.nim @@ -10,7 +10,7 @@ # Requires "https://github.com/status-im/nim-ttmath#master" # Note that currently importing both Stint and TTMath will crash the compiler for unknown reason -import ../src/stint, unittest, quicktest, ttmath_compat +import ../stint, unittest, quicktest, ttmath_compat const itercount = 10_000 diff --git a/tests/test_int_addsub.nim b/tests/test_int_addsub.nim index 5814530..182d50e 100644 --- a/tests/test_int_addsub.nim +++ b/tests/test_int_addsub.nim @@ -7,7 +7,7 @@ # # at your option. This file may not be copied, modified, or distributed except according to those terms. -import ../src/stint, unittest +import ../stint, unittest suite "Testing signed addition implementation": test "In-place addition gives expected result": diff --git a/tests/test_int_comparison.nim b/tests/test_int_comparison.nim index ae7cdc1..5ab3f20 100644 --- a/tests/test_int_comparison.nim +++ b/tests/test_int_comparison.nim @@ -7,7 +7,7 @@ # # at your option. This file may not be copied, modified, or distributed except according to those terms. -import ../src/stint, unittest +import ../stint, unittest suite "Signed int - Testing comparison operators": let diff --git a/tests/test_int_endianness.nim b/tests/test_int_endianness.nim index 8d65fe9..0b6f591 100644 --- a/tests/test_int_endianness.nim +++ b/tests/test_int_endianness.nim @@ -7,7 +7,7 @@ # # at your option. This file may not be copied, modified, or distributed except according to those terms. -import ../src/stint, unittest +import ../stint, unittest suite "Testing signed int byte representation": test "Byte representation conforms to the platform endianness": diff --git a/tests/test_int_muldiv.nim b/tests/test_int_muldiv.nim index 052d113..3e9022a 100644 --- a/tests/test_int_muldiv.nim +++ b/tests/test_int_muldiv.nim @@ -7,7 +7,7 @@ # # at your option. This file may not be copied, modified, or distributed except according to those terms. -import ../src/stint, unittest +import ../stint, unittest suite "Testing signed int multiplication implementation": test "Multiplication with result fitting in low half": diff --git a/tests/test_io.nim b/tests/test_io.nim index b85478f..617ae04 100644 --- a/tests/test_io.nim +++ b/tests/test_io.nim @@ -7,7 +7,7 @@ # # at your option. This file may not be copied, modified, or distributed except according to those terms. -import ../src/stint, unittest, strutils +import ../stint, unittest, strutils suite "Testing input and output procedures": test "Creation from decimal strings": diff --git a/tests/test_uint_addsub.nim b/tests/test_uint_addsub.nim index 50b6b43..b3629b7 100644 --- a/tests/test_uint_addsub.nim +++ b/tests/test_uint_addsub.nim @@ -7,7 +7,7 @@ # # at your option. This file may not be copied, modified, or distributed except according to those terms. -import ../src/stint, unittest +import ../stint, unittest suite "Testing unsigned int addition implementation": test "In-place addition gives expected result": diff --git a/tests/test_uint_bitwise.nim b/tests/test_uint_bitwise.nim index 6bdc286..406e74c 100644 --- a/tests/test_uint_bitwise.nim +++ b/tests/test_uint_bitwise.nim @@ -7,7 +7,7 @@ # # at your option. This file may not be copied, modified, or distributed except according to those terms. -import ../src/stint, unittest +import ../stint, unittest suite "Testing unsigned int bitwise operations": let a = 100'i16.stuint(16) diff --git a/tests/test_uint_comparison.nim b/tests/test_uint_comparison.nim index 1203865..274da04 100644 --- a/tests/test_uint_comparison.nim +++ b/tests/test_uint_comparison.nim @@ -7,7 +7,7 @@ # # at your option. This file may not be copied, modified, or distributed except according to those terms. -import ../src/stint, unittest +import ../stint, unittest suite "Testing unsigned int comparison operators": let diff --git a/tests/test_uint_endianness.nim b/tests/test_uint_endianness.nim index ad387b4..f417ec9 100644 --- a/tests/test_uint_endianness.nim +++ b/tests/test_uint_endianness.nim @@ -7,7 +7,7 @@ # # at your option. This file may not be copied, modified, or distributed except according to those terms. -import ../src/stint, unittest +import ../stint, unittest suite "Testing unsigned int byte representation": test "Byte representation conforms to the platform endianness": diff --git a/tests/test_uint_muldiv.nim b/tests/test_uint_muldiv.nim index 1dd466c..5db8ff3 100644 --- a/tests/test_uint_muldiv.nim +++ b/tests/test_uint_muldiv.nim @@ -7,7 +7,7 @@ # # at your option. This file may not be copied, modified, or distributed except according to those terms. -import ../src/stint, unittest +import ../stint, unittest suite "Testing unsigned int multiplication implementation": test "Multiplication with result fitting in low half": diff --git a/tests/ttmath_compat.nim b/tests/ttmath_compat.nim index 5d0803c..29101dd 100644 --- a/tests/ttmath_compat.nim +++ b/tests/ttmath_compat.nim @@ -1,4 +1,4 @@ -import ../src/stint, ttmath +import ../stint, ttmath export ttmath template asSt*(val: UInt): auto =