git.iko.soy/elk
on master help sign in
Correct NaN in reserved words / stop special casing kernel names
9b1217bEvan Czaplicki
src/Generate/JavaScript/Variable.hs+2−17
compare with master
unifiedsplit
@@ -71,7 +71,7 @@ reservedWords :: Set.Set Text
71reservedWords =
71reservedWords =
72 Set.fromList
72 Set.fromList
73 -- reserved by JavaScript
73 -- reserved by JavaScript
74− [ "null", "undefined", "Nan", "Infinity", "true", "false", "eval"
74+ [ "null", "undefined", "NaN", "Infinity", "true", "false", "eval"
75 , "arguments", "int", "byte", "char", "goto", "long", "final", "float"
75 , "arguments", "int", "byte", "char", "goto", "long", "final", "float"
76 , "short", "double", "native", "throws", "boolean", "abstract", "volatile"
76 , "short", "double", "native", "throws", "boolean", "abstract", "volatile"
77 , "transient", "synchronized", "function", "break", "case", "catch"
77 , "transient", "synchronized", "function", "break", "case", "catch"
@@ -84,7 +84,6 @@ reservedWords =
84 -- reserved by Elm
84 -- reserved by Elm
85 , "F2", "F3", "F4", "F5", "F6", "F7", "F8", "F9"
85 , "F2", "F3", "F4", "F5", "F6", "F7", "F8", "F9"
86 , "A2", "A3", "A4", "A5", "A6", "A7", "A8", "A9"
86 , "A2", "A3", "A4", "A5", "A6", "A7", "A8", "A9"
87− , "ctor"
88 ]
87 ]
89
88
90
89
@@ -105,7 +104,7 @@ globalName (Var.Global home name) =
105globalToName :: ModuleName.Canonical -> Text -> Text
104globalToName :: ModuleName.Canonical -> Text -> Text
106globalToName (ModuleName.Canonical (Pkg.Name user project) moduleName) name =
105globalToName (ModuleName.Canonical (Pkg.Name user project) moduleName) name =
107 if ModuleName.isKernel moduleName then
106 if ModuleName.isKernel moduleName then
108− kernelToName (ModuleName.getKernel moduleName) name
107+ "_" <> ModuleName.getKernel moduleName <> "_" <> name
109
108
110 else
109 else
111 let
110 let
@@ -120,17 +119,3 @@ globalToName (ModuleName.Canonical (Pkg.Name user project) moduleName) name =
120 <> "$" <> Text.replace "." "_" moduleName
119 <> "$" <> Text.replace "." "_" moduleName
121 <> "$" <> revisedName
120 <> "$" <> revisedName
122
121
123−
124−kernelToName :: Text -> Text -> Text
125−kernelToName home name =
126− if home == "Error" && name == "throw" then
127− "_Error_throw_prod"
128−
129− else if name == "toString" && home == "Debug" then
130− "_Debug_toString_prod"
131−
132− else if name == "log" && home == "Debug" then
133− "_Debug_log_prod"
134−
135− else
136− "_" <> home <> "_" <> name