@@ -450,15 +450,17 @@ fallbackToDefault root fallback =
450450
451451generateBranch :: String -> Opt.Branch -> State Int [Statement ()]
452452generateBranch root (Opt.Branch substitutions expr) =
453− do subts <- mapM (loadPath root) substitutions
453+ do substs <- mapM (loadPath root) substitutions
454+ let substStmts =
455+ if null substs then [] else [ VarDeclStmt () substs ]
454456 code <- generateCode expr
455− return (subts ++ toStatementList code)
457+ return (substStmts ++ toStatementList code)
456458
457459
458−loadPath :: String -> (String, DT.Path) -> State Int (Statement ())
460+loadPath :: String -> (String, DT.Path) -> State Int (VarDecl ())
459461loadPath root (name, path) =
460462 do jsAccessExpr <- generateJsExpr (pathToExpr root path)
461− return $ VarDeclStmt () [ varDecl name jsAccessExpr ]
463+ return $ varDecl name jsAccessExpr
462464
463465
464466pathToExpr :: String -> DT.Path -> Opt.Expr