Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
A
array
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
Model registry
Operate
Environments
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
Show more breadcrumbs
Glasgow Haskell Compiler
Packages
array
Commits
8dcd1524
Commit
8dcd1524
authored
12 years ago
by
pcapriotti
Browse files
Options
Downloads
Patches
Plain Diff
Fix inline rule shadowing warnings
This fixes the regression in #6082. MERGED from commit
e4b800af
parent
92f7aac3
Branches
ghc-7.6
Tags
array-0.4.0.1-release
ghc-7.6.1-release
ghc-7.6.2-release
ghc-7.6.3-release
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Data/Array/Base.hs
+6
-4
6 additions, 4 deletions
Data/Array/Base.hs
with
6 additions
and
4 deletions
Data/Array/Base.hs
+
6
−
4
View file @
8dcd1524
...
...
@@ -193,7 +193,7 @@ array (l,u) ies
-- fast unsafeFreeze, namely for Array and UArray (well, they cover
-- almost all cases).
{-# INLINE listArray #-}
{-# INLINE
[1]
listArray #-}
-- | Constructs an immutable array from a list of initial elements.
-- The list gives the elements of the array in ascending order
...
...
@@ -497,7 +497,7 @@ eqUArray arr1@(UArray l1 u1 n1 _) arr2@(UArray l2 u2 n2 _) =
l1
==
l2
&&
u1
==
u2
&&
and
[
unsafeAt
arr1
i
==
unsafeAt
arr2
i
|
i
<-
[
0
..
n1
-
1
]]
{-# INLINE cmpUArray #-}
{-# INLINE
[1]
cmpUArray #-}
cmpUArray
::
(
IArray
UArray
e
,
Ix
i
,
Ord
e
)
=>
UArray
i
e
->
UArray
i
e
->
Ordering
cmpUArray
arr1
arr2
=
compare
(
assocs
arr1
)
(
assocs
arr2
)
...
...
@@ -1700,6 +1700,7 @@ bOOL_SUBINDEX i = i `mod` bitSetSize
-- immutable array (any instance of 'IArray') by taking a complete
-- copy of it.
freeze
::
(
Ix
i
,
MArray
a
e
m
,
IArray
b
e
)
=>
a
i
e
->
m
(
b
i
e
)
{-# NOINLINE [1] freeze #-}
freeze
marr
=
do
(
l
,
u
)
<-
getBounds
marr
n
<-
getNumElements
marr
...
...
@@ -1760,7 +1761,7 @@ foreign import ccall unsafe "memcpy"
* 'Data.Array.ST.STArray' -> 'Data.Array.Array'
-}
{-# INLINE unsafeFreeze #-}
{-# INLINE
[1]
unsafeFreeze #-}
unsafeFreeze
::
(
Ix
i
,
MArray
a
e
m
,
IArray
b
e
)
=>
a
i
e
->
m
(
b
i
e
)
unsafeFreeze
=
freeze
...
...
@@ -1776,6 +1777,7 @@ unsafeFreeze = freeze
-- mutable array (any instance of 'MArray') by taking a complete copy
-- of it.
thaw
::
(
Ix
i
,
IArray
a
e
,
MArray
b
e
m
)
=>
a
i
e
->
m
(
b
i
e
)
{-# NOINLINE [1] thaw #-}
thaw
arr
=
case
bounds
arr
of
(
l
,
u
)
->
do
marr
<-
newArray_
(
l
,
u
)
...
...
@@ -1845,7 +1847,7 @@ thawSTUArray (UArray l u n arr) = do
* 'Data.Array.Array' -> 'Data.Array.ST.STArray'
-}
{-# INLINE unsafeThaw #-}
{-# INLINE
[1]
unsafeThaw #-}
unsafeThaw
::
(
Ix
i
,
IArray
a
e
,
MArray
b
e
m
)
=>
a
i
e
->
m
(
b
i
e
)
unsafeThaw
=
thaw
...
...
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