Verified Commit 311eadb6 authored by Camil Staps's avatar Camil Staps 🙂

Remove Generics namespace

parent bef96fdd
Pipeline #10364 failed with stage
in 1 minute and 43 seconds
definition module Data.Generics.Bimap
definition module Control.GenBimap
import StdGeneric
from Data.Maybe import :: Maybe
......
implementation module Data.Generics.Bimap
implementation module Control.GenBimap
import StdGeneric
from Data.Maybe import :: Maybe
......
definition module Data.Generics.FMap
definition module Control.GenFMap
import StdGeneric
from Data.Maybe import :: Maybe
......
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 (,), []
......
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]
......
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))
......
definition module Data.Generics.Map
definition module Control.GenMap
import StdGeneric
......
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
......
definition module Data.Generics.MapSt
definition module Control.GenMapSt
import StdGeneric
......
implementation module Data.Generics.MapSt
implementation module Control.GenMapSt
import StdGeneric, Data.Generics._Array
import StdGeneric, Data._Array
derive bimap (,)
......
definition module Data.Generics.Monad
definition module Control.GenMonad
import StdGeneric
import StdList
......
implementation module Data.Generics.Monad
implementation module Control.GenMonad
import StdGeneric, StdList, StdFunc
from Data.Maybe import :: Maybe(..)
......
definition module Data.Generics.Reduce
definition module Control.GenReduce
import StdGeneric
......
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
......
definition module Data.Generics.Compress
definition module Data.GenCompress
import StdGeneric
from Data.Maybe import :: Maybe
......
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(..)
//--------------------------------------------------
......
definition module Data.Generics.Default
definition module Data.GenDefault
import StdGeneric
......
implementation module Data.Generics.Default
implementation module Data.GenDefault
import StdArray
import StdGeneric
......
definition module Data.Generics.Diff
definition module Data.GenDiff
import StdGeneric
from StdOverloaded import class ==
......
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
......
definition module Data.Generics.Eq
definition module Data.GenEq
import StdGeneric
from StdBool import qualified &&, not
......
implementation module Data.Generics.Eq
implementation module Data.GenEq
import StdGeneric, StdEnv
......
definition module Data.Generics.FDomain
definition module Data.GenFDomain
import StdGeneric
......
implementation module Data.Generics.FDomain
implementation module Data.GenFDomain
import StdChar, StdEnum, StdInt, StdList
import StdGeneric
......
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
......
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
......
definition module Data.Generics.Zip
definition module Data.GenZip
import StdGeneric
from Data.Maybe import :: Maybe
......
implementation module Data.Generics.Zip
implementation module Data.GenZip
import StdGeneric
import StdEnv
......
......@@ -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
......
......@@ -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
......
......@@ -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,
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
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
......
......@@ -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)
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
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]
......
definition module Data.Generics._Array
definition module Data._Array
import StdArray
......
implementation module Data.Generics._Array
implementation module Data._Array
import _SystemArray, StdInt, StdClass
......
definition module GenBimap
import Data.Generics.Bimap
import Control.GenBimap
definition module GenCompress
import Data.Generics.Compress
import Data.GenCompress
definition module GenDefault
import Data.Generics.Default
import Data.GenDefault
definition module GenEq
import Data.Generics.Eq
import Data.GenEq
definition module GenFMap
import Data.Generics.FMap
import Control.GenFMap
definition module GenHylo
import Data.Generics.Hylo
import Control.GenHylo
definition module GenLexOrd
import Data.Generics.LexOrd
import Data.GenLexOrd
definition module GenMap
import Data.Generics.Map
import Control.GenMap
definition module GenMapSt
import Data.Generics.MapSt
import Control.GenMapSt
definition module GenMonad
import Data.Generics.Monad
import Control.GenMonad
definition module GenParse
import Data.Generics.Parse
import Text.GenParse
definition module GenPrint
import Data.Generics.Print
import Text.GenPrint
definition module GenReduce
import Data.Generics.Reduce
import Control.GenReduce
definition module _Array
import Data.Generics._Array
import Data._Array
......@@ -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
......
definition module Testing.Options
from Data.Generics.Default import generic gDefault
from Data.GenDefault import generic gDefault
from System.Options import :: Option
/**
......
......@@ -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
......
definition module Data.Generics.Parse
definition module Text.GenParse
import StdGeneric
from Data.Maybe import :: Maybe
......
implementation module Data.Generics.Parse
implementation module Text.GenParse
import StdGeneric, StdEnv
from Data.Maybe import :: Maybe(..)
......
definition module Data.Generics.Print
definition module Text.GenPrint
import StdGeneric
......
implementation module Data.Generics.Print
implementation module Text.GenPrint
import StdGeneric, StdEnv
from Data.Maybe import :: Maybe(..)
......
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
......
......@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment