Bruce/nomsu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added code for handling lua keywords in as_lua_id().

Browse Source
This commit is contained in:
Bruce Hill 2018-09-18 17:40:32 -07:00
parent 790b73c52a
commit 884368593d
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
string2.lua
View File

@ -131,7 +131,7 @@ local string2 = {
end
end)
str = gsub(str, "^_*%d", "_%1")
if match(str, "^_*[a-z]*$") then
if match(str, "^_*[abdefgilnortuw][aefhilnoru][acdefiklnoprstu]*$") then
for _index_0 = 1, #lua_keywords do
local kw = lua_keywords[_index_0]
if match(str, ("^_*" .. kw)) then
@ -142,7 +142,7 @@ local string2 = {
return str
end,
from_lua_id = function(str)
if match(str, "^_+[a-z]*$") then
if match(str, "^_+[abdefgilnortuw][aefhilnoru][acdefiklnoprstu]*$") then
for _index_0 = 1, #lua_keywords do
local kw = lua_keywords[_index_0]
if match(str, ("^_+" .. kw)) then

6
string2.moon
View File

@ -64,7 +64,8 @@ string2 = {
else format("x%02X", byte(c))
-- Lua IDs can't start with numbers, so map "1" -> "_1", "_1" -> "__1", etc.
str = gsub str, "^_*%d", "_%1"
if match str, "^_*[a-z]*$"
-- This pattern is guaranteed to match all keywords, but also matches some other stuff.
if match str, "^_*[abdefgilnortuw][aefhilnoru][acdefiklnoprstu]*$"
for kw in *lua_keywords
if match str, ("^_*"..kw)
str = "_"..str
@ -73,7 +74,8 @@ string2 = {
-- from_lua_id(as_lua_id(str)) == str, but behavior is unspecified for inputs that
-- did not come from as_lua_id()
from_lua_id: (str)->
if match str, "^_+[a-z]*$"
-- This pattern is guaranteed to match all keywords, but also matches some other stuff.
if match str, "^_+[abdefgilnortuw][aefhilnoru][acdefiklnoprstu]*$"
for kw in *lua_keywords
if match str, ("^_+"..kw)
str = str\sub(2,-1)