Fix pretty.read failing on 'function' within strings

Apply fix suggested by @rvandermate. Fixes lunarmodules#172.
mpeterv · Nov 13, 2015 · 48bae74 · 48bae74
1 parent 2c02bda
commit 48bae74
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/lua/pl/pretty.lua b/lua/pl/pretty.lua
@@ -66,7 +66,7 @@ function pretty.read(s)
     if s:find '[^\'"%w_]function[^\'"%w_]' then
         local tok = lexer.lua(s)
         for t,v in tok do
-            if t == 'keyword' then
+            if t == 'keyword' and v == 'function' then
                 return nil,"cannot have functions in table definition"
             end
         end

diff --git a/tests/test-pretty.lua b/tests/test-pretty.lua
@@ -28,8 +28,16 @@ assert(res)
 
 res,err = pretty.read [[
   {
-	['function'] = true,
-	['do'] = function() return end
+    ['function'] = true,
+    ['do'] = "no function here...",
+  }
+]]
+assert(res)
+
+res,err = pretty.read [[
+  {
+    ['function'] = true,
+    ['do'] = function() return end
   }
 ]]
 assertmatch(err,'cannot have functions in table definition')