Switch everything over to using Source.Range.

github · robrix · Sep 20, 2019 · Sep 20, 2019 · Sep 20, 2019 · Sep 20, 2019
commit 1d5e15010f6cddd60399642f921c148e492a2bec
diff --git a/semantic.cabal b/semantic.cabal
@@ -164,7 +164,6 @@ library
                      , Data.Patch
                      , Data.Project
                      , Data.Quieterm
-                     , Data.Range
                      , Data.Reprinting.Errors
                      , Data.Reprinting.Fragment
                      , Data.Reprinting.Operator
@@ -360,7 +359,6 @@ test-suite test
                      , Data.Graph.Spec
                      , Data.Mergeable
                      , Data.Language.Spec
-                     , Data.Range.Spec
                      , Data.Scientific.Spec
                      , Data.Semigroup.App.Spec
                      , Data.Source.Spec

diff --git a/src/Analysis/TOCSummary.hs b/src/Analysis/TOCSummary.hs
@@ -14,12 +14,12 @@ import           Data.Error (Error (..), Colourize (..), showExpectation)
 import           Data.Flag
 import           Data.Language as Language
 import           Data.Location
-import           Data.Range
 import           Data.Source as Source
 import qualified Data.Syntax as Syntax
 import qualified Data.Syntax.Declaration as Declaration
 import           Data.Term
 import qualified Data.Text as T
+import           Source.Range
 import qualified Language.Markdown.Syntax as Markdown
 
 -- | A declaration’s identifier and type.

diff --git a/src/Assigning/Assignment.hs b/src/Assigning/Assignment.hs
@@ -100,13 +100,13 @@ import qualified Assigning.Assignment.Table as Table
 import Control.Monad.Except (MonadError (..))
 import Data.AST
 import Data.Error
-import Data.Range
 import qualified Data.Location as L
 import qualified Data.Source as Source (Source, slice, sourceBytes)
 import Data.Span hiding (HasSpan(..))
 import Data.Term
 import Data.Text (Text)
 import Data.Text.Encoding (decodeUtf8')
+import Source.Range
 import Text.Parser.Combinators as Parsers hiding (choice)
 import TreeSitter.Language
 

diff --git a/src/Assigning/Assignment/Deterministic.hs b/src/Assigning/Assignment/Deterministic.hs
@@ -13,7 +13,6 @@ import Data.AST
 import Data.Error
 import qualified Data.IntMap as IntMap
 import qualified Data.IntSet as IntSet
-import Data.Range
 import Data.Location
 import Data.Source as Source
 import Data.Span hiding (HasSpan (..))

diff --git a/src/Data/Location.hs b/src/Data/Location.hs
@@ -9,8 +9,8 @@ module Data.Location
 import Prologue
 
 import Control.Lens.Lens
-import Data.Range
 import Data.Span
+import Source.Range
 
 data Location
   = Location

diff --git a/src/Data/Range.hs b/src/Data/Range.hs
diff --git a/src/Data/Source.hs b/src/Data/Source.hs
@@ -33,11 +33,11 @@ import           Data.Array
 import qualified Data.ByteString as B
 import           Data.Char (ord)
 import           Data.List (span)
-import           Data.Range
 import           Data.Span hiding (HasSpan (..))
 import           Data.String (IsString (..))
 import qualified Data.Text as T
 import qualified Data.Text.Encoding as T
+import           Source.Range
 
 
 -- | The contents of a source file. This is represented as a UTF-8
@@ -68,7 +68,7 @@ totalRange = Range 0 . B.length . sourceBytes
 totalSpan :: Source -> Span
 totalSpan source = Span (Pos 1 1) (Pos (length ranges) (succ (end lastRange - start lastRange)))
   where ranges = sourceLineRanges source
-        lastRange = fromMaybe emptyRange (getLast (foldMap (Last . Just) ranges))
+        lastRange = fromMaybe lowerBound (getLast (foldMap (Last . Just) ranges))
 
 
 -- En/decoding
@@ -157,5 +157,5 @@ rangeToSpan source (Range rangeStart rangeEnd) = Span startPos endPos
        firstLine = length before
         (before, rest) = span ((< rangeStart) . end) (sourceLineRanges source)
         (lineRanges, _) = span ((<= rangeEnd) . start) rest
-        firstRange = fromMaybe emptyRange (getFirst (foldMap (First . Just) lineRanges))
+        firstRange = fromMaybe lowerBound (getFirst (foldMap (First . Just) lineRanges))
         lastRange  = fromMaybe firstRange (getLast (foldMap (Last . Just) lineRanges))
diff --git a/src/Data/Syntax.hs b/src/Data/Syntax.hs
@@ -5,7 +5,6 @@ module Data.Syntax where
 import Data.Abstract.Evaluatable hiding (Empty, Error)
 import Data.Aeson as Aeson (ToJSON(..), object)
 import Data.JSON.Fields
-import Data.Range
 import Data.Location
 import qualified Data.Set as Set
 import Data.Sum

diff --git a/src/Parsing/CMark.hs b/src/Parsing/CMark.hs
@@ -8,7 +8,6 @@ module Parsing.CMark
 import CMarkGFM
 import qualified Data.AST as A
 import Data.Ix
-import Data.Range
 import Data.Location
 import Data.Span
 import Data.Source

diff --git a/src/Reprinting/Tokenize.hs b/src/Reprinting/Tokenize.hs
@@ -34,13 +34,13 @@ import qualified Streaming.Prelude as Streaming
 
 import           Data.History
 import           Data.List (intersperse)
-import           Data.Range
 import           Data.Reprinting.Scope (Scope)
 import qualified Data.Reprinting.Scope as Scope
 import           Data.Reprinting.Token as Token
 import           Data.Reprinting.Operator as Operator
 import           Data.Source
 import           Data.Term
+import           Source.Range
 
 -- | The 'Tokenizer' monad represents a context in which 'Control'
 -- tokens and 'Element' tokens can be sent to some downstream

diff --git a/src/Tags/Taggable.hs b/src/Tags/Taggable.hs
@@ -32,9 +32,9 @@ import Data.Abstract.Name
 import Data.Blob
 import Data.Language
 import Data.Location
-import Data.Range
 import Data.Term
 import Data.Text hiding (empty)
+import Source.Range
 
 import Streaming hiding (Sum)
 import Streaming.Prelude (yield)

diff --git a/test/Assigning/Assignment/Spec.hs b/test/Assigning/Assignment/Spec.hs
@@ -5,14 +5,14 @@ import Assigning.Assignment
 import Data.AST
 import Data.Bifunctor (first)
 import Data.Ix
-import Data.Range
 import Data.Semigroup ((<>))
 import Data.Source
 import Data.Span
 import Data.Term
 import Data.Text as T (Text, length, words)
 import Data.Text.Encoding (encodeUtf8)
 import GHC.Stack (getCallStack)
+import Source.Range
 import Prelude hiding (words)
 import Test.Hspec
 import TreeSitter.Language (Symbol (..), SymbolType (..))

diff --git a/test/Data/Functor/Listable.hs b/test/Data/Functor/Listable.hs
@@ -28,7 +28,6 @@ import Data.Functor.Both
 import qualified Data.Language as Language
 import Data.List.NonEmpty
 import Data.Patch
-import Data.Range
 import Data.Location
 import Data.Semigroup.App
 import Data.Span
@@ -47,6 +46,7 @@ import Data.Text as T (Text, pack)
 import Data.These
 import Data.Sum
 import Diffing.Algorithm.RWS
+import Source.Range
 import Test.LeanCheck
 
 type Tier a = [a]

diff --git a/test/Data/Range/Spec.hs b/test/Data/Range/Spec.hs
diff --git a/test/Data/Source/Spec.hs b/test/Data/Source/Spec.hs
@@ -1,9 +1,9 @@
 module Data.Source.Spec (spec, testTree) where
 
-import Data.Range
 import Data.Source
 import Data.Span
 import qualified Data.Text as Text
+import Source.Range
 
 import Test.Hspec
 

diff --git a/test/Spec.hs b/test/Spec.hs
@@ -15,7 +15,6 @@ import qualified Data.Abstract.Path.Spec
 import qualified Data.Functor.Classes.Generic.Spec
 import qualified Data.Graph.Spec
 import qualified Data.Language.Spec
-import qualified Data.Range.Spec
 import qualified Data.Scientific.Spec
 import qualified Data.Semigroup.App.Spec
 import qualified Data.Source.Spec
@@ -81,7 +80,6 @@ legacySpecs = parallel $ do
   describe "Data.Abstract.Path" Data.Abstract.Path.Spec.spec
   describe "Data.Abstract.Name" Data.Abstract.Name.Spec.spec
   describe "Data.Functor.Classes.Generic" Data.Functor.Classes.Generic.Spec.spec
-  describe "Data.Range" Data.Range.Spec.spec
   describe "Data.Semigroup.App" Data.Semigroup.App.Spec.spec
   describe "Data.Source" Data.Source.Spec.spec
   describe "Data.Term" Data.Term.Spec.spec

diff --git a/test/SpecHelpers.hs b/test/SpecHelpers.hs
@@ -44,7 +44,6 @@ import Data.Foldable (toList)
 import Data.Functor.Listable as X
 import Data.Language as X
 import Data.List.NonEmpty as X (NonEmpty(..))
-import Data.Range as X
 import Data.Semilattice.Lower as X
 import Data.Source as X
 import Data.Span as X hiding (HasSpan(..))
@@ -55,6 +54,7 @@ import Parsing.Parser as X
 import Semantic.Task as X
 import Semantic.Util as X
 import Semantic.Graph (runHeap, runScopeGraph)
+import Source.Range as X
 import System.FilePath as X
 import Debug.Trace as X (traceShowM, traceM)