git.iko.soy/elk
on master help sign in
Fix generation of top level definitions
61db436Evan Czaplicki
src/Generate/JavaScript.hs+7−3
compare with master
unifiedsplit
@@ -29,10 +29,13 @@ generate module_ =
29 definitions =
29 definitions =
30 Module.program (Module.body module_)
30 Module.program (Module.body module_)
31
31
32+ setup =
33+ Var.define (Just (Module.name module_)) "_op" (ObjectLit () [])
34+
32 stmts =
35 stmts =
33 State.evalState (mapM generateDef definitions) 0
36 State.evalState (mapM generateDef definitions) 0
34 in
37 in
35− PP.displayS (PP.renderPretty 0.4 120 (ES.prettyPrint stmts)) ""
38+ PP.displayS (PP.renderPretty 0.4 120 (ES.prettyPrint (setup:stmts))) ""
36
39
37
40
38-- CODE CHUNKS
41-- CODE CHUNKS
@@ -101,7 +104,7 @@ generateDef def =
101 Opt.Def (Opt.Facts home _) name body ->
104 Opt.Def (Opt.Facts home _) name body ->
102 (,,) home name <$> generateJsExpr body
105 (,,) home name <$> generateJsExpr body
103
106
104− return (VarDeclStmt () [ varDecl (Var.defName home name) jsBody ])
107+ return (Var.define home name jsBody)
105
108
106
109
107-- EXPRESSIONS
110-- EXPRESSIONS
@@ -255,8 +258,9 @@ generateTailFunction name args body =
255
258
256
259
257generateFunctionWithArity :: [String] -> Code -> Expression ()
260generateFunctionWithArity :: [String] -> Code -> Expression ()
258−generateFunctionWithArity args code =
261+generateFunctionWithArity rawArgs code =
259 let
262 let
263+ args = map Var.safe rawArgs
260 arity = length args
264 arity = length args
261 in
265 in
262 if 2 <= arity && arity <= 9 then
266 if 2 <= arity && arity <= 9 then
src/Generate/JavaScript/Variable.hs+20−5
@@ -1,4 +1,4 @@
1−module Generate.JavaScript.Variable (fresh, canonical, defName, safe) where
1+module Generate.JavaScript.Variable (fresh, canonical, define, safe) where
2
2
3import qualified Control.Monad.State as State
3import qualified Control.Monad.State as State
4import qualified Data.List as List
4import qualified Data.List as List
@@ -23,14 +23,29 @@ fresh =
23
23
24-- DEF NAMES
24-- DEF NAMES
25
25
26−defName :: Maybe ModuleName.Canonical -> String -> String
26+define :: Maybe ModuleName.Canonical -> String -> JS.Expression () -> JS.Statement ()
27−defName maybeHome name =
27+define maybeHome name body =
28+ let
29+ varDecl safeName =
30+ JS.VarDeclStmt () [ JS.VarDecl () (JS.Id () safeName) (Just body) ]
31+ in
28 case maybeHome of
32 case maybeHome of
29 Nothing ->
33 Nothing ->
30− safe name
34+ varDecl (safe name)
31
35
32 Just home ->
36 Just home ->
37+ if Help.isOp name then
38+ let
39+ root =
40+ JS.VarRef () (JS.Id () (canonicalPrefix home "_op"))
41+
42+ lvalue =
43+ JS.LBracket () root (JS.StringLit () name)
44+ in
45+ JS.ExprStmt () (JS.AssignExpr () JS.OpAssign lvalue body)
46+
47+ else
33− canonicalPrefix home (safe name)
48+ varDecl (canonicalPrefix home (safe name))
34
49
35
50
36-- INSTANTIATE VARIABLES
51-- INSTANTIATE VARIABLES