git.iko.soy/Idris-dev
on master help sign in
Moved libraries around, removed 'effects' flag

In preparation for reorganising the prelude

commit40924dcc80446c58aae3380e1f0651d2e8addf9a authorEdwin Brady <ecb10@st-andrews.ac.uk> dateWed 20 Nov 2013, 17:38 (13 years ago) parent3e2141b
75 files changed+8−27
compare with master
unifiedsplit
Makefile+1−3 Setup.hs+5−18 idris.cabal−4 lib/Builtins.idr → libs/base/Builtins.idr lib/Control/Arrow.idr → libs/base/Control/Arrow.idr lib/Control/Catchable.idr → libs/base/Control/Catchable.idr lib/Control/Category.idr → libs/base/Control/Category.idr lib/Control/IOExcept.idr → libs/base/Control/IOExcept.idr lib/Control/Monad/Identity.idr → libs/base/Control/Monad/Identity.idr lib/Control/Monad/RWS.idr → libs/base/Control/Monad/RWS.idr lib/Control/Monad/Reader.idr → libs/base/Control/Monad/Reader.idr lib/Control/Monad/State.idr → libs/base/Control/Monad/State.idr lib/Control/Monad/Writer.idr → libs/base/Control/Monad/Writer.idr lib/Data/Bits.idr → libs/base/Data/Bits.idr lib/Data/BoundedList.idr → libs/base/Data/BoundedList.idr lib/Data/Complex.idr → libs/base/Data/Complex.idr lib/Data/Floats.idr → libs/base/Data/Floats.idr lib/Data/HVect.idr → libs/base/Data/HVect.idr lib/Data/Mod2.idr → libs/base/Data/Mod2.idr lib/Data/Morphisms.idr → libs/base/Data/Morphisms.idr lib/Data/Sign.idr → libs/base/Data/Sign.idr lib/Data/SortedMap.idr → libs/base/Data/SortedMap.idr lib/Data/SortedSet.idr → libs/base/Data/SortedSet.idr lib/Data/Vect.idr → libs/base/Data/Vect.idr lib/Data/Vect/Quantifiers.idr → libs/base/Data/Vect/Quantifiers.idr lib/Data/ZZ.idr → libs/base/Data/ZZ.idr lib/Debug/Trace.idr → libs/base/Debug/Trace.idr lib/Decidable/Decidable.idr → libs/base/Decidable/Decidable.idr lib/Decidable/Equality.idr → libs/base/Decidable/Equality.idr lib/Decidable/Order.idr → libs/base/Decidable/Order.idr lib/IO.idr → libs/base/IO.idr lib/Language/Reflection.idr → libs/base/Language/Reflection.idr lib/Language/Reflection/Errors.idr → libs/base/Language/Reflection/Errors.idr lib/Language/Reflection/Utils.idr → libs/base/Language/Reflection/Utils.idr lib/Makefile → libs/base/Makefile lib/Network/Cgi.idr → libs/base/Network/Cgi.idr lib/Prelude.idr → libs/base/Prelude.idr lib/Prelude/Algebra.idr → libs/base/Prelude/Algebra.idr lib/Prelude/Applicative.idr → libs/base/Prelude/Applicative.idr lib/Prelude/Bits.idr → libs/base/Prelude/Bits.idr lib/Prelude/Cast.idr → libs/base/Prelude/Cast.idr lib/Prelude/Chars.idr → libs/base/Prelude/Chars.idr lib/Prelude/Either.idr → libs/base/Prelude/Either.idr lib/Prelude/Fin.idr → libs/base/Prelude/Fin.idr lib/Prelude/Foldable.idr → libs/base/Prelude/Foldable.idr lib/Prelude/Functor.idr → libs/base/Prelude/Functor.idr lib/Prelude/Heap.idr → libs/base/Prelude/Heap.idr lib/Prelude/List.idr → libs/base/Prelude/List.idr lib/Prelude/Maybe.idr → libs/base/Prelude/Maybe.idr lib/Prelude/Monad.idr → libs/base/Prelude/Monad.idr lib/Prelude/Nat.idr → libs/base/Prelude/Nat.idr lib/Prelude/Stream.idr → libs/base/Prelude/Stream.idr lib/Prelude/Strings.idr → libs/base/Prelude/Strings.idr lib/Prelude/Traversable.idr → libs/base/Prelude/Traversable.idr lib/Prelude/Vect.idr → libs/base/Prelude/Vect.idr lib/Providers.idr → libs/base/Providers.idr lib/System.idr → libs/base/System.idr lib/System/Concurrency/Process.idr → libs/base/System/Concurrency/Process.idr lib/System/Concurrency/Raw.idr → libs/base/System/Concurrency/Raw.idr lib/Uninhabited.idr → libs/base/Uninhabited.idr lib/base.ipkg → libs/base/base.ipkg effects/Effect/Exception.idr → libs/effects/Effect/Exception.idr effects/Effect/File.idr → libs/effects/Effect/File.idr effects/Effect/Memory.idr → libs/effects/Effect/Memory.idr effects/Effect/Random.idr → libs/effects/Effect/Random.idr effects/Effect/Select.idr → libs/effects/Effect/Select.idr effects/Effect/State.idr → libs/effects/Effect/State.idr effects/Effect/StdIO.idr → libs/effects/Effect/StdIO.idr effects/Effects.idr → libs/effects/Effects.idr effects/Makefile → libs/effects/Makefile effects/effects.ipkg → libs/effects/effects.ipkg+1−1 javascript/JavaScript.idr → libs/javascript/JavaScript.idr javascript/JavaScript/JSON.idr → libs/javascript/JavaScript/JSON.idr javascript/Makefile → libs/javascript/Makefile javascript/javascript.ipkg → libs/javascript/javascript.ipkg+1−1
Makefile+1−3
@@ -28,9 +28,7 @@ test_all:
2828 $(MAKE) test_java
2929
3030lib_clean:
31− $(MAKE) -C lib IDRIS=../dist/build/idris/idris RTS=../dist/build/rts/libidris_rts clean
32− $(MAKE) -C effects IDRIS=../dist/build/idris/idris RTS=../dist/build/rts/libidris_rts DIST=../dist/build clean
33− $(MAKE) -C javascript IDRIS=../dist/build/idris/idris RTS=../dist/build/rts/libidris_rts DIST=../dist/build clean
31+ $(MAKE) -C libs IDRIS=../../dist/build/idris/idris RTS=../../dist/build/rts/libidris_rts clean
3432
3533relib: lib_clean
3634 $(CABAL) install $(CABALFLAGS)
Setup.hs+5−18
@@ -26,9 +26,9 @@ import qualified Data.Text.IO as TIO
2626-- make on mingw32 exepects unix style separators
2727#ifdef mingw32_HOST_OS
2828(<//>) = (Px.</>)
29−idrisCmd local = Px.joinPath $ splitDirectories $ ".." <//> buildDir local <//> "idris" <//> "idris"
29+idrisCmd local = Px.joinPath $ splitDirectories $ ".." <//> ".." <//> buildDir local <//> "idris" <//> "idris"
3030#else
31−idrisCmd local = ".." </> buildDir local </> "idris" </> "idris"
31+idrisCmd local = ".." </> ".." </> buildDir local </> "idris" </> "idris"
3232#endif
3333
3434-- -----------------------------------------------------------------------------
@@ -53,13 +53,6 @@ usesLLVM flags =
5353 Just False -> False
5454 Nothing -> True
5555
56−usesEffects :: S.ConfigFlags -> Bool
57−usesEffects flags =
58− case lookup (FlagName "effects") (S.configConfigurationsFlags flags) of
59− Just True -> True
60− Just False -> False
61− Nothing -> True
62−
6356-- -----------------------------------------------------------------------------
6457-- Clean
6558
@@ -70,9 +63,7 @@ idrisClean _ flags _ _ = do
7063 verbosity = S.fromFlag $ S.cleanVerbosity flags
7164
7265 cleanStdLib = do
73− makeClean "lib"
74− makeClean "effects"
75− makeClean "javascript"
66+ makeClean "libs"
7667
7768 cleanLLVM = makeClean "llvm"
7869
@@ -106,9 +97,7 @@ idrisBuild _ flags _ local = do
10697
10798 buildStdLib = do
10899 putStrLn "Building libraries..."
109− makeBuild "lib"
110− when (usesEffects $ configFlags local) $ makeBuild "effects"
111− makeBuild "javascript"
100+ makeBuild "libs"
112101 where
113102 makeBuild dir = make verbosity [ "-C", dir, "build" , "IDRIS=" ++ idrisCmd local]
114103
@@ -128,9 +117,7 @@ idrisInstall verbosity copy pkg local = do
128117
129118 installStdLib = do
130119 putStrLn $ "Installing libraries in " ++ target
131− makeInstall "lib" target
132− when (usesEffects $ configFlags local) $ makeInstall "effects" target
133− makeInstall "javascript" target
120+ makeInstall "libs" target
134121
135122 installRTS = do
136123 let target' = target </> "rts"
idris.cabal−4
@@ -284,10 +284,6 @@ source-repository head
284284 type: git
285285 location: git://github.com/idris-lang/Idris-dev.git
286286
287−Flag Effects
288− Description: Build the effects package
289− Default: True
290−
291287Flag LLVM
292288 Description: Build the LLVM backend
293289 Default: False
lib/Builtins.idr → libs/base/Builtins.idrrenamed

The content is the same.

lib/Control/Arrow.idr → libs/base/Control/Arrow.idrrenamed

The content is the same.

lib/Control/Catchable.idr → libs/base/Control/Catchable.idrrenamed

The content is the same.

lib/Control/Category.idr → libs/base/Control/Category.idrrenamed

The content is the same.

lib/Control/IOExcept.idr → libs/base/Control/IOExcept.idrrenamed

The content is the same.

lib/Control/Monad/Identity.idr → libs/base/Control/Monad/Identity.idrrenamed

The content is the same.

lib/Control/Monad/RWS.idr → libs/base/Control/Monad/RWS.idrrenamed

The content is the same.

lib/Control/Monad/Reader.idr → libs/base/Control/Monad/Reader.idrrenamed

The content is the same.

lib/Control/Monad/State.idr → libs/base/Control/Monad/State.idrrenamed

The content is the same.

lib/Control/Monad/Writer.idr → libs/base/Control/Monad/Writer.idrrenamed

The content is the same.

lib/Data/Bits.idr → libs/base/Data/Bits.idrrenamed

The content is the same.

lib/Data/BoundedList.idr → libs/base/Data/BoundedList.idrrenamed

The content is the same.

lib/Data/Complex.idr → libs/base/Data/Complex.idrrenamed

The content is the same.

lib/Data/Floats.idr → libs/base/Data/Floats.idrrenamed

The content is the same.

lib/Data/HVect.idr → libs/base/Data/HVect.idrrenamed

The content is the same.

lib/Data/Mod2.idr → libs/base/Data/Mod2.idrrenamed

The content is the same.

lib/Data/Morphisms.idr → libs/base/Data/Morphisms.idrrenamed

The content is the same.

lib/Data/Sign.idr → libs/base/Data/Sign.idrrenamed

The content is the same.

lib/Data/SortedMap.idr → libs/base/Data/SortedMap.idrrenamed

The content is the same.

lib/Data/SortedSet.idr → libs/base/Data/SortedSet.idrrenamed

The content is the same.

lib/Data/Vect.idr → libs/base/Data/Vect.idrrenamed

The content is the same.

lib/Data/Vect/Quantifiers.idr → libs/base/Data/Vect/Quantifiers.idrrenamed

The content is the same.

lib/Data/ZZ.idr → libs/base/Data/ZZ.idrrenamed

The content is the same.

lib/Debug/Trace.idr → libs/base/Debug/Trace.idrrenamed

The content is the same.

lib/Decidable/Decidable.idr → libs/base/Decidable/Decidable.idrrenamed

The content is the same.

lib/Decidable/Equality.idr → libs/base/Decidable/Equality.idrrenamed

The content is the same.

lib/Decidable/Order.idr → libs/base/Decidable/Order.idrrenamed

The content is the same.

lib/IO.idr → libs/base/IO.idrrenamed

The content is the same.

lib/Language/Reflection.idr → libs/base/Language/Reflection.idrrenamed

The content is the same.

lib/Language/Reflection/Errors.idr → libs/base/Language/Reflection/Errors.idrrenamed

The content is the same.

lib/Language/Reflection/Utils.idr → libs/base/Language/Reflection/Utils.idrrenamed

The content is the same.

lib/Makefile → libs/base/Makefilerenamed

The content is the same.

lib/Network/Cgi.idr → libs/base/Network/Cgi.idrrenamed

The content is the same.

lib/Prelude.idr → libs/base/Prelude.idrrenamed

The content is the same.

lib/Prelude/Algebra.idr → libs/base/Prelude/Algebra.idrrenamed

The content is the same.

lib/Prelude/Applicative.idr → libs/base/Prelude/Applicative.idrrenamed

The content is the same.

lib/Prelude/Bits.idr → libs/base/Prelude/Bits.idrrenamed

The content is the same.

lib/Prelude/Cast.idr → libs/base/Prelude/Cast.idrrenamed

The content is the same.

lib/Prelude/Chars.idr → libs/base/Prelude/Chars.idrrenamed

The content is the same.

lib/Prelude/Either.idr → libs/base/Prelude/Either.idrrenamed

The content is the same.

lib/Prelude/Fin.idr → libs/base/Prelude/Fin.idrrenamed

The content is the same.

lib/Prelude/Foldable.idr → libs/base/Prelude/Foldable.idrrenamed

The content is the same.

lib/Prelude/Functor.idr → libs/base/Prelude/Functor.idrrenamed

The content is the same.

lib/Prelude/Heap.idr → libs/base/Prelude/Heap.idrrenamed

The content is the same.

lib/Prelude/List.idr → libs/base/Prelude/List.idrrenamed

The content is the same.

lib/Prelude/Maybe.idr → libs/base/Prelude/Maybe.idrrenamed

The content is the same.

lib/Prelude/Monad.idr → libs/base/Prelude/Monad.idrrenamed

The content is the same.

lib/Prelude/Nat.idr → libs/base/Prelude/Nat.idrrenamed

The content is the same.

lib/Prelude/Stream.idr → libs/base/Prelude/Stream.idrrenamed

The content is the same.

lib/Prelude/Strings.idr → libs/base/Prelude/Strings.idrrenamed

The content is the same.

lib/Prelude/Traversable.idr → libs/base/Prelude/Traversable.idrrenamed

The content is the same.

lib/Prelude/Vect.idr → libs/base/Prelude/Vect.idrrenamed

The content is the same.

lib/Providers.idr → libs/base/Providers.idrrenamed

The content is the same.

lib/System.idr → libs/base/System.idrrenamed

The content is the same.

lib/System/Concurrency/Process.idr → libs/base/System/Concurrency/Process.idrrenamed

The content is the same.

lib/System/Concurrency/Raw.idr → libs/base/System/Concurrency/Raw.idrrenamed

The content is the same.

lib/Uninhabited.idr → libs/base/Uninhabited.idrrenamed

The content is the same.

lib/base.ipkg → libs/base/base.ipkgrenamed

The content is the same.

effects/Effect/Exception.idr → libs/effects/Effect/Exception.idrrenamed

The content is the same.

effects/Effect/File.idr → libs/effects/Effect/File.idrrenamed

The content is the same.

effects/Effect/Memory.idr → libs/effects/Effect/Memory.idrrenamed

The content is the same.

effects/Effect/Random.idr → libs/effects/Effect/Random.idrrenamed

The content is the same.

effects/Effect/Select.idr → libs/effects/Effect/Select.idrrenamed

The content is the same.

effects/Effect/State.idr → libs/effects/Effect/State.idrrenamed

The content is the same.

effects/Effect/StdIO.idr → libs/effects/Effect/StdIO.idrrenamed

The content is the same.

effects/Effects.idr → libs/effects/Effects.idrrenamed

The content is the same.

effects/Makefile → libs/effects/Makefilerenamed

The content is the same.

effects/effects.ipkg → libs/effects/effects.ipkgrenamed+1−1
@@ -1,6 +1,6 @@
11package effects
22
3−opts = "-i ../lib"
3+opts = "-i ../base"
44modules = Effects,
55 Effect.Exception, Effect.File, Effect.State,
66 Effect.Random, Effect.StdIO, Effect.Select,
javascript/JavaScript.idr → libs/javascript/JavaScript.idrrenamed

The content is the same.

javascript/JavaScript/JSON.idr → libs/javascript/JavaScript/JSON.idrrenamed

The content is the same.

javascript/Makefile → libs/javascript/Makefilerenamed

The content is the same.

javascript/javascript.ipkg → libs/javascript/javascript.ipkgrenamed+1−1
@@ -1,5 +1,5 @@
11package javascript
22
3−opts = "-i ../lib"
3+opts = "-i ../base"
44modules = JavaScript, JavaScript.JSON
55