65a3af0 · elk · git.iko.soy

git.iko.soy/elk

Do some minor renames in preparation for bigger change

commit65a3af0a11b655ffc0f3660e7a8d37b1ea4cd321 authorEvan Czaplicki <evancz@users.noreply.github.com> dateTue 16 May 2017, 18:53 (9 years ago) parent26bf33f

3 files changed+11−5

compare with master

unifiedsplit

src/Generate/JavaScript/Builder.hs+9−3 src/Generate/JavaScript/Effects.hs+1−1 src/Generate/JavaScript/Expression.hs+1−1

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

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

11{-# OPTIONS_GHC -Wall #-}

22{-# LANGUAGE OverloadedStrings #-}

33module Generate.JavaScript.Builder

4− ( encodeUtf8

4+ ( stmtToBuilder

5+ , exprToBuilder

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

67 , Stmt(..), Case(..), VarDecl(..)

78 , InfixOp(..), PrefixOp(..)

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

130131-- ENCODE

131132

132133

133−encodeUtf8 :: Stmt -> Builder

134−encodeUtf8 stmts =

134+stmtToBuilder :: Stmt -> Builder

135+stmtToBuilder stmts =

135136 fromStmt "" stmts

136137

137138

139+exprToBuilder :: Expr -> Builder

140+exprToBuilder expr =

141+ snd $ fromExpr "" Whatever expr

142+

143+

138144

139145-- HELPERS

140146

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

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

3030 add home mngr makeBuilder =

3131 do builder <- makeBuilder

3232 stmt <- generateManager home mngr

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

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

3434 in

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

3636

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

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

3232

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

3434generateDecl home name def =

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

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

3636 jsBody <- generateDef name def

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

3838