library-mirrors/moonscript
1
0
Fork 0
mirror of https://github.com/leafo/moonscript.git synced 2024-11-22 02:44:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

misc cleanups

Browse Source
This commit is contained in:
leaf corcoran 2022-11-04 13:29:46 -07:00
parent c7be4dcb38
commit a1265cf7a1
2 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
moonscript/compile/value.lua
View File

@ -296,7 +296,8 @@ return {
return self:line("not ", self:value(node[2])) return self:line("not ", self:value(node[2]))
end, end,
self = function(self, node) self = function(self, node)
if data.lua_keywords[node[2]] then local field_name = self:name(node[2])
if data.lua_keywords[field_name] then
return self:value({ return self:value({
"chain", "chain",
"self", "self",
@ -305,16 +306,17 @@ return {
{ {
"string", "string",
'"', '"',
self:name(node[2]) field_name
} }
} }
}) })
else else
return "self." .. self:name(node[2]) return "self." .. tostring(field_name)
end end
end, end,
self_class = function(self, node) self_class = function(self, node)
if data.lua_keywords[node[2]] then local field_name = self:name(node[2])
if data.lua_keywords[field_name] then
return self:value({ return self:value({
"chain", "chain",
"self", "self",
@ -327,19 +329,19 @@ return {
{ {
"string", "string",
'"', '"',
self:name(node[2]) field_name
} }
} }
}) })
else else
return "self.__class." .. self:name(node[2]) return "self.__class." .. tostring(field_name)
end end
end, end,
self_colon = function(self, node) self_colon = function(self, node)
return "self:" .. self:name(node[2]) return "self:" .. tostring(self:name(node[2]))
end, end,
self_class_colon = function(self, node) self_class_colon = function(self, node)
return "self.__class:" .. self:name(node[2]) return "self.__class:" .. tostring(self:name(node[2]))
end, end,
ref = function(self, value) ref = function(self, value)
do do

19
moonscript/compile/value.moon
View File

@ -183,26 +183,29 @@ string_chars = {
@line "not ", @value node[2] @line "not ", @value node[2]
self: (node) => self: (node) =>
if data.lua_keywords[node[2]] field_name = @name node[2]
if data.lua_keywords[field_name]
@value {"chain", "self", {"index", { @value {"chain", "self", {"index", {
"string", '"', @name node[2] "string", '"', field_name
}}} }}}
else else
"self."..@name node[2] "self.#{field_name}"
self_class: (node) => self_class: (node) =>
if data.lua_keywords[node[2]] field_name = @name node[2]
if data.lua_keywords[field_name]
@value {"chain", "self", {"dot", "__class"}, {"index", { @value {"chain", "self", {"dot", "__class"}, {"index", {
"string", '"', @name node[2] "string", '"', field_name
}}} }}}
else else
"self.__class."..@name node[2] "self.__class.#{field_name}"
self_colon: (node) => self_colon: (node) =>
"self:"..@name node[2] "self:#{@name node[2]}"
self_class_colon: (node) => self_class_colon: (node) =>
"self.__class:"..@name node[2] "self.__class:#{@name node[2]}"
-- a variable reference -- a variable reference
ref: (value) => ref: (value) =>