From 31d7c43d4764bd5e44b6339a64cb5566d98f1953 Mon Sep 17 00:00:00 2001 From: Philipp Gesang Date: Tue, 31 Dec 2013 16:17:42 +0100 Subject: sync with Context as of 2013-12-31 --- lualibs-package.lua | 2 +- lualibs-util-prs.lua | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lualibs-package.lua b/lualibs-package.lua index 0dbff7c..075fcde 100644 --- a/lualibs-package.lua +++ b/lualibs-package.lua @@ -274,7 +274,7 @@ methods["qualified path"]=function(name) end methods["lua extra list"] = function(name) - return loadedbypath(addsuffix(lualibfile(name),"lua" ),name,getextraluapaths(),false,"lua") + return loadedbypath(addsuffix(lualibfile(name),"lua"),name,getextraluapaths(),false,"lua") end methods["lib extra list"] = function(name) diff --git a/lualibs-util-prs.lua b/lualibs-util-prs.lua index 9518b7f..e5b35a7 100644 --- a/lualibs-util-prs.lua +++ b/lualibs-util-prs.lua @@ -184,8 +184,10 @@ function parsers.settings_to_array(str,strict) else return { str } end - else + elseif find(str,",") then return lpegmatch(pattern,str) + else + return { str } end end -- cgit v1.2.3