Move internal modules in finkel-core

Add and export "Finkel.Core.Internal" module to the "finkel-core" package, move
internally used modules. Modify existing codes to follow the changes.

finkel-core/finkel-core.cabal

@@ -35,16 +35,17 @@ custom-setup
 
 library
   hs-source-dirs:      src
-  exposed-modules:     Paths_finkel_core
-                       Finkel.Core
+  exposed-modules:     Finkel.Core
                        Finkel.Core.Functions
-                       Finkel.Core.Ghc
-                       Finkel.Core.Ghc.Compat
+                       Finkel.Core.Internal
                        Finkel.Prelude
-  other-modules:       Finkel.Core.Stage0
-                       Finkel.Core.Stage1
-                       Finkel.Core.Stage2
-                       Finkel.Core.Ghc.Version
+                       Paths_finkel_core
+  other-modules:       Finkel.Core.Internal.Stage0
+                       Finkel.Core.Internal.Stage1
+                       Finkel.Core.Internal.Stage2
+                       Finkel.Core.Internal.Ghc
+                       Finkel.Core.Internal.Ghc.Compat
+                       Finkel.Core.Internal.Ghc.Version
   autogen-modules:     Paths_finkel_core
   build-depends:       base          >= 4.7   && < 5
                      , ghc           >= 8.2.0 && < 9.3

finkel-core/src/Finkel/Core.fnk

@@ -34,5 +34,5 @@ default, i.e., available without /require/-ing the \"Finkel.Core\" module.")
   case-do cond lcase lefn lept)
 
 ;; Internal
-(import Finkel.Core.Stage1)
-(import Finkel.Core.Stage2)
+(import Finkel.Core.Internal.Stage1)
+(import Finkel.Core.Internal.Stage2)

finkel-core/src/Finkel/Core/Functions.fnk

@@ -45,8 +45,8 @@ with code values when writing macros.")
   (FinkelListException ..) unsafeFinkelSrcError)
 
 ;; Internal
-(import Finkel.Core.Stage0)
-(import Finkel.Core.Stage2)
+(import Finkel.Core.Internal.Stage0)
+(import Finkel.Core.Internal.Stage2)
 
 (:doc$ cxr "The `car' and `cdr' are the basic of /cxr/ functions.
 Rest of the /cxr/ functions are composed from `car' and `cdr'.

finkel-core/src/Finkel/Core/Internal.fnk

@@ -0,0 +1,12 @@
+;;;; For internal types and functions
+
+(:doc "Module to re-export internal types and functions.
+
+The intended usage is for internal use only, from test codes and from the
+@finkel-tool@ package.")
+
+(module Finkel.Core.Internal
+  (:dh1 "For GHC")
+  (module Finkel.Core.Internal.Ghc))
+
+(import Finkel.Core.Internal.Ghc)

finkel-core/src/Finkel/Core/Internal/Ghc.fnk

@@ -0,0 +1,10 @@
+;;;; Module for ghc related functions
+
+(:doc "Internal module for @ghc@ related functions.")
+
+(module Finkel.Core.Internal.Ghc
+  __glasgow_haskell__
+  (module Finkel.Core.Internal.Ghc.Compat))
+
+(import Finkel.Core.Internal.Ghc.Compat)
+(import Finkel.Core.Internal.Ghc.Version)

finkel-core/src/Finkel/Core/Ghc/Compat.hs → finkel-core/src/Finkel/Core/Internal/Ghc/Compat.hs

@@ -1,7 +1,7 @@
 {-# LANGUAGE CPP #-}
 -- Module to re-export functions from ghc
 
-module Finkel.Core.Ghc.Compat
+module Finkel.Core.Internal.Ghc.Compat
   (
     -- GHC
     getModuleInfo, lookupModule, lookupName, modInfoExports,

finkel-core/src/Finkel/Core/Ghc/Version.hs → finkel-core/src/Finkel/Core/Internal/Ghc/Version.hs

@@ -1,6 +1,6 @@
 {-# LANGUAGE CPP #-}
 -- | Wrapper module to export version related functions.
-module Finkel.Core.Ghc.Version
+module Finkel.Core.Internal.Ghc.Version
   ( __glasgow_haskell__
   , getPackageVersion
   ) where
@@ -32,7 +32,7 @@ import GHC.PackageDb          (packageVersion)
 #endif
 
 -- Internal
-import Finkel.Core.Ghc.Compat
+import Finkel.Core.Internal.Ghc.Compat
 
 -- | Function version of @__GLASGOW_HASKELL__@ C preprocessor macro.
 __glasgow_haskell__ :: Int

finkel-core/src/Finkel/Core/Stage0.fnk → finkel-core/src/Finkel/Core/Internal/Stage0.fnk

@@ -1,9 +1,9 @@
 ;;;; Stage0 - functios usd in stage 1.
 
 ;;; This module contains few functions and type to work with `Code', just enough
-;;; to define some macros in the next `Finkel.Core.Stage1' module.
+;;; to define some macros in the next `Finkel.Core.Internal.Stage1' module.
 
-(module Finkel.Core.Stage0
+(module Finkel.Core.Internal.Stage0
   ;; Exported from other modules.
   (FinkelListException ..) car cdr cons
 

finkel-core/src/Finkel/Core/Stage1.fnk → finkel-core/src/Finkel/Core/Internal/Stage1.fnk

@@ -4,7 +4,7 @@
 ;;; `defmodule', `eval-when', `macrolet' ... etc, just enough to start writing
 ;;; other macros and function in `Finkel.Core.Stage2'.
 
-(module Finkel.Core.Stage1
+(module Finkel.Core.Internal.Stage1
   defmacro defmacro' defmacro-
   defmacroM defmacroM' defmacroM-
   macrolet macroletM
@@ -20,8 +20,8 @@
 (import Language.Finkel)
 
 ;; Internal
-(import Finkel.Core.Stage0)
-(import Finkel.Core.Ghc.Compat)
+(import Finkel.Core.Internal.Stage0)
+(import Finkel.Core.Internal.Ghc.Compat)
 
 
 ;;; [Internally used macros]

finkel-core/src/Finkel/Core/Stage2.fnk → finkel-core/src/Finkel/Core/Internal/Stage2.fnk

@@ -3,9 +3,9 @@
 %p(LANGUAGE FlexibleInstances
             TypeSynonymInstances)
 
-(:require Finkel.Core.Stage1)
+(:require Finkel.Core.Internal.Stage1)
 
-(module Finkel.Core.Stage2
+(module Finkel.Core.Internal.Stage2
   ;; Macros
   defmodule
   macroexpand macroexpand-1
@@ -53,9 +53,9 @@
 (import Language.Finkel.Form (mkLocatedForm))
 
 ;; Internal
-(import Finkel.Core.Stage0)
-(import Finkel.Core.Ghc.Version)
-(import Finkel.Core.Ghc.Compat)
+(import Finkel.Core.Internal.Stage0)
+(import Finkel.Core.Internal.Ghc.Version)
+(import Finkel.Core.Internal.Ghc.Compat)
 
 
 ;;; ------------------------------------------------------------------------

finkel-core/test/CoreTest.fnk

@@ -29,8 +29,7 @@
    ;; finkel-core
    (Finkel.Core)
    (Finkel.Core.Functions [cadr])
-   (Finkel.Core.Ghc)
-   (Finkel.Core.Ghc.Compat)
+   (Finkel.Core.Internal)
 
    ;; Internal
    (TestAux)))

finkel-core/test/FunctionTest.fnk

@@ -8,7 +8,7 @@
           listTests)
   (require
    ;; finkel-core
-   (Finkel.Core.Ghc))
+   (Finkel.Core.Internal))
   (import
    ;; base
    (Data.List [isSubsequenceOf])

finkel-core/test/Orphan.fnk

@@ -20,7 +20,7 @@
    (Language.Finkel.Form)
 
    ;; finkel-core
-   (Finkel.Core.Ghc.Compat)))
+   (Finkel.Core.Internal)))
 
 (instance (Arbitrary Atom)
   (defn arbitrary

finkel-core/test/TestAux.fnk

@@ -31,7 +31,7 @@
 
    ;; finkel-core
    (Finkel.Prelude)
-   (Finkel.Core.Ghc.Compat)))
+   (Finkel.Core.Internal)))
 
 ;;; Types
 

finkel-tool/src/Finkel/Tool/Internal/Macro/Ghc.fnk

@@ -10,7 +10,7 @@
 
    ;; finkel-core
    (Finkel.Prelude)
-   (Finkel.Core.Ghc [__glasgow_haskell__])))
+   (Finkel.Core.Internal [__glasgow_haskell__])))
 
 ;;; Module name aliases