summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Gesang <phg42.2a@gmail.com>2013-12-31 16:17:42 +0100
committerPhilipp Gesang <phg42.2a@gmail.com>2013-12-31 16:17:42 +0100
commit31d7c43d4764bd5e44b6339a64cb5566d98f1953 (patch)
tree32dc6c22088ddf4b0d7c1ab5793fbfb62fa99fff
parent8823c59ae9a86ecd8b765d5f936be894582777dc (diff)
downloadlualibs-31d7c43d4764bd5e44b6339a64cb5566d98f1953.tar.gz
sync with Context as of 2013-12-31v2.1a
-rw-r--r--lualibs-package.lua2
-rw-r--r--lualibs-util-prs.lua4
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