diff --git a/pkg/hs/stack.yaml b/pkg/hs/stack.yaml index 5f0e9fa191..c18632ee35 100644 --- a/pkg/hs/stack.yaml +++ b/pkg/hs/stack.yaml @@ -7,7 +7,6 @@ packages: - urbit-atom - urbit-azimuth - urbit-king - - urbit-integer-simple extra-deps: - flat-0.3.4@sha256:002a0e0ae656ea8cc02a772d0bcb6ea7dbd7f2e79070959cc748ad1e7138eb38 diff --git a/pkg/hs/urbit-integer-simple/Urbit/Integer.hs b/pkg/hs/urbit-atom/lib/Urbit/Atom/Simple.hs similarity index 95% rename from pkg/hs/urbit-integer-simple/Urbit/Integer.hs rename to pkg/hs/urbit-atom/lib/Urbit/Atom/Simple.hs index f2df829871..6f72df6533 100644 --- a/pkg/hs/urbit-integer-simple/Urbit/Integer.hs +++ b/pkg/hs/urbit-atom/lib/Urbit/Atom/Simple.hs @@ -16,7 +16,7 @@ #include "MachDeps.h" -module Urbit.Integer ( +module Urbit.Atom.Simple ( Integer, mkInteger, smallInteger, wordToInteger, integerToWord, integerToInt, #if WORD_SIZE_IN_BITS < 64 @@ -38,5 +38,5 @@ module Urbit.Integer ( hashInteger, ) where -import Urbit.Integer.Type +import Urbit.Atom.Simple.Type diff --git a/pkg/hs/urbit-integer-simple/Urbit/Integer/Simple/Internals.hs b/pkg/hs/urbit-atom/lib/Urbit/Atom/Simple/Internals.hs similarity index 74% rename from pkg/hs/urbit-integer-simple/Urbit/Integer/Simple/Internals.hs rename to pkg/hs/urbit-atom/lib/Urbit/Atom/Simple/Internals.hs index 508b1eeefd..829655ec13 100644 --- a/pkg/hs/urbit-integer-simple/Urbit/Integer/Simple/Internals.hs +++ b/pkg/hs/urbit-atom/lib/Urbit/Atom/Simple/Internals.hs @@ -3,7 +3,7 @@ ----------------------------------------------------------------------------- -- | --- Module : Urbit.Integer.Simple.Internals +-- Module : Urbit.Atom.Simple.Internals -- Copyright : (c) Ian Lynagh 2007-2008 -- License : BSD3 -- @@ -15,9 +15,9 @@ -- ----------------------------------------------------------------------------- -module Urbit.Integer.Simple.Internals ( - module Urbit.Integer.Type +module Urbit.Atom.Simple.Internals ( + module Urbit.Atom.Simple.Type ) where -import Urbit.Integer.Type +import Urbit.Atom.Simple.Type diff --git a/pkg/hs/urbit-integer-simple/Urbit/Integer/Logarithms.hs b/pkg/hs/urbit-atom/lib/Urbit/Atom/Simple/Logarithms.hs similarity index 91% rename from pkg/hs/urbit-integer-simple/Urbit/Integer/Logarithms.hs rename to pkg/hs/urbit-atom/lib/Urbit/Atom/Simple/Logarithms.hs index 1d34fe2659..cdf2e9a538 100644 --- a/pkg/hs/urbit-integer-simple/Urbit/Integer/Logarithms.hs +++ b/pkg/hs/urbit-atom/lib/Urbit/Atom/Simple/Logarithms.hs @@ -1,13 +1,13 @@ {-# LANGUAGE MagicHash, UnboxedTuples, NoImplicitPrelude #-} -module Urbit.Integer.Logarithms +module Urbit.Atom.Simple.Logarithms ( integerLogBase# , integerLog2# , wordLog2# ) where import GHC.Prim -import Urbit.Integer -import qualified Urbit.Integer.Logarithms.Internals as I +import Urbit.Atom.Simple +import qualified Urbit.Atom.Simple.Logarithms.Internals as I -- | Calculate the integer logarithm for an arbitrary base. -- The base must be greater than 1, the second argument, the number diff --git a/pkg/hs/urbit-integer-simple/Urbit/Integer/Logarithms/Internals.hs b/pkg/hs/urbit-atom/lib/Urbit/Atom/Simple/Logarithms/Internals.hs similarity index 98% rename from pkg/hs/urbit-integer-simple/Urbit/Integer/Logarithms/Internals.hs rename to pkg/hs/urbit-atom/lib/Urbit/Atom/Simple/Logarithms/Internals.hs index c3cee3df78..8e448b37e9 100644 --- a/pkg/hs/urbit-integer-simple/Urbit/Integer/Logarithms/Internals.hs +++ b/pkg/hs/urbit-atom/lib/Urbit/Atom/Simple/Logarithms/Internals.hs @@ -10,7 +10,7 @@ -- Since they are needed in Urbit.Float, we must expose this -- module, but it should not show up in the docs. -module Urbit.Integer.Logarithms.Internals +module Urbit.Atom.Simple.Logarithms.Internals ( integerLog2# , integerLog2IsPowerOf2# , wordLog2# @@ -18,7 +18,7 @@ module Urbit.Integer.Logarithms.Internals ) where import GHC.Prim -import Urbit.Integer.Type +import Urbit.Atom.Simple.Type import GHC.Types default () diff --git a/pkg/hs/urbit-integer-simple/Urbit/Integer/Type.hs b/pkg/hs/urbit-atom/lib/Urbit/Atom/Simple/Type.hs similarity index 99% rename from pkg/hs/urbit-integer-simple/Urbit/Integer/Type.hs rename to pkg/hs/urbit-atom/lib/Urbit/Atom/Simple/Type.hs index 9a2943a3b3..01b98b0711 100644 --- a/pkg/hs/urbit-integer-simple/Urbit/Integer/Type.hs +++ b/pkg/hs/urbit-atom/lib/Urbit/Atom/Simple/Type.hs @@ -24,7 +24,7 @@ #include "MachDeps.h" -module Urbit.Integer.Type where +module Urbit.Atom.Simple.Type where import GHC.Prim import GHC.Classes diff --git a/pkg/hs/urbit-integer-simple/LICENSE b/pkg/hs/urbit-integer-simple/LICENSE deleted file mode 100644 index 7b87ed8855..0000000000 --- a/pkg/hs/urbit-integer-simple/LICENSE +++ /dev/null @@ -1,26 +0,0 @@ -Copyright (c) Ian Lynagh, 2007-2008. -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: -1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. -2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. -3. Neither the name of the author nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -SUCH DAMAGE. diff --git a/pkg/hs/urbit-integer-simple/Setup.hs b/pkg/hs/urbit-integer-simple/Setup.hs deleted file mode 100644 index 6fa548caf7..0000000000 --- a/pkg/hs/urbit-integer-simple/Setup.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Main (main) where - -import Distribution.Simple - -main :: IO () -main = defaultMain diff --git a/pkg/hs/urbit-integer-simple/urbit-integer-simple.cabal b/pkg/hs/urbit-integer-simple/urbit-integer-simple.cabal deleted file mode 100644 index b7da3fd5d1..0000000000 --- a/pkg/hs/urbit-integer-simple/urbit-integer-simple.cabal +++ /dev/null @@ -1,23 +0,0 @@ -name: urbit-integer-simple -version: 0.1.1.1 -license: BSD3 -license-file: LICENSE -maintainer: igloo@earth.li -synopsis: Simple Integer library -description: - This package contains an simple Integer library. -cabal-version: >=1.10 -build-type: Simple - -Library - default-language: Haskell2010 - - build-depends: ghc-prim - exposed-modules: Urbit.Integer - Urbit.Integer.Simple.Internals - Urbit.Integer.Logarithms - Urbit.Integer.Logarithms.Internals - other-modules: Urbit.Integer.Type - default-extensions: CPP, MagicHash, BangPatterns, UnboxedTuples, - UnliftedFFITypes, NoImplicitPrelude - ghc-options: -Wall