git.iko.soy/elk
on master help sign in
Go back to old fashioned variable names: $Basics.fst instead of elm_lang$core$Basics$fst
86a4c1bEvan Czaplicki
src/Generate/JavaScript.hs+2−2
compare with master
unifiedsplit
@@ -30,7 +30,7 @@ generate module_ =
30 Module.program (Module.body module_)
30 Module.program (Module.body module_)
31
31
32 setup =
32 setup =
33− Var.define (Just (Module.name module_)) "_op" (ObjectLit () [])
33+ Var.define "_op" (ObjectLit () [])
34
34
35 stmts =
35 stmts =
36 State.evalState (mapM generateDef definitions) 0
36 State.evalState (mapM generateDef definitions) 0
@@ -104,7 +104,7 @@ generateDef def =
104 Opt.Def (Opt.Facts home _) name body ->
104 Opt.Def (Opt.Facts home _) name body ->
105 (,,) home name <$> generateJsExpr body
105 (,,) home name <$> generateJsExpr body
106
106
107− return (Var.define home name jsBody)
107+ return (Var.define name jsBody)
108
108
109
109
110-- EXPRESSIONS
110-- EXPRESSIONS
src/Generate/JavaScript/Variable.hs+25−37
@@ -23,29 +23,20 @@ fresh =
23
23
24-- DEF NAMES
24-- DEF NAMES
25
25
26−define :: Maybe ModuleName.Canonical -> String -> JS.Expression () -> JS.Statement ()
26+define :: String -> JS.Expression () -> JS.Statement ()
27−define maybeHome name body =
27+define name body =
28− let
29− varDecl safeName =
30− JS.VarDeclStmt () [ JS.VarDecl () (JS.Id () safeName) (Just body) ]
31− in
32− case maybeHome of
33− Nothing ->
34− varDecl (safe name)
35−
36− Just home ->
37− if Help.isOp name then
28+ if Help.isOp name then
38− let
29+ let
39− root =
30+ root =
40− JS.VarRef () (JS.Id () (canonicalPrefix home "_op"))
31+ JS.VarRef () (JS.Id () "_op")
41−
32+
42− lvalue =
33+ lvalue =
43− JS.LBracket () root (JS.StringLit () name)
34+ JS.LBracket () root (JS.StringLit () name)
44− in
35+ in
45− JS.ExprStmt () (JS.AssignExpr () JS.OpAssign lvalue body)
36+ JS.ExprStmt () (JS.AssignExpr () JS.OpAssign lvalue body)
46−
37+
47− else
38+ else
48− varDecl (canonicalPrefix home (safe name))
39+ JS.VarDeclStmt () [ JS.VarDecl () (JS.Id () (safe name)) (Just body) ]
49
40
50
41
51-- INSTANTIATE VARIABLES
42-- INSTANTIATE VARIABLES
@@ -53,34 +44,31 @@ define maybeHome name body =
53canonical :: Var.Canonical -> JS.Expression ()
44canonical :: Var.Canonical -> JS.Expression ()
54canonical (Var.Canonical home name) =
45canonical (Var.Canonical home name) =
55 if Help.isOp name then
46 if Help.isOp name then
56− JS.BracketRef () (JS.ref (addRoot home "_op")) (JS.string name)
47+ JS.BracketRef () (addRoot home "_op") (JS.string name)
57
48
58 else
49 else
59− JS.ref (addRoot home (safe name))
50+ addRoot home (safe name)
60
51
61
52
62−addRoot :: Var.Home -> String -> String
53+addRoot :: Var.Home -> String -> JS.Expression ()
63addRoot home name =
54addRoot home name =
64 case home of
55 case home of
65 Var.Local ->
56 Var.Local ->
66− name
57+ JS.ref name
67
58
68− Var.TopLevel moduleName ->
59+ Var.TopLevel _moduleName ->
69− canonicalPrefix moduleName name
60+ JS.ref name
70
61
71 Var.BuiltIn ->
62 Var.BuiltIn ->
72− name
63+ JS.ref name
73
64
74 Var.Module moduleName ->
65 Var.Module moduleName ->
75− canonicalPrefix moduleName name
66+ JS.DotRef () (JS.ref (canonicalModuleName moduleName)) (JS.Id () name)
76
67
77
68
78−canonicalPrefix :: ModuleName.Canonical -> String -> String
69+canonicalModuleName :: ModuleName.Canonical -> String
79−canonicalPrefix (ModuleName.Canonical (Pkg.Name user project) moduleName) name =
70+canonicalModuleName (ModuleName.Canonical (Pkg.Name _user _project) moduleName) =
80− map (swap '-' '_') user
81− ++ '$' : map (swap '-' '_') project
82− ++ '$' : List.intercalate "$" moduleName
71+ '$' : List.intercalate "$" moduleName
83− ++ '$' : safe name
84
72
85
73
86swap :: Char -> Char -> Char -> Char
74swap :: Char -> Char -> Char -> Char