Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
D
dph
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
Glasgow Haskell Compiler
Packages
dph
Commits
556e09cd
Commit
556e09cd
authored
11 years ago
by
thoughtpolice
Browse files
Options
Downloads
Patches
Plain Diff
Revert "Fix breaking changes due to issue #7021"
This reverts commit
aeef7aad
.
parent
aeef7aad
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
dph-lifted-copy/Data/Array/Parallel/Lifted/TH/Repr.hs
+10
-9
10 additions, 9 deletions
dph-lifted-copy/Data/Array/Parallel/Lifted/TH/Repr.hs
with
10 additions
and
9 deletions
dph-lifted-copy/Data/Array/Parallel/Lifted/TH/Repr.hs
+
10
−
9
View file @
556e09cd
...
@@ -88,7 +88,7 @@ normaliseTy ty
...
@@ -88,7 +88,7 @@ normaliseTy ty
substTy
::
[(
Name
,
Type
)]
->
Type
->
Type
substTy
::
[(
Name
,
Type
)]
->
Type
->
Type
substTy
_
(
ForallT
_
_
_
)
substTy
_
(
ForallT
_
_
_
)
=
error
"DPH gen: can't substitute in forall ty"
=
error
"DPH gen: can't substitute in forall ty"
substTy
env
(
VarT
v
)
=
case
lookup
v
env
of
substTy
env
(
VarT
v
)
=
case
lookup
v
env
of
...
@@ -139,7 +139,7 @@ methodVals (ForallT (PlainTV vv : _) _ ty)
...
@@ -139,7 +139,7 @@ methodVals (ForallT (PlainTV vv : _) _ ty)
where
where
val
v
(
VarT
n
)
|
v
==
n
=
ScalarVal
val
v
(
VarT
n
)
|
v
==
n
=
ScalarVal
val
v
(
AppT
(
ConT
c
)
(
VarT
n
))
val
v
(
AppT
(
ConT
c
)
(
VarT
n
))
|
c
==
''PData
&&
v
==
n
=
PDataVal
|
c
==
''PData
&&
v
==
n
=
PDataVal
|
c
==
''
[]
&&
v
==
n
=
ListVal
|
c
==
''
[]
&&
v
==
n
=
ListVal
...
@@ -182,7 +182,7 @@ recursiveMethod gen name avs res
...
@@ -182,7 +182,7 @@ recursiveMethod gen name avs res
pat
(
PatSplit
p
)
=
p
pat
(
PatSplit
p
)
=
p
pat
(
CaseSplit
p
_
_
)
=
p
pat
(
CaseSplit
p
_
_
)
=
p
split_arg
(
OtherVal
,
g
)
split_arg
(
OtherVal
,
g
)
=
let
v
=
mkName
(
g
""
)
=
let
v
=
mkName
(
g
""
)
in
(
PatSplit
(
varP
v
),
OtherArg
(
varE
v
))
in
(
PatSplit
(
varP
v
),
OtherArg
(
varE
v
))
...
@@ -321,7 +321,7 @@ voidMethod void pvoid meth avs res
...
@@ -321,7 +321,7 @@ voidMethod void pvoid meth avs res
result
PDataVal
=
varE
pvoid
result
PDataVal
=
varE
pvoid
result
UnitVal
=
conE
'
()
result
UnitVal
=
conE
'
()
result
_
=
error
"DPH gen: voidMethod: no match"
result
_
=
error
"DPH gen: voidMethod: no match"
-- --
-- --
-- ()
-- ()
-- --
-- --
...
@@ -344,7 +344,7 @@ unitMethod punit meth avs res
...
@@ -344,7 +344,7 @@ unitMethod punit meth avs res
mkpat
ScalarVal
_
=
(
conP
'
()
[]
,
Nothing
)
mkpat
ScalarVal
_
=
(
conP
'
()
[]
,
Nothing
)
mkpat
PDataVal
_
=
(
conP
punit
[]
,
Nothing
)
mkpat
PDataVal
_
=
(
conP
punit
[]
,
Nothing
)
mkpat
ListVal
g
mkpat
ListVal
g
=
let
xs
=
mkName
(
g
"xs"
)
=
let
xs
=
mkName
(
g
"xs"
)
in
(
varP
xs
,
Just
$
\
e
->
varE
'foldr
`
appEs
`
[
varE
'seq
,
e
,
varE
xs
])
in
(
varP
xs
,
Just
$
\
e
->
varE
'foldr
`
appEs
`
[
varE
'seq
,
e
,
varE
xs
])
...
@@ -367,14 +367,14 @@ wrapPRInstance :: Name -> Name -> Name -> Name -> Q [Dec]
...
@@ -367,14 +367,14 @@ wrapPRInstance :: Name -> Name -> Name -> Name -> Q [Dec]
wrapPRInstance
ty
wrap
unwrap
pwrap
wrapPRInstance
ty
wrap
unwrap
pwrap
=
do
=
do
methods
<-
genPR_methods
(
recursiveMethod
(
wrapGen
wrap
unwrap
pwrap
))
methods
<-
genPR_methods
(
recursiveMethod
(
wrapGen
wrap
unwrap
pwrap
))
return
[
InstanceD
[
C
onT
''PA
`
AppT
`
a
]
return
[
InstanceD
[
C
lassP
''PA
[
a
]
]
(
ConT
''PR
`
AppT
`
(
ConT
ty
`
AppT
`
a
))
(
ConT
''PR
`
AppT
`
(
ConT
ty
`
AppT
`
a
))
methods
]
methods
]
where
where
a
=
VarT
(
mkName
"a"
)
a
=
VarT
(
mkName
"a"
)
wrapGen
::
Name
->
Name
->
Name
->
Gen
wrapGen
::
Name
->
Name
->
Name
->
Gen
wrapGen
wrap
unwrap
pwrap
wrapGen
wrap
unwrap
pwrap
=
Gen
{
recursiveCalls
=
1
=
Gen
{
recursiveCalls
=
1
,
recursiveName
=
recursiveName'
,
recursiveName
=
recursiveName'
,
split
=
split'
,
split
=
split'
...
@@ -437,7 +437,7 @@ instance_PR_tup :: Int -> DecQ
...
@@ -437,7 +437,7 @@ instance_PR_tup :: Int -> DecQ
instance_PR_tup
arity
instance_PR_tup
arity
=
do
=
do
methods
<-
genPR_methods
(
recursiveMethod
(
tupGen
arity
))
methods
<-
genPR_methods
(
recursiveMethod
(
tupGen
arity
))
return
$
InstanceD
[
C
onT
''PR
`
AppT
`
ty
|
ty
<-
tys
]
return
$
InstanceD
[
C
lassP
''PR
[
ty
]
|
ty
<-
tys
]
(
ConT
''PR
`
AppT
`
(
TupleT
arity
`
mkAppTs
`
tys
))
(
ConT
''PR
`
AppT
`
(
TupleT
arity
`
mkAppTs
`
tys
))
methods
methods
where
where
...
@@ -472,7 +472,7 @@ tupGen arity = Gen { recursiveCalls = arity
...
@@ -472,7 +472,7 @@ tupGen arity = Gen { recursiveCalls = arity
mkunzip
|
arity
==
2
=
mkName
"unzip"
mkunzip
|
arity
==
2
=
mkName
"unzip"
|
otherwise
=
mkName
(
"unzip"
++
show
arity
)
|
otherwise
=
mkName
(
"unzip"
++
show
arity
)
split'
_
=
error
"DPH Gen: tupGen/split: no match"
split'
_
=
error
"DPH Gen: tupGen/split: no match"
...
@@ -485,3 +485,4 @@ tupGen arity = Gen { recursiveCalls = arity
...
@@ -485,3 +485,4 @@ tupGen arity = Gen { recursiveCalls = arity
pvs
=
take
arity
[
c
:
"s"
|
c
<-
[
'a'
..
]]
pvs
=
take
arity
[
c
:
"s"
|
c
<-
[
'a'
..
]]
tyname
=
"("
++
intercalate
","
vs
++
")"
tyname
=
"("
++
intercalate
","
vs
++
")"
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment