summaryrefslogtreecommitdiff
path: root/src/bindings
diff options
context:
space:
mode:
authorDaniel Kolesa <d.kolesa@samsung.com>2015-04-01 14:22:00 +0100
committerDaniel Kolesa <d.kolesa@samsung.com>2015-04-01 14:22:00 +0100
commite663773d9e594dde9677e68a511a4d5563a215ce (patch)
treece2d78bbaa799da18e58391ed2d981a7e83212a0 /src/bindings
parent34beed984da160ccc774ed22462607b05f7f99d9 (diff)
elua: only check gettability in __index with no keys
Diffstat (limited to 'src/bindings')
-rw-r--r--src/bindings/luajit/eo.lua6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/bindings/luajit/eo.lua b/src/bindings/luajit/eo.lua
index 6c7d5c78e8..2944e5e579 100644
--- a/src/bindings/luajit/eo.lua
+++ b/src/bindings/luajit/eo.lua
@@ -416,9 +416,6 @@ ffi.metatype("Eo", {
416 if not pp then 416 if not pp then
417 return mt[key] 417 return mt[key]
418 end 418 end
419 if not pp[3] then
420 error("property '" .. key .. "' is not gettable", 2)
421 end
422 local nkeys, nvals = pp[1], pp[2] 419 local nkeys, nvals = pp[1], pp[2]
423 if nkeys ~= 0 then 420 if nkeys ~= 0 then
424 -- proxy - slow path, but no way around it 421 -- proxy - slow path, but no way around it
@@ -427,6 +424,9 @@ ffi.metatype("Eo", {
427 return setmetatable({ nkeys = nkeys, nvals = nvals, 424 return setmetatable({ nkeys = nkeys, nvals = nvals,
428 obj = self, key = key, mt = mt }, prop_proxy_meta) 425 obj = self, key = key, mt = mt }, prop_proxy_meta)
429 end 426 end
427 if not pp[3] then
428 error("property '" .. key .. "' is not gettable", 2)
429 end
430 if nvals > 1 then 430 if nvals > 1 then
431 return { mt[key .. "_get"](self) } 431 return { mt[key .. "_get"](self) }
432 else 432 else