@@ -120,7 +120,7 @@ tuple start =
120 [ do noSpace pos spos
120 [ do noSpace pos spos
121 try (minus >> rightParen)
121 try (minus >> rightParen)
122 end <- getPosition
122 end <- getPosition
123− return $ mkBinop start end "-"
123+ return $ A.at start end (Src.var "-")
125 , do checkSpace spos
125 , do checkSpace spos
126 (entry, _, spos2) <- expression
126 (entry, _, spos2) <- expression
@@ -131,7 +131,7 @@ tuple start =
131 op <- infixOp
131 op <- infixOp
132 rightParen
132 rightParen
133 end <- getPosition
133 end <- getPosition
134− return $ mkBinop start end op
134+ return $ A.at start end (Src.var op)
136 , do noSpace pos spos
136 , do noSpace pos spos
137 rightParen
137 rightParen
@@ -155,16 +155,6 @@ mkLambda start end arg body =
155 A.at start end (Src.Lambda (A.at start end (P.Var arg)) body)
155 A.at start end (Src.Lambda (A.at start end (P.Var arg)) body)
158−mkBinop :: R.Position -> R.Position -> Text -> Src.RawExpr
159−mkBinop start end op =
161− x = A.at start end (Src.var "x")
162− y = A.at start end (Src.var "y")
164− mkLambda start end "x" $ mkLambda start end "y" $
165− A.at start end (Src.Binop [(x, A.at start end op)] y)
168chompCommas :: Int -> Parser Int
158chompCommas :: Int -> Parser Int
169chompCommas n =
159chompCommas n =