Remove Generics namespace

src/libraries/OS-Independent/Data/Generics/Bimap.dcl → src/libraries/OS-Independent/Control/GenBimap.dcl

-definition module Data.Generics.Bimap
+definition module Control.GenBimap
 
 import StdGeneric
 from Data.Maybe import :: Maybe

src/libraries/OS-Independent/Data/Generics/Bimap.icl → src/libraries/OS-Independent/Control/GenBimap.icl

-implementation module Data.Generics.Bimap
+implementation module Control.GenBimap
 
 import StdGeneric
 from Data.Maybe import :: Maybe

src/libraries/OS-Independent/Data/Generics/FMap.dcl → src/libraries/OS-Independent/Control/GenFMap.dcl

-definition module Data.Generics.FMap
+definition module Control.GenFMap
 
 import StdGeneric
 from Data.Maybe import :: Maybe

src/libraries/OS-Independent/Data/Generics/FMap.icl → src/libraries/OS-Independent/Control/GenFMap.icl

-implementation module Data.Generics.FMap 
+implementation module Control.GenFMap 
 
-import StdGeneric, StdEnv, Data.Generics._Array, Data.Generics.Monad
+import StdGeneric, StdEnv, Data._Array, Control.GenMonad
 from Data.Maybe import :: Maybe(..)
 
 derive bimap (,), [] 

src/libraries/OS-Independent/Data/Generics/Hylo.dcl → src/libraries/OS-Independent/Control/GenHylo.dcl

-definition module Data.Generics.Hylo
+definition module Control.GenHylo
 
-import StdGeneric, Data.Generics.Map
+import StdGeneric, Control.GenMap
 
 :: Fix f = In (f .(Fix f))
 Out :: !u:(Fix v:a) -> v:(a w:(Fix v:a)), [u <= w]

src/libraries/OS-Independent/Data/Generics/Hylo.icl → src/libraries/OS-Independent/Control/GenHylo.icl

-implementation module Data.Generics.Hylo 
+implementation module Control.GenHylo 
 
-import StdGeneric, Data.Generics.Map, StdFunc
+import StdGeneric, Control.GenMap, StdFunc
 
 :: Fix f = In (f .(Fix f))
 

src/libraries/OS-Independent/Data/Generics/Map.dcl → src/libraries/OS-Independent/Control/GenMap.dcl

-definition module Data.Generics.Map
+definition module Control.GenMap
 
 import StdGeneric
 

src/libraries/OS-Independent/Data/Generics/Map.icl → src/libraries/OS-Independent/Control/GenMap.icl

-implementation module Data.Generics.Map
+implementation module Control.GenMap
 
 import StdClass, StdArray, StdInt, StdFunc
-import StdGeneric, Data.Generics._Array
+import StdGeneric, Data._Array
 
 generic gMap a b :: .a -> .b
 gMap{|c|} x 					= x

src/libraries/OS-Independent/Data/Generics/MapSt.dcl → src/libraries/OS-Independent/Control/GenMapSt.dcl

-definition module Data.Generics.MapSt
+definition module Control.GenMapSt
 
 import StdGeneric
 

src/libraries/OS-Independent/Data/Generics/MapSt.icl → src/libraries/OS-Independent/Control/GenMapSt.icl

-implementation module Data.Generics.MapSt
+implementation module Control.GenMapSt
 
-import StdGeneric, Data.Generics._Array
+import StdGeneric, Data._Array
 
 derive bimap (,)
 

src/libraries/OS-Independent/Data/Generics/Monad.dcl → src/libraries/OS-Independent/Control/GenMonad.dcl

-definition module Data.Generics.Monad
+definition module Control.GenMonad
 
 import StdGeneric
 import StdList

src/libraries/OS-Independent/Data/Generics/Monad.icl → src/libraries/OS-Independent/Control/GenMonad.icl

-implementation module Data.Generics.Monad
+implementation module Control.GenMonad
 
 import StdGeneric, StdList, StdFunc
 from Data.Maybe import :: Maybe(..)

src/libraries/OS-Independent/Data/Generics/Reduce.dcl → src/libraries/OS-Independent/Control/GenReduce.dcl

-definition module Data.Generics.Reduce
+definition module Control.GenReduce
 
 import StdGeneric
 

src/libraries/OS-Independent/Data/Generics/Reduce.icl → src/libraries/OS-Independent/Control/GenReduce.icl

-implementation module Data.Generics.Reduce
+implementation module Control.GenReduce
 
-import StdGeneric, Data.Generics._Array
+import StdGeneric, Data._Array
 
 // or crush
 generic gReduce t :: (a a -> a) a  t -> a

src/libraries/OS-Independent/Data/Generics/Compress.dcl → src/libraries/OS-Independent/Data/GenCompress.dcl

-definition module Data.Generics.Compress
+definition module Data.GenCompress
 
 import StdGeneric
 from Data.Maybe import :: Maybe

src/libraries/OS-Independent/Data/Generics/Compress.icl → src/libraries/OS-Independent/Data/GenCompress.icl

-implementation module Data.Generics.Compress
+implementation module Data.GenCompress
 
-import StdGeneric, StdEnv, Data.Generics._Array
+import StdGeneric, StdEnv, Data._Array
 from Data.Maybe import :: Maybe(..)
 
 //--------------------------------------------------

src/libraries/OS-Independent/Data/Generics/Default.dcl → src/libraries/OS-Independent/Data/GenDefault.dcl

-definition module Data.Generics.Default
+definition module Data.GenDefault
 
 import StdGeneric
 

src/libraries/OS-Independent/Data/Generics/Default.icl → src/libraries/OS-Independent/Data/GenDefault.icl

-implementation module Data.Generics.Default
+implementation module Data.GenDefault
 
 import StdArray
 import StdGeneric

src/libraries/OS-Independent/Data/Generics/Diff.dcl → src/libraries/OS-Independent/Data/GenDiff.dcl

-definition module Data.Generics.Diff
+definition module Data.GenDiff
 
 import StdGeneric
 from StdOverloaded import class ==

src/libraries/OS-Independent/Data/Generics/Diff.icl → src/libraries/OS-Independent/Data/GenDiff.icl

-implementation module Data.Generics.Diff
+implementation module Data.GenDiff
 
 import StdBool
 from StdFunc import flip, o
@@ -12,7 +12,7 @@ import Control.Monad
 import Control.Monad.Identity
 import Control.Monad.State
 import Data.Functor
-import Data.Generics.Print
+import Text.GenPrint
 import Data.List
 import qualified Data.Map as M
 import Data.Maybe

src/libraries/OS-Independent/Data/Generics/Eq.dcl → src/libraries/OS-Independent/Data/GenEq.dcl

-definition module Data.Generics.Eq
+definition module Data.GenEq
 
 import StdGeneric
 from StdBool import qualified &&, not

src/libraries/OS-Independent/Data/Generics/Eq.icl → src/libraries/OS-Independent/Data/GenEq.icl

-implementation module Data.Generics.Eq
+implementation module Data.GenEq
 
 import StdGeneric, StdEnv
 

src/libraries/OS-Independent/Data/Generics/FDomain.dcl → src/libraries/OS-Independent/Data/GenFDomain.dcl

-definition module Data.Generics.FDomain
+definition module Data.GenFDomain
 
 import StdGeneric
 

src/libraries/OS-Independent/Data/Generics/FDomain.icl → src/libraries/OS-Independent/Data/GenFDomain.icl

-implementation module Data.Generics.FDomain
+implementation module Data.GenFDomain
 
 import StdChar, StdEnum, StdInt, StdList
 import StdGeneric

src/libraries/OS-Independent/Data/Generics/LexOrd.dcl → src/libraries/OS-Independent/Data/GenLexOrd.dcl

-definition module Data.Generics.LexOrd
+definition module Data.GenLexOrd
 
-import StdGeneric, Data.Generics.Eq
+import StdGeneric, Data.GenEq
 
 :: LexOrd = LT | EQ | GT
 derive gEq LexOrd

src/libraries/OS-Independent/Data/Generics/LexOrd.icl → src/libraries/OS-Independent/Data/GenLexOrd.icl

-implementation module Data.Generics.LexOrd
+implementation module Data.GenLexOrd
 
 import StdEnv
-import StdGeneric, Data.Generics.Eq
+import StdGeneric, Data.GenEq
 
 :: LexOrd = LT |EQ | GT
 derive gEq LexOrd

src/libraries/OS-Independent/Data/Generics/Zip.dcl → src/libraries/OS-Independent/Data/GenZip.dcl

-definition module Data.Generics.Zip
+definition module Data.GenZip
 
 import StdGeneric
 from Data.Maybe import :: Maybe

src/libraries/OS-Independent/Data/Generics/Zip.icl → src/libraries/OS-Independent/Data/GenZip.icl

-implementation module Data.Generics.Zip
+implementation module Data.GenZip
 
 import StdGeneric
 import StdEnv

src/libraries/OS-Independent/Data/Generics.dcl

@@ -2,20 +2,20 @@ definition module Data.Generics
 
 import StdGeneric
 
-import Data.Generics.Eq
-import Data.Generics.LexOrd
-import Data.Generics.Map
-import Data.Generics.MapSt
-import Data.Generics.Reduce
-import Data.Generics.Zip 
-import Data.Generics.Print
-import Data.Generics.Parse
-import Data.Generics.Compress
-import Data.Generics.Monad
-import Data.Generics.Hylo
-import Data.Generics.FMap
-import Data.Generics.Bimap
-import Data.Generics.FDomain
+import Data.GenEq
+import Data.GenLexOrd
+import Control.GenMap
+import Control.GenMapSt
+import Control.GenReduce
+import Data.GenZip 
+import Text.GenPrint
+import Text.GenParse
+import Data.GenCompress
+import Control.GenMonad
+import Control.GenHylo
+import Control.GenFMap
+import Control.GenBimap
+import Data.GenFDomain
 
 fromOBJECT :: !(OBJECT x) -> x
 fromCONS   :: !(CONS x)   -> x

src/libraries/OS-Independent/Data/Graphviz.dcl

@@ -5,7 +5,7 @@ definition module Data.Graphviz
 
 from StdOverloaded import class toString, class ==
 from Data.Maybe import :: Maybe
-from Data.Generics.Eq import generic gEq
+from Data.GenEq import generic gEq
 
 // A digraph contains a title and a list of node definitions
 :: Digraph

src/libraries/OS-Independent/Data/Graphviz.icl

@@ -5,7 +5,7 @@ implementation module Data.Graphviz
 
 import StdArray, StdOverloaded, StdOrdList, StdTuple, StdString, StdBool, StdMisc
 import Data.Maybe, Data.List
-import Data.Generics.Print, Data.Generics.Eq
+import Text.GenPrint, Data.GenEq
 
 derive gEq    EdgeStyle, NodeStyle, DirType, NodeShape, Side, ArrowShape, ArrowType, Arrow, Color, Maybe
 derive gPrint EdgeStyle, NodeStyle, DirType, NodeShape, Side, ArrowShape,

src/libraries/OS-Independent/Data/IntMap/Strict.dcl

@@ -6,7 +6,7 @@ from StdOverloaded	import class ==, class <
 from StdBool        import not
 from StdFunc        import id
 from Text.JSON      import generic JSONEncode, generic JSONDecode, :: JSONNode
-from Data.Generics.Eq import generic gEq
+from Data.GenEq import generic gEq
 from Data.Monoid    import class Monoid, class Semigroup
 import qualified StdList as SL
 from Data.List import foldr

src/libraries/OS-Independent/Data/IntMap/Strict.icl

@@ -7,7 +7,7 @@ from StdMisc import abort
 from StdString import instance == {#Char}
 from StdInt import class < (..), instance < Int, instance == Int, class + (..), instance + Int, bitand
 from StdList import foldl
-from Data.Generics.Eq import generic gEq
+from Data.GenEq import generic gEq
 import Data.Maybe, Data.Either, Data.Functor
 from Data.IntMap.Base import :: IntMap (..), :: Prefix, :: Mask, nomatch, bin, empty, fromDistinctAscList, mask, shorter, branchMask
 from Text.JSON import generic JSONEncode, generic JSONDecode, :: JSONNode

src/libraries/OS-Independent/Data/IntSet/Base.icl

@@ -85,7 +85,7 @@
 implementation module Data.IntSet.Base
 
 import StdInt, StdBool, StdFunc, StdMisc, StdOverloaded, StdClass, StdTuple
-import Data.Generics.LexOrd
+import Data.GenLexOrd
 import qualified Data.List as DL
 import Data.Maybe
 import Data.Monoid

src/libraries/OS-Independent/Data/List.dcl

 definition module Data.List
 
 import StdList
-from Data.Generics.Eq import generic gEq
+from Data.GenEq import generic gEq
 from Data.Functor import class Functor
 from Data.Maybe import :: Maybe
 from Data.Monoid import class Semigroup, class Monoid

src/libraries/OS-Independent/Data/List.icl

@@ -8,7 +8,7 @@ import StdOrdList
 import StdTuple
 
 import Data.Functor
-import Data.Generics.Eq
+import Data.GenEq
 import Data.Maybe
 import Data.Monoid
 from Data.Foldable import class Foldable(foldMap)

src/libraries/OS-Independent/Data/Map.dcl

@@ -10,8 +10,8 @@ from StdOverloaded	import class ==, class <
 from StdBool        import not
 from StdFunc        import id
 from Text.JSON      import generic JSONEncode, generic JSONDecode, :: JSONNode
-from Data.Generics.Eq import generic gEq
-from Data.Generics.LexOrd import generic gLexOrd, :: LexOrd
+from Data.GenEq import generic gEq
+from Data.GenLexOrd import generic gLexOrd, :: LexOrd
 from Data.Monoid    import class Monoid, class Semigroup
 import qualified StdList as SL
 from Data.List import foldr

src/libraries/OS-Independent/Data/Map.icl

@@ -7,9 +7,9 @@ from StdFunc import id, flip, o, const
 from StdTuple import snd
 from StdMisc import abort, undef
 import StdString, StdTuple
-from Data.Generics.Eq import generic gEq
+from Data.GenEq import generic gEq
 import qualified StdList as SL
-import Data.Maybe, Text.JSON, Data.Generics.LexOrd
+import Data.Maybe, Text.JSON, Data.GenLexOrd
 from Data.Set import :: Set
 import qualified Data.Set as DS
 import Data.Monoid, Data.Functor, Control.Applicative

src/libraries/OS-Independent/Data/Set.dcl

@@ -5,8 +5,8 @@ from StdClass import class Ord (..), <=, >
 from Data.Maybe		import :: Maybe
 from Data.List import foldl, map
 from StdBool import not, &&
-from Data.Generics.Eq import generic gEq
-from Data.Generics.LexOrd import generic gLexOrd, :: LexOrd
+from Data.GenEq import generic gEq
+from Data.GenLexOrd import generic gLexOrd, :: LexOrd
 from Data.Foldable import class Foldable
 
 // This module is ported from Haskell Data.Set by László Domoszlai. 2013.sep.6

src/libraries/OS-Independent/Data/Set.icl

 implementation module Data.Set
 
 import StdClass, StdMisc, StdBool, StdFunc, StdInt, StdTuple
-import Data.Maybe, Data.Generics.Eq, Data.Generics.LexOrd, Data.Monoid
+import Data.Maybe, Data.GenEq, Data.GenLexOrd, Data.Monoid
 from Data.Foldable import class Foldable (..)
 import qualified StdList
 from StdList import instance == [a]

src/libraries/OS-Independent/Data/Generics/_Array.dcl → src/libraries/OS-Independent/Data/_Array.dcl

-definition module Data.Generics._Array
+definition module Data._Array
 
 import StdArray
 

src/libraries/OS-Independent/Data/Generics/_Array.icl → src/libraries/OS-Independent/Data/_Array.icl

-implementation module Data.Generics._Array
+implementation module Data._Array
 
 import _SystemArray, StdInt, StdClass
 

src/libraries/OS-Independent/Deprecated/Generics/GenBimap.dcl

 definition module GenBimap
 
-import Data.Generics.Bimap
+import Control.GenBimap

src/libraries/OS-Independent/Deprecated/Generics/GenCompress.dcl

 definition module GenCompress
 
-import Data.Generics.Compress
+import Data.GenCompress

src/libraries/OS-Independent/Deprecated/Generics/GenDefault.dcl

 definition module GenDefault
 
-import Data.Generics.Default
+import Data.GenDefault

src/libraries/OS-Independent/Deprecated/Generics/GenEq.dcl

 definition module GenEq
 
-import Data.Generics.Eq
+import Data.GenEq

src/libraries/OS-Independent/Deprecated/Generics/GenFMap.dcl

 definition module GenFMap
 
-import Data.Generics.FMap
+import Control.GenFMap

src/libraries/OS-Independent/Deprecated/Generics/GenHylo.dcl

 definition module GenHylo
 
-import Data.Generics.Hylo
+import Control.GenHylo

src/libraries/OS-Independent/Deprecated/Generics/GenLexOrd.dcl

 definition module GenLexOrd
 
-import Data.Generics.LexOrd
+import Data.GenLexOrd

src/libraries/OS-Independent/Deprecated/Generics/GenMap.dcl

 definition module GenMap
 
-import Data.Generics.Map
+import Control.GenMap

src/libraries/OS-Independent/Deprecated/Generics/GenMapSt.dcl

 definition module GenMapSt
 
-import Data.Generics.MapSt
+import Control.GenMapSt

src/libraries/OS-Independent/Deprecated/Generics/GenMonad.dcl

 definition module GenMonad
 
-import Data.Generics.Monad
+import Control.GenMonad

src/libraries/OS-Independent/Deprecated/Generics/GenParse.dcl

 definition module GenParse
 
-import Data.Generics.Parse
+import Text.GenParse

src/libraries/OS-Independent/Deprecated/Generics/GenPrint.dcl

 definition module GenPrint
 
-import Data.Generics.Print
+import Text.GenPrint

src/libraries/OS-Independent/Deprecated/Generics/GenReduce.dcl

 definition module GenReduce
 
-import Data.Generics.Reduce
+import Control.GenReduce

src/libraries/OS-Independent/Deprecated/Generics/_Array.dcl

 definition module _Array
 
-import Data.Generics._Array
+import Data._Array

src/libraries/OS-Independent/Graphics/Scalable/Types.icl

@@ -2,7 +2,7 @@ implementation module Graphics.Scalable.Types
 
 import Data.Maybe
 import Data.List
-import Data.Generics.Eq
+import Data.GenEq
 from Text.HTML import :: SVGColor (..)
 from Data.Set import :: Set, instance == (Set a), instance < (Set a)
 import StdBool, StdInt, StdReal, StdString
@@ -20,7 +20,7 @@ instance <  FontDef    where  <  fd1 fd2 =  fd1.fontfamily  < fd2.fontfamily
                                          || fd1.fontvariant < fd2.fontvariant
                                          || fd1.fontweight  < fd2.fontweight
 derive gEq FontDef
-import Data.Generics.Print
+import Text.GenPrint
 derive gPrint FontDef
 instance toString FontDef where toString font = printToString font
 

src/libraries/OS-Independent/Testing/Options.dcl

 definition module Testing.Options
 
-from Data.Generics.Default import generic gDefault
+from Data.GenDefault import generic gDefault
 from System.Options import :: Option
 
 /**

src/libraries/OS-Independent/Testing/Options.icl

@@ -4,7 +4,7 @@ import StdList
 
 import Data.Error
 from Data.Func import $
-import Data.Generics.Default
+import Data.GenDefault
 import Data.Maybe
 import System.Options
 

src/libraries/OS-Independent/Data/Generics/Parse.dcl → src/libraries/OS-Independent/Text/GenParse.dcl

-definition module Data.Generics.Parse
+definition module Text.GenParse
 
 import StdGeneric
 from Data.Maybe import :: Maybe

src/libraries/OS-Independent/Data/Generics/Parse.icl → src/libraries/OS-Independent/Text/GenParse.icl

-implementation module Data.Generics.Parse
+implementation module Text.GenParse
 
 import StdGeneric, StdEnv
 from Data.Maybe import :: Maybe(..)

src/libraries/OS-Independent/Data/Generics/Print.dcl → src/libraries/OS-Independent/Text/GenPrint.dcl

-definition module Data.Generics.Print
+definition module Text.GenPrint
 
 import StdGeneric
 

src/libraries/OS-Independent/Data/Generics/Print.icl → src/libraries/OS-Independent/Text/GenPrint.icl

-implementation module Data.Generics.Print
+implementation module Text.GenPrint
 
 import StdGeneric, StdEnv
 from Data.Maybe import :: Maybe(..)

src/libraries/OS-Independent/Text/XML.icl

 implementation module Text.XML
 
 import StdArray, StdBool, StdInt, StdList, StdTuple, StdGeneric, StdFunc, StdString
-import Data.Error, Data.Either, Data.Maybe, Text, Data.Generics.Eq
+import Data.Error, Data.Either, Data.Maybe, Text, Data.GenEq
 from Text.Parsers.CParsers.ParserCombinators import :: Parser, :: ParsResult, :: CParser, &>, +&+, +&-, -&+, <!>, <&, <&>, <*?>, <@, >?<, @>, begin1, satisfy, symbol, yield, <|>, <+?>
 
 uname :: !String -> XMLQName

tests/linux64/test.icl

@@ -39,23 +39,23 @@ import qualified Data.Func
 import qualified Data.Functor
 import qualified Data.Functor.Identity
 import qualified Data.Generics
-import qualified Data.Generics._Array
-import qualified Data.Generics.Bimap
-import qualified Data.Generics.Compress
-import qualified Data.Generics.Default
-import qualified Data.Generics.Diff
-import qualified Data.Generics.Eq
-import qualified Data.Generics.FMap
-import qualified Data.Generics.FDomain
-import qualified Data.Generics.Hylo
-import qualified Data.Generics.LexOrd
-import qualified Data.Generics.Map
-import qualified Data.Generics.MapSt
-import qualified Data.Generics.Monad
-import qualified Data.Generics.Parse
-import qualified Data.Generics.Print
-import qualified Data.Generics.Reduce
-import qualified Data.Generics.Zip
+import qualified Data._Array
+import qualified Control.GenBimap
+import qualified Data.GenCompress
+import qualified Data.GenDefault
+import qualified Data.GenDiff
+import qualified Data.GenEq
+import qualified Control.GenFMap
+import qualified Data.GenFDomain
+import qualified Control.GenHylo
+import qualified Data.GenLexOrd
+import qualified Control.GenMap
+import qualified Control.GenMapSt
+import qualified Control.GenMonad
+import qualified Text.GenParse
+import qualified Text.GenPrint
+import qualified Control.GenReduce
+import qualified Data.GenZip
 //import qualified Data.Graph
 //import qualified Data.Graph.Inductive
 //import qualified Data.Graph.Inductive.Basic