aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce Hill <bitbucket@bruce-hill.com>2017-10-13 19:44:32 -0700
committerBruce Hill <bitbucket@bruce-hill.com>2017-10-13 19:44:32 -0700
commite43f60a12477d65b88c828bcdaf99f362d4f80d0 (patch)
tree2b9f3bb915ad6a4360c7aee5e35dccb1a345cb90
parent9dee9dbbd8708ac2fb00c2240c7e0059e8691eb2 (diff)
Rebuilt.
-rw-r--r--nomsu.lua6
1 files changed, 3 insertions, 3 deletions
diff --git a/nomsu.lua b/nomsu.lua
index cbcbf9e..3e87531 100644
--- a/nomsu.lua
+++ b/nomsu.lua
@@ -101,7 +101,7 @@ local nomsu = [=[ file <- ({{| shebang?
(expression (dotdot / tok_gap))* word ((dotdot / tok_gap) (expression / word))*
|} }) -> FunctionCall
- word <- ({ { %wordbreaker / (!number %wordchar+) } }) -> Word
+ word <- ({ { (%wordbreaker+) / (!number %wordchar+) } }) -> Word
inline_string <- ({ '"' {|
({~ (("\\" -> "\") / ('\"' -> '"') / ("\n" -> "
@@ -119,7 +119,7 @@ local nomsu = [=[ file <- ({{| shebang?
-- Variables can be nameless (i.e. just %) and can't contain apostrophes
-- which is a hack to allow %foo's to parse as "%foo" and "'s" separately
- variable <- ({ ("%" { (%wordbreaker / (%wordchar+))? }) }) -> Var
+ variable <- ({ ("%" { ((%wordbreaker+) / (%wordchar+))? }) }) -> Var
inline_list <- ({ {|
("[" %ws? ((inline_list_item comma)* inline_list_item comma?)? %ws? "]")
@@ -706,7 +706,7 @@ end)]]):format(concat(lua_bits, "\n"))
self:error("Nothing to get stub from")
end
if type(x) == 'string' then
- local stub = x:gsub("([" .. tostring(wordbreaker) .. "])", " %1 "):gsub("%%%S+", "%%"):gsub("%s+", " "):gsub("%s*$", "")
+ local stub = x:gsub("([" .. tostring(wordbreaker) .. "]+)", " %1 "):gsub("%%%S+", "%%"):gsub("%s+", " "):gsub("%s*$", "")
local arg_names
do
local _accum_0 = { }