git.iko.soy/elk
on master help sign in
minor style improvements and remove unneeded reserved word
68ae5b3Evan Czaplicki
src/Generate/JavaScript/Variable.hs+6−4
compare with master
unifiedsplit
@@ -33,9 +33,11 @@ moduleName name =
33
33
34
34
35varName :: String -> String
35varName :: String -> String
36−varName x = map (swap '\'' '$') x'
36+varName name =
37− where
37+ let saferName =
38− x' = if Set.member x jsReserveds then '$' : x else x
38+ if Set.member name jsReserveds then '$' : name else name
39+ in
40+ map (swap '\'' '$') saferName
39
41
40
42
41value :: Module.Name -> String -> JS.Expression ()
43value :: Module.Name -> String -> JS.Expression ()
@@ -56,7 +58,7 @@ jsReserveds = Set.fromList
56 , "interface", "let", "package", "private", "protected", "public"
58 , "interface", "let", "package", "private", "protected", "public"
57 , "static", "yield"
59 , "static", "yield"
58 -- reserved by the Elm runtime system
60 -- reserved by the Elm runtime system
59− , "Elm", "ElmRuntime"
61+ , "Elm"
60 , "F2", "F3", "F4", "F5", "F6", "F7", "F8", "F9"
62 , "F2", "F3", "F4", "F5", "F6", "F7", "F8", "F9"
61 , "A2", "A3", "A4", "A5", "A6", "A7", "A8", "A9"
63 , "A2", "A3", "A4", "A5", "A6", "A7", "A8", "A9"
62 ]
64 ]