formatting

Author: sfultong

app/Evaluare.hs

@@ -20,7 +20,7 @@ import Reflex.Vty
 import System.Environment (getArgs)
 import qualified System.IO.Strict as Strict
 import qualified Telomare as Tel
-import Telomare (CompiledExpr, CompiledExprF (..), BasicExprF (..), StuckF (..))
+import Telomare (BasicExprF (..), CompiledExpr, CompiledExprF (..), StuckF (..))
 import qualified Telomare.Eval as TE
 import Telomare.Parser (AnnotatedUPT, parseModule)
 import Text.Read (readMaybe)

src/PrettyPrint.hs

@@ -6,11 +6,11 @@ module PrettyPrint where
 
 import Control.Monad.State (State)
 import Data.Map (Map)
-import Telomare (AbortableF (..), CompiledExpr, CompiledExprF (..),
-                 DataType (..), FunctionIndex, LamType (..), LocTag,
-                 ParserTermF (..), BasicExprF (..), PartialType (..),
-                 Pattern (..), StuckExpr, StuckExprF (..), StuckF (..), Term1,
-                 Term3 (..), Term3F (..), UnprocessedParsedTerm (..),
+import Telomare (AbortableF (..), BasicExprF (..), CompiledExpr,
+                 CompiledExprF (..), DataType (..), FunctionIndex, LamType (..),
+                 LocTag, ParserTermF (..), PartialType (..), Pattern (..),
+                 StuckExpr, StuckExprF (..), StuckF (..), Term1, Term3 (..),
+                 Term3F (..), UnprocessedParsedTerm (..),
                  UnprocessedParsedTermF (..), b2i, convertAbortMessage, forget,
                  indentWithChildren', indentWithOneChild',
                  indentWithTwoChildren', locatedNameText, pattern BasicEE)

src/Telomare.hs

@@ -199,11 +199,11 @@ instance Show1 StuckF where
 instance Eq1 StuckF where
   liftEq test a b = case (a,b) of
     (DeferSF ix _, DeferSF iy _) | ix == iy -> True -- test a b
-    (EnvSF, EnvSF)           -> True
-    (SetEnvSF x, SetEnvSF y) -> test x y
-    (GateSF a b, GateSF c d) -> test a c && test b d
-    (LeftSF x, LeftSF y)     -> test x y
-    (RightSF x, RightSF y)   -> test x y
+    (EnvSF, EnvSF)                          -> True
+    (SetEnvSF x, SetEnvSF y)                -> test x y
+    (GateSF a b, GateSF c d)                -> test a c && test b d
+    (LeftSF x, LeftSF y)                    -> test x y
+    (RightSF x, RightSF y)                  -> test x y
     _                                       -> False
 
 newtype FunctionIndex = FunctionIndex { unFunctionIndex :: Int } deriving (Eq, Ord, Enum, Show, Generic)

src/Telomare/Eval.hs

@@ -28,11 +28,11 @@ import qualified Control.Comonad.Trans.Cofree as CofreeT
 import Control.Lens (Identity (runIdentity))
 import Data.Functor.Foldable (Base, cata, embed, para)
 import PrettyPrint
-import Telomare (AbortableF (AbortF), AbstractRunTime, BasicExpr, CompiledExpr,
-                 CompiledExprF, EvalError (..), LocTag (..), LocatedName (..),
-                 BasicExprF (..), PartialType (..), Pattern, ResolverError (..),
-                 RunTimeError (..), StuckExpr, StuckF (..), TelomareLike (..),
-                 Term2, Term3, Term3Builder, Term3F (..),
+import Telomare (AbortableF (AbortF), AbstractRunTime, BasicExpr,
+                 BasicExprF (..), CompiledExpr, CompiledExprF, EvalError (..),
+                 LocTag (..), LocatedName (..), PartialType (..), Pattern,
+                 ResolverError (..), RunTimeError (..), StuckExpr, StuckF (..),
+                 TelomareLike (..), Term2, Term3, Term3Builder, Term3F (..),
                  UnprocessedParsedTerm (..), UnprocessedParsedTermF (..),
                  UnsizedRecursionToken (..), abortEE, appS, b2s, basicEE,
                  convertAbort, convertAbortMessage, convertBasic, convertStuck,

src/Telomare/Possible.hs

@@ -55,8 +55,8 @@ import Debug.Trace
 import GHC.Generics (Generic)
 import PrettyPrint
 import Telomare (AbortBase (..), AbortableF (..), AbstractRunTime (..),
-                 BasicBase (..), BasicExpr, CompiledExpr, FunctionIndex (..),
-                 LocTag (..), BasicExprF (..), PartialType (..),
+                 BasicBase (..), BasicExpr, BasicExprF (..), CompiledExpr,
+                 FunctionIndex (..), LocTag (..), PartialType (..),
                  RunTimeError (..), StuckBase (..), StuckExpr, StuckExprF,
                  StuckF (..), TelomareLike (fromTelomare, toTelomare),
                  Term3 (..), Term3F (..),

src/Telomare/PossibleData.hs

@@ -27,11 +27,12 @@ import GHC.Generics (Generic)
 
 import Data.Bifunctor (first)
 import PrettyPrint
-import Telomare (AbortBase (..), AbortableF (..), BasicBase (..), CompiledExpr,
-                 FunctionIndex, LocTag (..), BasicExprF (..), PartialType (..),
-                 StuckBase (..), StuckF (..), TelomareLike (..),
-                 UnsizedRecursionToken (..), convertAbortMessage, convertBasic,
-                 convertStuck, indentWithChildren', indentWithOneChild',
+import Telomare (AbortBase (..), AbortableF (..), BasicBase (..),
+                 BasicExprF (..), CompiledExpr, FunctionIndex, LocTag (..),
+                 PartialType (..), StuckBase (..), StuckF (..),
+                 TelomareLike (..), UnsizedRecursionToken (..),
+                 convertAbortMessage, convertBasic, convertStuck,
+                 indentWithChildren', indentWithOneChild',
                  indentWithTwoChildren')
 
 debug' :: Bool

src/Telomare/RunTime.hs

@@ -21,8 +21,7 @@ import System.IO (hGetContents)
 import System.Process (CreateProcess (std_out), StdStream (CreatePipe),
                        createProcess, shell)
 import Telomare
-import Telomare.Possible (PPOut (..), basicStep, stuckStep,
-                          transformNoDefer)
+import Telomare.Possible (PPOut (..), basicStep, stuckStep, transformNoDefer)
 import Text.Read (readMaybe)
 
 debug :: Bool

src/Telomare/TypeChecker.hs

@@ -20,10 +20,11 @@ import Data.Set (Set)
 import qualified Data.Set as Set
 import Debug.Trace
 import PrettyPrint
-import Telomare (AbortableF (..), FunctionIndex (FunctionIndex), LocTag (..),
-                 BasicExprF (..), PartialType (..), StuckF (..), Term3,
-                 Term3F (..), TypeCheckError (..), pattern AbortFW,
-                 pattern BasicFW, pattern PairB, pattern StuckFW, pattern ZeroB)
+import Telomare (AbortableF (..), BasicExprF (..),
+                 FunctionIndex (FunctionIndex), LocTag (..), PartialType (..),
+                 StuckF (..), Term3, Term3F (..), TypeCheckError (..),
+                 pattern AbortFW, pattern BasicFW, pattern PairB,
+                 pattern StuckFW, pattern ZeroB)
 
 debug :: Bool
 debug = False