65a3af0 · elk · git.iko.soy

src/Generate/JavaScript/Builder.hs+9−3

compare with master

unifiedsplit

@@ -1,7 +1,8 @@

1{-# OPTIONS_GHC -Wall #-}

2{-# LANGUAGE OverloadedStrings #-}

3module Generate.JavaScript.Builder

4− ( encodeUtf8

4+ ( stmtToBuilder

5+ , exprToBuilder

5 , Expr(..), Id(..), Prop(..), LValue(..)

6 , Expr(..), Id(..), Prop(..), LValue(..)

6 , Stmt(..), Case(..), VarDecl(..)

7 , Stmt(..), Case(..), VarDecl(..)

7 , InfixOp(..), PrefixOp(..)

8 , InfixOp(..), PrefixOp(..)

@@ -130,11 +131,16 @@ data PrefixOp

130-- ENCODE

131-- ENCODE

131

132

133

133−encodeUtf8 :: Stmt -> Builder

134+stmtToBuilder :: Stmt -> Builder

134−encodeUtf8 stmts =

135+stmtToBuilder stmts =

135 fromStmt "" stmts

136 fromStmt "" stmts

136

137

138

139+exprToBuilder :: Expr -> Builder

140+exprToBuilder expr =

141+ snd $ fromExpr "" Whatever expr

142+

143+

138

144

139-- HELPERS

145-- HELPERS

140

146

src/Generate/JavaScript/Effects.hs+1−1

@@ -30,7 +30,7 @@ generate managers =

30 add home mngr makeBuilder =

31 do builder <- makeBuilder

32 stmt <- generateManager home mngr

33− return (JS.encodeUtf8 stmt <> builder)

33+ return (JS.stmtToBuilder stmt <> builder)

34 in

35 Map.foldrWithKey' add (return "") managers

36

src/Generate/JavaScript/Expression.hs+1−1

@@ -32,7 +32,7 @@ import qualified Optimize.DecisionTree as DT

32

33generateDecl :: ModuleName.Canonical -> Text -> Opt.Def -> Generator JS.Stmt

34generateDecl home name def =

35− do jsName <- Var.getGlobalName (V.Global home name)

35+ do jsName <- Var.globalName (V.Global home name)

36 jsBody <- generateDef name def

37 return $ JS.VarDeclStmt [ Help.varDecl jsName jsBody ]

38