c4cc8ee · elk · git.iko.soy

git.iko.soy/elk

Stop generating extra code around function operators like (+)

With the new code generation, we can now refer to them as functions directly, no need to wrap them in a lambda to ensure that they are in a Binop in the AST

commitc4cc8ee0b86effab205c76d1e42cc24a357a09bb authorEvan Czaplicki <evancz@users.noreply.github.com> dateTue 4 Apr 2017, 20:52 (10 years ago) parent2aa8628

1 file changed+2−12

compare with master

unifiedsplit

src/Parse/Expression.hs+2−12

src/Parse/Expression.hs+2−12

@@ -120,7 +120,7 @@ tuple start =

120120 [ do noSpace pos spos

121121 try (minus >> rightParen)

122122 end <- getPosition

123− return $ mkBinop start end "-"

123+ return $ A.at start end (Src.var "-")

124124

125125 , do checkSpace spos

126126 (entry, _, spos2) <- expression

@@ -131,7 +131,7 @@ tuple start =

131131 op <- infixOp

132132 rightParen

133133 end <- getPosition

134− return $ mkBinop start end op

134+ return $ A.at start end (Src.var op)

135135

136136 , do noSpace pos spos

137137 rightParen

@@ -155,16 +155,6 @@ mkLambda start end arg body =

155155 A.at start end (Src.Lambda (A.at start end (P.Var arg)) body)

156156

157157

158−mkBinop :: R.Position -> R.Position -> Text -> Src.RawExpr

159−mkBinop start end op =

160− let

161− x = A.at start end (Src.var "x")

162− y = A.at start end (Src.var "y")

163− in

164− mkLambda start end "x" $ mkLambda start end "y" $

165− A.at start end (Src.Binop [(x, A.at start end op)] y)

166−

167−

168158chompCommas :: Int -> Parser Int

169159chompCommas n =

170160 oneOf