[commit: ghc] ghc-7.10: fix spInfoSrcLoc field name (f10b79d)
git at git.haskell.org
git at git.haskell.org
Tue Dec 23 12:26:04 UTC 2014
Repository : ssh://git@git.haskell.org/ghc
On branch : ghc-7.10
Link : http://ghc.haskell.org/trac/ghc/changeset/f10b79dc0f68c8983af18892b7107692bc5917fb/ghc
>---------------------------------------------------------------
commit f10b79dc0f68c8983af18892b7107692bc5917fb
Author: Facundo Domínguez <facundo.dominguez at tweag.io>
Date: Mon Dec 22 19:20:11 2014 -0200
fix spInfoSrcLoc field name
(cherry picked from commit 1da2c0fcd1f9f00e25bed8a8abcc81e3f5b1de04)
>---------------------------------------------------------------
f10b79dc0f68c8983af18892b7107692bc5917fb
libraries/base/GHC/StaticPtr.hs | 4 ++--
testsuite/tests/deSugar/should_run/DsStaticPointers.stdout | 10 +++++-----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/libraries/base/GHC/StaticPtr.hs b/libraries/base/GHC/StaticPtr.hs
index b92b843..b58564e 100644
--- a/libraries/base/GHC/StaticPtr.hs
+++ b/libraries/base/GHC/StaticPtr.hs
@@ -24,7 +24,7 @@
--
-- To solve such concern, the references provided by this module offer a key
-- that can be used to locate the values on each process. Each process maintains
--- a global and inmutable table of references which can be looked up with a
+-- a global and immutable table of references which can be looked up with a
-- given key. This table is known as the Static Pointer Table. The reference can
-- then be dereferenced to obtain the value.
--
@@ -88,7 +88,7 @@ data StaticPtrInfo = StaticPtrInfo
, spInfoName :: String
-- | Source location of the definition of the static pointer as a
-- @(Line, Column)@ pair.
- , spIntoSrcLoc :: (Int, Int)
+ , spInfoSrcLoc :: (Int, Int)
}
deriving (Show, Typeable)
diff --git a/testsuite/tests/deSugar/should_run/DsStaticPointers.stdout b/testsuite/tests/deSugar/should_run/DsStaticPointers.stdout
index 55ec658..b9d683e 100644
--- a/testsuite/tests/deSugar/should_run/DsStaticPointers.stdout
+++ b/testsuite/tests/deSugar/should_run/DsStaticPointers.stdout
@@ -1,5 +1,5 @@
-StaticPtrInfo {spInfoPackageId = "main", spInfoModuleName = "Main", spInfoName = "sptEntry:1", spIntoSrcLoc = (10,32)}
-StaticPtrInfo {spInfoPackageId = "main", spInfoModuleName = "Main", spInfoName = "sptEntry:2", spIntoSrcLoc = (11,33)}
-StaticPtrInfo {spInfoPackageId = "main", spInfoModuleName = "Main", spInfoName = "sptEntry:0", spIntoSrcLoc = (21,13)}
-StaticPtrInfo {spInfoPackageId = "main", spInfoModuleName = "Main", spInfoName = "sptEntry:3", spIntoSrcLoc = (13,33)}
-StaticPtrInfo {spInfoPackageId = "main", spInfoModuleName = "Main", spInfoName = "sptEntry:4", spIntoSrcLoc = (14,33)}
+StaticPtrInfo {spInfoPackageId = "main", spInfoModuleName = "Main", spInfoName = "sptEntry:1", spInfoSrcLoc = (10,32)}
+StaticPtrInfo {spInfoPackageId = "main", spInfoModuleName = "Main", spInfoName = "sptEntry:2", spInfoSrcLoc = (11,33)}
+StaticPtrInfo {spInfoPackageId = "main", spInfoModuleName = "Main", spInfoName = "sptEntry:0", spInfoSrcLoc = (21,13)}
+StaticPtrInfo {spInfoPackageId = "main", spInfoModuleName = "Main", spInfoName = "sptEntry:3", spInfoSrcLoc = (13,33)}
+StaticPtrInfo {spInfoPackageId = "main", spInfoModuleName = "Main", spInfoName = "sptEntry:4", spInfoSrcLoc = (14,33)}
More information about the ghc-commits
mailing list