3 files changed, 10 insertions, 7 deletions

diff --git a/src/LambdaCube/Compiler/DesugaredSource.hs b/src/LambdaCube/Compiler/DesugaredSource.hs
index ec08a36f..f8e12ee7 100644
--- a/src/LambdaCube/Compiler/DesugaredSource.hs
+++ b/src/LambdaCube/Compiler/DesugaredSource.hs
@@ -125,8 +125,11 @@ getMatchName _ = Nothing
 
 -------------------------------------------------------------------------------- fixities
 
-data FixityDef = Infix | InfixL | InfixR deriving (Eq, Show)
-type Fixity = (FixityDef, Int)
+data FixityDir = Infix | InfixL | InfixR
+    deriving (Eq, Show)
+
+data Fixity = Fixity FixityDir Int
+    deriving (Eq, Show)
 
 -------------------------------------------------------------------------------- source infos
 
@@ -235,7 +238,7 @@ sName (SIName _ s) = s
 
 --appName f (SIName si n) = SIName si $ f n
 
-getFixity (SIName_ _ f _) = fromMaybe (InfixL, 9) f
+getFixity (SIName_ _ f _) = fromMaybe (Fixity InfixL 9) f
 
 -------------
 
diff --git a/src/LambdaCube/Compiler/Lexer.hs b/src/LambdaCube/Compiler/Lexer.hs
index cbf0084d..bd9f2964 100644
--- a/src/LambdaCube/Compiler/Lexer.hs
+++ b/src/LambdaCube/Compiler/Lexer.hs
@@ -276,7 +276,7 @@ parseFixity = do
        <|> InfixL <$ reserved "infixl"
        <|> InfixR <$ reserved "infixr"
     LInt n <- parseLit
-    return (dir, fromIntegral n)
+    return $ Fixity dir $ fromIntegral n
 
 calcPrec
     :: (MonadError (f, f){-operator mismatch-} m)
@@ -293,8 +293,8 @@ calcPrec app getFixity = compileOps []
         | c == GT || c == EQ && dir == dir' && dir == InfixR = compileOps ((op, e): acc) e'' es'
         | otherwise = throwError (op', op)  -- operator mismatch
       where
-        (dir', i') = getFixity op'
-        (dir, i) = getFixity op
+        Fixity dir' i' = getFixity op'
+        Fixity dir i = getFixity op
         c | null es   = LT
           | null acc  = GT
           | otherwise = compare i i'
diff --git a/src/LambdaCube/Compiler/Parser.hs b/src/LambdaCube/Compiler/Parser.hs
index 48447467..ee91c920 100644
--- a/src/LambdaCube/Compiler/Parser.hs
+++ b/src/LambdaCube/Compiler/Parser.hs
@@ -126,7 +126,7 @@ addForalls_ s = addForalls . (Set.fromList (sName <$> s) <>) <$> asks (definedSe
 
 mkDesugarInfo :: [Stmt] -> DesugarInfo
 mkDesugarInfo ss = DesugarInfo
-    { fixityMap = Map.fromList $ ("'EqCTt", (Infix, -1)): [(sName s, f) | PrecDef s f <- ss]
+    { fixityMap = Map.fromList $ ("'EqCTt", Fixity Infix (-1)): [(sName s, f) | PrecDef s f <- ss]
     , consMap = Map.fromList $
         [(sName cn, Left ((CaseName $ sName t, pars ty), second pars <$> cs)) | Data t ps ty cs <- ss, (cn, ct) <- cs]
      ++ [(sName t, Right $ pars $ UncurryS ps ty) | Data t ps ty _ <- ss]