From 88c3d8068b1eacd6d08618a422929a55ada3c04b Mon Sep 17 00:00:00 2001 From: Mike Date: Tue, 27 Aug 2019 11:37:20 +0900 Subject: [PATCH] Move core.internal.arrayop.d to core.internal.array/operations.d to join other array-related files --- mak/COPY | 2 +- mak/DOCS | 1 + mak/SRCS | 2 +- mak/WINDOWS | 6 +++--- src/core/internal/{arrayop.d => array/operations.d} | 10 +++++++++- src/object.d | 2 +- 6 files changed, 16 insertions(+), 7 deletions(-) rename src/core/internal/{arrayop.d => array/operations.d} (98%) diff --git a/mak/COPY b/mak/COPY index 3bf5aeac77..b3a6a08981 100644 --- a/mak/COPY +++ b/mak/COPY @@ -22,7 +22,6 @@ COPY=\ $(IMPDIR)\core\vararg.d \ \ $(IMPDIR)\core\internal\abort.d \ - $(IMPDIR)\core\internal\arrayop.d \ $(IMPDIR)\core\internal\atomic.d \ $(IMPDIR)\core\internal\attributes.d \ $(IMPDIR)\core\internal\convert.d \ @@ -43,6 +42,7 @@ COPY=\ $(IMPDIR)\core\internal\array\casting.d \ $(IMPDIR)\core\internal\array\capacity.d \ $(IMPDIR)\core\internal\array\concatenation.d \ + $(IMPDIR)\core\internal\array\operations.d \ $(IMPDIR)\core\internal\array\utils.d \ \ $(IMPDIR)\core\internal\util\array.d \ diff --git a/mak/DOCS b/mak/DOCS index 2fb5f72953..4c0dde73e3 100644 --- a/mak/DOCS +++ b/mak/DOCS @@ -82,6 +82,7 @@ DOCS=\ $(DOCDIR)\core_internal_array_construction.html \ $(DOCDIR)\core_internal_array_equality.html \ $(DOCDIR)\core_internal_array_concatenation.html \ + $(DOCDIR)\core_internal_array_operations.html \ $(DOCDIR)\core_internal_array_utils.html \ $(DOCDIR)\core_internal_util_array.html \ \ diff --git a/mak/SRCS b/mak/SRCS index 9d5bb5b6e9..0e00dd4ada 100644 --- a/mak/SRCS +++ b/mak/SRCS @@ -22,7 +22,6 @@ SRCS=\ src\core\gc\registry.d \ \ src\core\internal\abort.d \ - src\core\internal\arrayop.d \ src\core\internal\atomic.d \ src\core\internal\convert.d \ src\core\internal\dassert.d \ @@ -42,6 +41,7 @@ SRCS=\ src\core\internal\array\casting.d \ src\core\internal\array\capacity.d \ src\core\internal\array\concatenation.d \ + src\core\internal\array\operations.d \ src\core\internal\array\utils.d \ src\core\internal\util\array.d \ \ diff --git a/mak/WINDOWS b/mak/WINDOWS index d5ecb2263e..8c047e0a7d 100644 --- a/mak/WINDOWS +++ b/mak/WINDOWS @@ -120,9 +120,6 @@ $(IMPDIR)\core\gc\registry.d : src\core\gc\registry.d $(IMPDIR)\core\internal\abort.d : src\core\internal\abort.d copy $** $@ -$(IMPDIR)\core\internal\arrayop.d : src\core\internal\arrayop.d - copy $** $@ - $(IMPDIR)\core\internal\atomic.d : src\core\internal\atomic.d copy $** $@ @@ -183,6 +180,9 @@ $(IMPDIR)\core\internal\array\concatenation.d : src\core\internal\array\concaten $(IMPDIR)\core\internal\array\utils.d : src\core\internal\array\utils.d copy $** $@ +$(IMPDIR)\core\internal\array\operations.d : src\core\internal\array\operations.d + copy $** $@ + $(IMPDIR)\core\internal\util\array.d : src\core\internal\util\array.d copy $** $@ diff --git a/src/core/internal/arrayop.d b/src/core/internal/array/operations.d similarity index 98% rename from src/core/internal/arrayop.d rename to src/core/internal/array/operations.d index 57608e1c16..9ba741aabe 100644 --- a/src/core/internal/arrayop.d +++ b/src/core/internal/array/operations.d @@ -1,4 +1,12 @@ -module core.internal.arrayop; +/** + This module contains support array (vector) operations + Copyright: Copyright Digital Mars 2000 - 2019. + License: Distributed under the + $(LINK2 http://www.boost.org/LICENSE_1_0.txt, Boost Software License 1.0). + (See accompanying file LICENSE) + Source: $(DRUNTIMESRC core/_internal/_array/_operations.d) +*/ +module core.internal.array.operations; import core.internal.traits : Filter, staticMap, Unqual; version (GNU) version = GNU_OR_LDC; diff --git a/src/object.d b/src/object.d index 291d1b2f71..3b736f68cc 100644 --- a/src/object.d +++ b/src/object.d @@ -3804,7 +3804,7 @@ enum immutable(void)* rtinfoHasPointers = cast(void*)1; // Compiler hook into the runtime implementation of array (vector) operations. template _arrayOp(Args...) { - import core.internal.arrayop; + import core.internal.array.operations; alias _arrayOp = arrayOp!Args; }