90243ae · elk · git.iko.soy

git.iko.soy/elk

on master help sign in

Combine nested ifs into a big block when possible

90243aeEvan Czaplicki11 years ago

src/Generate/JavaScript.hs+17−1

compare with master

unifiedsplit

@@ -309,8 +309,11 @@ generateLet givenDefs givenBody =

309-- GENERATE IFS

310

311generateIf :: [(Canonical.Expr, Canonical.Expr)] -> Canonical.Expr -> State Int Code

312−generateIf branches finally =

312+generateIf givenBranches givenFinally =

313 let

314+ (branches, finally) =

315+ combineIfs givenBranches givenFinally

316+

314 convertBranch (condition, expr) =

317 convertBranch (condition, expr) =

315 (,) <$> exprToJsExpr condition <*> exprToCode expr

318 (,) <$> exprToJsExpr condition <*> exprToCode expr

316

319

@@ -330,6 +333,19 @@ generateIf branches finally =

330 jsExpr (foldr ifExpression (toExpr jsFinally) (map (second toExpr) jsBranches))

333 jsExpr (foldr ifExpression (toExpr jsFinally) (map (second toExpr) jsBranches))

331

334

332

335

336+combineIfs

337+ :: [(Canonical.Expr, Canonical.Expr)]

338+ -> Canonical.Expr

339+ -> ([(Canonical.Expr, Canonical.Expr)], Canonical.Expr)

340+combineIfs branches finally =

341+ case finally of

342+ A.A _ (MultiIf subBranches subFinally) ->

343+ combineIfs (branches ++ subBranches) subFinally

344+

345+ _ ->

346+ (branches, finally)

347+

348+

333-- DEFINITIONS

349-- DEFINITIONS

334

350

335defToStatements :: Canonical.Def -> State Int [Statement ()]

351defToStatements :: Canonical.Def -> State Int [Statement ()]