Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
clean-and-itasks
clean-platform
Commits
311eadb6
Verified
Commit
311eadb6
authored
Mar 25, 2018
by
Camil Staps
🚀
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove Generics namespace
parent
bef96fdd
Pipeline
#10364
failed with stage
in 1 minute and 43 seconds
Changes
65
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
65 changed files
with
108 additions
and
108 deletions
+108
-108
src/libraries/OS-Independent/Control/GenBimap.dcl
src/libraries/OS-Independent/Control/GenBimap.dcl
+1
-1
src/libraries/OS-Independent/Control/GenBimap.icl
src/libraries/OS-Independent/Control/GenBimap.icl
+1
-1
src/libraries/OS-Independent/Control/GenFMap.dcl
src/libraries/OS-Independent/Control/GenFMap.dcl
+1
-1
src/libraries/OS-Independent/Control/GenFMap.icl
src/libraries/OS-Independent/Control/GenFMap.icl
+2
-2
src/libraries/OS-Independent/Control/GenHylo.dcl
src/libraries/OS-Independent/Control/GenHylo.dcl
+2
-2
src/libraries/OS-Independent/Control/GenHylo.icl
src/libraries/OS-Independent/Control/GenHylo.icl
+2
-2
src/libraries/OS-Independent/Control/GenMap.dcl
src/libraries/OS-Independent/Control/GenMap.dcl
+1
-1
src/libraries/OS-Independent/Control/GenMap.icl
src/libraries/OS-Independent/Control/GenMap.icl
+2
-2
src/libraries/OS-Independent/Control/GenMapSt.dcl
src/libraries/OS-Independent/Control/GenMapSt.dcl
+1
-1
src/libraries/OS-Independent/Control/GenMapSt.icl
src/libraries/OS-Independent/Control/GenMapSt.icl
+2
-2
src/libraries/OS-Independent/Control/GenMonad.dcl
src/libraries/OS-Independent/Control/GenMonad.dcl
+1
-1
src/libraries/OS-Independent/Control/GenMonad.icl
src/libraries/OS-Independent/Control/GenMonad.icl
+1
-1
src/libraries/OS-Independent/Control/GenReduce.dcl
src/libraries/OS-Independent/Control/GenReduce.dcl
+1
-1
src/libraries/OS-Independent/Control/GenReduce.icl
src/libraries/OS-Independent/Control/GenReduce.icl
+2
-2
src/libraries/OS-Independent/Data/GenCompress.dcl
src/libraries/OS-Independent/Data/GenCompress.dcl
+1
-1
src/libraries/OS-Independent/Data/GenCompress.icl
src/libraries/OS-Independent/Data/GenCompress.icl
+2
-2
src/libraries/OS-Independent/Data/GenDefault.dcl
src/libraries/OS-Independent/Data/GenDefault.dcl
+1
-1
src/libraries/OS-Independent/Data/GenDefault.icl
src/libraries/OS-Independent/Data/GenDefault.icl
+1
-1
src/libraries/OS-Independent/Data/GenDiff.dcl
src/libraries/OS-Independent/Data/GenDiff.dcl
+1
-1
src/libraries/OS-Independent/Data/GenDiff.icl
src/libraries/OS-Independent/Data/GenDiff.icl
+2
-2
src/libraries/OS-Independent/Data/GenEq.dcl
src/libraries/OS-Independent/Data/GenEq.dcl
+1
-1
src/libraries/OS-Independent/Data/GenEq.icl
src/libraries/OS-Independent/Data/GenEq.icl
+1
-1
src/libraries/OS-Independent/Data/GenFDomain.dcl
src/libraries/OS-Independent/Data/GenFDomain.dcl
+1
-1
src/libraries/OS-Independent/Data/GenFDomain.icl
src/libraries/OS-Independent/Data/GenFDomain.icl
+1
-1
src/libraries/OS-Independent/Data/GenLexOrd.dcl
src/libraries/OS-Independent/Data/GenLexOrd.dcl
+2
-2
src/libraries/OS-Independent/Data/GenLexOrd.icl
src/libraries/OS-Independent/Data/GenLexOrd.icl
+2
-2
src/libraries/OS-Independent/Data/GenZip.dcl
src/libraries/OS-Independent/Data/GenZip.dcl
+1
-1
src/libraries/OS-Independent/Data/GenZip.icl
src/libraries/OS-Independent/Data/GenZip.icl
+1
-1
src/libraries/OS-Independent/Data/Generics.dcl
src/libraries/OS-Independent/Data/Generics.dcl
+14
-14
src/libraries/OS-Independent/Data/Graphviz.dcl
src/libraries/OS-Independent/Data/Graphviz.dcl
+1
-1
src/libraries/OS-Independent/Data/Graphviz.icl
src/libraries/OS-Independent/Data/Graphviz.icl
+1
-1
src/libraries/OS-Independent/Data/IntMap/Strict.dcl
src/libraries/OS-Independent/Data/IntMap/Strict.dcl
+1
-1
src/libraries/OS-Independent/Data/IntMap/Strict.icl
src/libraries/OS-Independent/Data/IntMap/Strict.icl
+1
-1
src/libraries/OS-Independent/Data/IntSet/Base.icl
src/libraries/OS-Independent/Data/IntSet/Base.icl
+1
-1
src/libraries/OS-Independent/Data/List.dcl
src/libraries/OS-Independent/Data/List.dcl
+1
-1
src/libraries/OS-Independent/Data/List.icl
src/libraries/OS-Independent/Data/List.icl
+1
-1
src/libraries/OS-Independent/Data/Map.dcl
src/libraries/OS-Independent/Data/Map.dcl
+2
-2
src/libraries/OS-Independent/Data/Map.icl
src/libraries/OS-Independent/Data/Map.icl
+2
-2
src/libraries/OS-Independent/Data/Set.dcl
src/libraries/OS-Independent/Data/Set.dcl
+2
-2
src/libraries/OS-Independent/Data/Set.icl
src/libraries/OS-Independent/Data/Set.icl
+1
-1
src/libraries/OS-Independent/Data/_Array.dcl
src/libraries/OS-Independent/Data/_Array.dcl
+1
-1
src/libraries/OS-Independent/Data/_Array.icl
src/libraries/OS-Independent/Data/_Array.icl
+1
-1
src/libraries/OS-Independent/Deprecated/Generics/GenBimap.dcl
...libraries/OS-Independent/Deprecated/Generics/GenBimap.dcl
+1
-1
src/libraries/OS-Independent/Deprecated/Generics/GenCompress.dcl
...raries/OS-Independent/Deprecated/Generics/GenCompress.dcl
+1
-1
src/libraries/OS-Independent/Deprecated/Generics/GenDefault.dcl
...braries/OS-Independent/Deprecated/Generics/GenDefault.dcl
+1
-1
src/libraries/OS-Independent/Deprecated/Generics/GenEq.dcl
src/libraries/OS-Independent/Deprecated/Generics/GenEq.dcl
+1
-1
src/libraries/OS-Independent/Deprecated/Generics/GenFMap.dcl
src/libraries/OS-Independent/Deprecated/Generics/GenFMap.dcl
+1
-1
src/libraries/OS-Independent/Deprecated/Generics/GenHylo.dcl
src/libraries/OS-Independent/Deprecated/Generics/GenHylo.dcl
+1
-1
src/libraries/OS-Independent/Deprecated/Generics/GenLexOrd.dcl
...ibraries/OS-Independent/Deprecated/Generics/GenLexOrd.dcl
+1
-1
src/libraries/OS-Independent/Deprecated/Generics/GenMap.dcl
src/libraries/OS-Independent/Deprecated/Generics/GenMap.dcl
+1
-1
src/libraries/OS-Independent/Deprecated/Generics/GenMapSt.dcl
...libraries/OS-Independent/Deprecated/Generics/GenMapSt.dcl
+1
-1
src/libraries/OS-Independent/Deprecated/Generics/GenMonad.dcl
...libraries/OS-Independent/Deprecated/Generics/GenMonad.dcl
+1
-1
src/libraries/OS-Independent/Deprecated/Generics/GenParse.dcl
...libraries/OS-Independent/Deprecated/Generics/GenParse.dcl
+1
-1
src/libraries/OS-Independent/Deprecated/Generics/GenPrint.dcl
...libraries/OS-Independent/Deprecated/Generics/GenPrint.dcl
+1
-1
src/libraries/OS-Independent/Deprecated/Generics/GenReduce.dcl
...ibraries/OS-Independent/Deprecated/Generics/GenReduce.dcl
+1
-1
src/libraries/OS-Independent/Deprecated/Generics/_Array.dcl
src/libraries/OS-Independent/Deprecated/Generics/_Array.dcl
+1
-1
src/libraries/OS-Independent/Graphics/Scalable/Types.icl
src/libraries/OS-Independent/Graphics/Scalable/Types.icl
+2
-2
src/libraries/OS-Independent/Testing/Options.dcl
src/libraries/OS-Independent/Testing/Options.dcl
+1
-1
src/libraries/OS-Independent/Testing/Options.icl
src/libraries/OS-Independent/Testing/Options.icl
+1
-1
src/libraries/OS-Independent/Text/GenParse.dcl
src/libraries/OS-Independent/Text/GenParse.dcl
+1
-1
src/libraries/OS-Independent/Text/GenParse.icl
src/libraries/OS-Independent/Text/GenParse.icl
+1
-1
src/libraries/OS-Independent/Text/GenPrint.dcl
src/libraries/OS-Independent/Text/GenPrint.dcl
+1
-1
src/libraries/OS-Independent/Text/GenPrint.icl
src/libraries/OS-Independent/Text/GenPrint.icl
+1
-1
src/libraries/OS-Independent/Text/XML.icl
src/libraries/OS-Independent/Text/XML.icl
+1
-1
tests/linux64/test.icl
tests/linux64/test.icl
+17
-17
No files found.
src/libraries/OS-Independent/
Data/Generics/
Bimap.dcl
→
src/libraries/OS-Independent/
Control/Gen
Bimap.dcl
View file @
311eadb6
definition
module
Data
.
Generics
.
Bimap
definition
module
Control
.
Gen
Bimap
import
StdGeneric
from
Data
.
Maybe
import
::
Maybe
...
...
src/libraries/OS-Independent/
Data/Generics/
Bimap.icl
→
src/libraries/OS-Independent/
Control/Gen
Bimap.icl
View file @
311eadb6
implementation
module
Data
.
Generics
.
Bimap
implementation
module
Control
.
Gen
Bimap
import
StdGeneric
from
Data
.
Maybe
import
::
Maybe
...
...
src/libraries/OS-Independent/
Data/Generics/
FMap.dcl
→
src/libraries/OS-Independent/
Control/Gen
FMap.dcl
View file @
311eadb6
definition
module
Data
.
Generics
.
FMap
definition
module
Control
.
Gen
FMap
import
StdGeneric
from
Data
.
Maybe
import
::
Maybe
...
...
src/libraries/OS-Independent/
Data/Generics/
FMap.icl
→
src/libraries/OS-Independent/
Control/Gen
FMap.icl
View file @
311eadb6
implementation
module
Data
.
Generics
.
FMap
implementation
module
Control
.
Gen
FMap
import
StdGeneric
,
StdEnv
,
Data
.
Generics
.
_Array
,
Data
.
Generics
.
Monad
import
StdGeneric
,
StdEnv
,
Data
.
_Array
,
Control
.
Gen
Monad
from
Data
.
Maybe
import
::
Maybe
(..)
derive
bimap
(,),
[]
...
...
src/libraries/OS-Independent/
Data/Generics/
Hylo.dcl
→
src/libraries/OS-Independent/
Control/Gen
Hylo.dcl
View file @
311eadb6
definition
module
Data
.
Generics
.
Hylo
definition
module
Control
.
Gen
Hylo
import
StdGeneric
,
Data
.
Generics
.
Map
import
StdGeneric
,
Control
.
Gen
Map
::
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/Gen
Hylo.icl
View file @
311eadb6
implementation
module
Data
.
Generics
.
Hylo
implementation
module
Control
.
Gen
Hylo
import
StdGeneric
,
Data
.
Generics
.
Map
,
StdFunc
import
StdGeneric
,
Control
.
Gen
Map
,
StdFunc
::
Fix
f
=
In
(
f
.(
Fix
f
))
...
...
src/libraries/OS-Independent/
Data/Generics/
Map.dcl
→
src/libraries/OS-Independent/
Control/Gen
Map.dcl
View file @
311eadb6
definition
module
Data
.
Generics
.
Map
definition
module
Control
.
Gen
Map
import
StdGeneric
...
...
src/libraries/OS-Independent/
Data/Generics/
Map.icl
→
src/libraries/OS-Independent/
Control/Gen
Map.icl
View file @
311eadb6
implementation
module
Data
.
Generics
.
Map
implementation
module
Control
.
Gen
Map
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/Gen
MapSt.dcl
View file @
311eadb6
definition
module
Data
.
Generics
.
MapSt
definition
module
Control
.
Gen
MapSt
import
StdGeneric
...
...
src/libraries/OS-Independent/
Data/Generics/
MapSt.icl
→
src/libraries/OS-Independent/
Control/Gen
MapSt.icl
View file @
311eadb6
implementation
module
Data
.
Generics
.
MapSt
implementation
module
Control
.
Gen
MapSt
import
StdGeneric
,
Data
.
Generics
.
_Array
import
StdGeneric
,
Data
.
_Array
derive
bimap
(,)
...
...
src/libraries/OS-Independent/
Data/Generics/
Monad.dcl
→
src/libraries/OS-Independent/
Control/Gen
Monad.dcl
View file @
311eadb6
definition
module
Data
.
Generics
.
Monad
definition
module
Control
.
Gen
Monad
import
StdGeneric
import
StdList
...
...
src/libraries/OS-Independent/
Data/Generics/
Monad.icl
→
src/libraries/OS-Independent/
Control/Gen
Monad.icl
View file @
311eadb6
implementation
module
Data
.
Generics
.
Monad
implementation
module
Control
.
Gen
Monad
import
StdGeneric
,
StdList
,
StdFunc
from
Data
.
Maybe
import
::
Maybe
(..)
...
...
src/libraries/OS-Independent/
Data/Generics/
Reduce.dcl
→
src/libraries/OS-Independent/
Control/Gen
Reduce.dcl
View file @
311eadb6
definition
module
Data
.
Generics
.
Reduce
definition
module
Control
.
Gen
Reduce
import
StdGeneric
...
...
src/libraries/OS-Independent/
Data/Generics/
Reduce.icl
→
src/libraries/OS-Independent/
Control/Gen
Reduce.icl
View file @
311eadb6
implementation
module
Data
.
Generics
.
Reduce
implementation
module
Control
.
Gen
Reduce
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/Gen
erics/
Compress.dcl
→
src/libraries/OS-Independent/Data/GenCompress.dcl
View file @
311eadb6
definition
module
Data
.
Gen
erics
.
Compress
definition
module
Data
.
GenCompress
import
StdGeneric
from
Data
.
Maybe
import
::
Maybe
...
...
src/libraries/OS-Independent/Data/Gen
erics/
Compress.icl
→
src/libraries/OS-Independent/Data/GenCompress.icl
View file @
311eadb6
implementation
module
Data
.
Gen
erics
.
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/Gen
erics/
Default.dcl
→
src/libraries/OS-Independent/Data/GenDefault.dcl
View file @
311eadb6
definition
module
Data
.
Gen
erics
.
Default
definition
module
Data
.
GenDefault
import
StdGeneric
...
...
src/libraries/OS-Independent/Data/Gen
erics/
Default.icl
→
src/libraries/OS-Independent/Data/GenDefault.icl
View file @
311eadb6
implementation
module
Data
.
Gen
erics
.
Default
implementation
module
Data
.
GenDefault
import
StdArray
import
StdGeneric
...
...
src/libraries/OS-Independent/Data/Gen
erics/
Diff.dcl
→
src/libraries/OS-Independent/Data/GenDiff.dcl
View file @
311eadb6
definition
module
Data
.
Gen
erics
.
Diff
definition
module
Data
.
GenDiff
import
StdGeneric
from
StdOverloaded
import
class
==
...
...
src/libraries/OS-Independent/Data/Gen
erics/
Diff.icl
→
src/libraries/OS-Independent/Data/GenDiff.icl
View file @
311eadb6
implementation
module
Data
.
Gen
erics
.
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
.
Gen
Print
import
Data
.
List
import
qualified
Data
.
Map
as
M
import
Data
.
Maybe
...
...
src/libraries/OS-Independent/Data/Gen
erics/
Eq.dcl
→
src/libraries/OS-Independent/Data/GenEq.dcl
View file @
311eadb6
definition
module
Data
.
Gen
erics
.
Eq
definition
module
Data
.
GenEq
import
StdGeneric
from
StdBool
import
qualified
&&,
not
...
...
src/libraries/OS-Independent/Data/Gen
erics/
Eq.icl
→
src/libraries/OS-Independent/Data/GenEq.icl
View file @
311eadb6
implementation
module
Data
.
Gen
erics
.
Eq
implementation
module
Data
.
GenEq
import
StdGeneric
,
StdEnv
...
...
src/libraries/OS-Independent/Data/Gen
erics/
FDomain.dcl
→
src/libraries/OS-Independent/Data/GenFDomain.dcl
View file @
311eadb6
definition
module
Data
.
Gen
erics
.
FDomain
definition
module
Data
.
GenFDomain
import
StdGeneric
...
...
src/libraries/OS-Independent/Data/Gen
erics/
FDomain.icl
→
src/libraries/OS-Independent/Data/GenFDomain.icl
View file @
311eadb6
implementation
module
Data
.
Gen
erics
.
FDomain
implementation
module
Data
.
GenFDomain
import
StdChar
,
StdEnum
,
StdInt
,
StdList
import
StdGeneric
...
...
src/libraries/OS-Independent/Data/Gen
erics/
LexOrd.dcl
→
src/libraries/OS-Independent/Data/GenLexOrd.dcl
View file @
311eadb6
definition
module
Data
.
Gen
erics
.
LexOrd
definition
module
Data
.
GenLexOrd
import
StdGeneric
,
Data
.
Gen
erics
.
Eq
import
StdGeneric
,
Data
.
GenEq
::
LexOrd
=
LT
|
EQ
|
GT
derive
gEq
LexOrd
...
...
src/libraries/OS-Independent/Data/Gen
erics/
LexOrd.icl
→
src/libraries/OS-Independent/Data/GenLexOrd.icl
View file @
311eadb6
implementation
module
Data
.
Gen
erics
.
LexOrd
implementation
module
Data
.
GenLexOrd
import
StdEnv
import
StdGeneric
,
Data
.
Gen
erics
.
Eq
import
StdGeneric
,
Data
.
GenEq
::
LexOrd
=
LT
|
EQ
|
GT
derive
gEq
LexOrd
...
...
src/libraries/OS-Independent/Data/Gen
erics/
Zip.dcl
→
src/libraries/OS-Independent/Data/GenZip.dcl
View file @
311eadb6
definition
module
Data
.
Gen
erics
.
Zip
definition
module
Data
.
GenZip
import
StdGeneric
from
Data
.
Maybe
import
::
Maybe
...
...
src/libraries/OS-Independent/Data/Gen
erics/
Zip.icl
→
src/libraries/OS-Independent/Data/GenZip.icl
View file @
311eadb6
implementation
module
Data
.
Gen
erics
.
Zip
implementation
module
Data
.
GenZip
import
StdGeneric
import
StdEnv
...
...
src/libraries/OS-Independent/Data/Generics.dcl
View file @
311eadb6
...
...
@@ -2,20 +2,20 @@ definition module Data.Generics
import
StdGeneric
import
Data
.
Gen
erics
.
Eq
import
Data
.
Gen
erics
.
LexOrd
import
Data
.
Generics
.
Map
import
Data
.
Generics
.
MapSt
import
Data
.
Generics
.
Reduce
import
Data
.
Gen
erics
.
Zip
import
Data
.
Generics
.
Print
import
Data
.
Generics
.
Parse
import
Data
.
Gen
erics
.
Compress
import
Data
.
Generics
.
Monad
import
Data
.
Generics
.
Hylo
import
Data
.
Generics
.
FMap
import
Data
.
Generics
.
Bimap
import
Data
.
Gen
erics
.
FDomain
import
Data
.
GenEq
import
Data
.
GenLexOrd
import
Control
.
Gen
Map
import
Control
.
Gen
MapSt
import
Control
.
Gen
Reduce
import
Data
.
GenZip
import
Text
.
Gen
Print
import
Text
.
Gen
Parse
import
Data
.
GenCompress
import
Control
.
Gen
Monad
import
Control
.
Gen
Hylo
import
Control
.
Gen
FMap
import
Control
.
Gen
Bimap
import
Data
.
GenFDomain
fromOBJECT
::
!(
OBJECT
x
)
->
x
fromCONS
::
!(
CONS
x
)
->
x
...
...
src/libraries/OS-Independent/Data/Graphviz.dcl
View file @
311eadb6
...
...
@@ -5,7 +5,7 @@ definition module Data.Graphviz
from
StdOverloaded
import
class
toString
,
class
==
from
Data
.
Maybe
import
::
Maybe
from
Data
.
Gen
erics
.
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
View file @
311eadb6
...
...
@@ -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
.
Gen
erics
.
Eq
import
Text
.
Gen
Print
,
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
View file @
311eadb6
...
...
@@ -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
.
Gen
erics
.
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
View file @
311eadb6
...
...
@@ -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
.
Gen
erics
.
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
View file @
311eadb6
...
...
@@ -85,7 +85,7 @@
implementation
module
Data
.
IntSet
.
Base
import
StdInt
,
StdBool
,
StdFunc
,
StdMisc
,
StdOverloaded
,
StdClass
,
StdTuple
import
Data
.
Gen
erics
.
LexOrd
import
Data
.
GenLexOrd
import
qualified
Data
.
List
as
DL
import
Data
.
Maybe
import
Data
.
Monoid
...
...
src/libraries/OS-Independent/Data/List.dcl
View file @
311eadb6
definition
module
Data
.
List
import
StdList
from
Data
.
Gen
erics
.
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
View file @
311eadb6
...
...
@@ -8,7 +8,7 @@ import StdOrdList
import
StdTuple
import
Data
.
Functor
import
Data
.
Gen
erics
.
Eq
import
Data
.
GenEq
import
Data
.
Maybe
import
Data
.
Monoid
from
Data
.
Foldable
import
class
Foldable
(
foldMap
)
...
...
src/libraries/OS-Independent/Data/Map.dcl
View file @
311eadb6
...
...
@@ -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
.
Gen
erics
.
Eq
import
generic
gEq
from
Data
.
Gen
erics
.
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
View file @
311eadb6
...
...
@@ -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
.
Gen
erics
.
Eq
import
generic
gEq
from
Data
.
GenEq
import
generic
gEq
import
qualified
StdList
as
SL
import
Data
.
Maybe
,
Text
.
JSON
,
Data
.
Gen
erics
.
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
View file @
311eadb6
...
...
@@ -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
.
Gen
erics
.
Eq
import
generic
gEq
from
Data
.
Gen
erics
.
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
View file @
311eadb6
implementation
module
Data
.
Set
import
StdClass
,
StdMisc
,
StdBool
,
StdFunc
,
StdInt
,
StdTuple
import
Data
.
Maybe
,
Data
.
Gen
erics
.
Eq
,
Data
.
Gen
erics
.
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
View file @
311eadb6
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
View file @
311eadb6
implementation
module
Data
.
Generics
.
_Array
implementation
module
Data
.
_Array
import
_SystemArray
,
StdInt
,
StdClass
...
...
src/libraries/OS-Independent/Deprecated/Generics/GenBimap.dcl
View file @
311eadb6
definition
module
GenBimap
import
Data
.
Generics
.
Bimap
import
Control
.
Gen
Bimap
src/libraries/OS-Independent/Deprecated/Generics/GenCompress.dcl
View file @
311eadb6
definition
module
GenCompress
import
Data
.
Gen
erics
.
Compress
import
Data
.
GenCompress
src/libraries/OS-Independent/Deprecated/Generics/GenDefault.dcl
View file @
311eadb6
definition
module
GenDefault
import
Data
.
Gen
erics
.
Default
import
Data
.
GenDefault
src/libraries/OS-Independent/Deprecated/Generics/GenEq.dcl
View file @
311eadb6
definition
module
GenEq
import
Data
.
Gen
erics
.
Eq
import
Data
.
GenEq
src/libraries/OS-Independent/Deprecated/Generics/GenFMap.dcl
View file @
311eadb6
definition
module
GenFMap
import
Data
.
Generics
.
FMap
import
Control
.
Gen
FMap
src/libraries/OS-Independent/Deprecated/Generics/GenHylo.dcl
View file @
311eadb6
definition
module
GenHylo
import
Data
.
Generics
.
Hylo
import
Control
.
Gen
Hylo
src/libraries/OS-Independent/Deprecated/Generics/GenLexOrd.dcl
View file @
311eadb6
definition
module
GenLexOrd
import
Data
.
Gen
erics
.
LexOrd
import
Data
.
GenLexOrd
src/libraries/OS-Independent/Deprecated/Generics/GenMap.dcl
View file @
311eadb6
definition
module
GenMap
import
Data
.
Generics
.
Map
import
Control
.
Gen
Map
src/libraries/OS-Independent/Deprecated/Generics/GenMapSt.dcl
View file @
311eadb6
definition
module
GenMapSt
import
Data
.
Generics
.
MapSt
import
Control
.
Gen
MapSt
src/libraries/OS-Independent/Deprecated/Generics/GenMonad.dcl
View file @
311eadb6
definition
module
GenMonad
import
Data
.
Generics
.
Monad
import
Control
.
Gen
Monad
src/libraries/OS-Independent/Deprecated/Generics/GenParse.dcl
View file @
311eadb6
definition
module
GenParse
import
Data
.
Generics
.
Parse
import
Text
.
Gen
Parse
src/libraries/OS-Independent/Deprecated/Generics/GenPrint.dcl
View file @
311eadb6
definition
module
GenPrint
import
Data
.
Generics
.
Print
import
Text
.
Gen
Print
src/libraries/OS-Independent/Deprecated/Generics/GenReduce.dcl
View file @
311eadb6
definition
module
GenReduce
import
Data
.
Generics
.
Reduce
import
Control
.
Gen
Reduce
src/libraries/OS-Independent/Deprecated/Generics/_Array.dcl
View file @
311eadb6
definition
module
_Array
import
Data
.
Generics
.
_Array
import
Data
.
_Array
src/libraries/OS-Independent/Graphics/Scalable/Types.icl
View file @
311eadb6
...
...
@@ -2,7 +2,7 @@ implementation module Graphics.Scalable.Types
import
Data
.
Maybe
import
Data
.
List
import
Data
.
Gen
erics
.
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
.
Gen
Print
derive
gPrint
FontDef
instance
toString
FontDef
where
toString
font
=
printToString
font
...
...
src/libraries/OS-Independent/Testing/Options.dcl
View file @
311eadb6
definition
module
Testing
.
Options
from
Data
.
Gen
erics
.
Default
import
generic
gDefault
from
Data
.
GenDefault
import
generic
gDefault
from
System
.
Options
import
::
Option
/**
...
...
src/libraries/OS-Independent/Testing/Options.icl
View file @
311eadb6
...
...
@@ -4,7 +4,7 @@ import StdList
import
Data
.
Error
from
Data
.
Func
import
$
import
Data
.
Gen
erics
.
Default
import
Data
.
GenDefault
import
Data
.
Maybe
import
System
.
Options
...
...
src/libraries/OS-Independent/
Data/Generics/
Parse.dcl
→
src/libraries/OS-Independent/
Text/Gen
Parse.dcl
View file @
311eadb6
definition
module
Data
.
Generics
.
Parse
definition
module
Text
.
Gen
Parse
import
StdGeneric
from
Data
.
Maybe
import
::
Maybe
...
...
src/libraries/OS-Independent/
Data/Generics/
Parse.icl
→
src/libraries/OS-Independent/
Text/Gen
Parse.icl
View file @
311eadb6
implementation
module
Data
.
Generics
.
Parse
implementation
module
Text
.
Gen
Parse
import
StdGeneric
,
StdEnv
from
Data
.
Maybe
import
::
Maybe
(..)
...
...
src/libraries/OS-Independent/
Data/Generics/
Print.dcl
→
src/libraries/OS-Independent/
Text/Gen
Print.dcl
View file @
311eadb6
definition
module
Data
.
Generics
.
Print
definition
module
Text
.
Gen
Print
import
StdGeneric
...
...
src/libraries/OS-Independent/
Data/Generics/
Print.icl
→
src/libraries/OS-Independent/
Text/Gen
Print.icl
View file @
311eadb6
implementation
module
Data
.
Generics
.
Print
implementation
module
Text
.
Gen
Print
import
StdGeneric
,
StdEnv
from
Data
.
Maybe
import
::
Maybe
(..)
...
...
src/libraries/OS-Independent/Text/XML.icl
View file @
311eadb6
implementation
module
Text
.
XML
import
StdArray
,
StdBool
,
StdInt
,
StdList
,
StdTuple
,
StdGeneric
,
StdFunc
,
StdString
import
Data
.
Error
,
Data
.
Either
,
Data
.
Maybe
,
Text
,
Data
.
Gen
erics
.
Eq
import
Data
.
Error
,
Data
.