summaryrefslogtreecommitdiff
path: root/xmake/core/base/interpreter.lua
diff options
context:
space:
mode:
authorruki <[email protected]>2016-01-21 23:01:42 +0800
committerruki <[email protected]>2016-02-15 19:10:25 +0800
commit7aac238641926dfc0386e8be78958a63e0866c19 (patch)
tree5a63d9f79afec32692682837fe47060187e10281 /xmake/core/base/interpreter.lua
parent0384d6aee3e0a5c1f86c8d60638d8228acb53601 (diff)
fix interpreter and project bug
Diffstat (limited to 'xmake/core/base/interpreter.lua')
-rw-r--r--xmake/core/base/interpreter.lua20
1 files changed, 10 insertions, 10 deletions
diff --git a/xmake/core/base/interpreter.lua b/xmake/core/base/interpreter.lua
index 4de222be5..016e69954 100644
--- a/xmake/core/base/interpreter.lua
+++ b/xmake/core/base/interpreter.lua
@@ -505,17 +505,17 @@ function interpreter.api_register_set_scope(self, ...)
-- define implementation
local implementation = function (self, scopes, scope_kind, scope_name)
+ -- init scope for kind
+ local scope_for_kind = scopes[scope_kind] or {}
+ scopes[scope_kind] = scope_for_kind
+
-- check
- if not scopes[scope_kind] then
+ if not scope_for_kind[scope_name] then
utils.error("set_%s(\"%s\") failed, %s not found!", scope_kind, scope_name, scope_name)
utils.error("please uses add_%s(\"%s\") first!", scope_kind, scope_name)
utils.abort()
end
- -- init scope for kind
- local scope_for_kind = scopes[scope_kind] or {}
- scopes[scope_kind] = scope_for_kind
-
-- init scope for name
scope_for_kind[scope_name] = scope_for_kind[scope_name] or {}
@@ -537,17 +537,17 @@ function interpreter.api_register_add_scope(self, ...)
-- define implementation
local implementation = function (self, scopes, scope_kind, scope_name)
+ -- init scope for kind
+ local scope_for_kind = scopes[scope_kind] or {}
+ scopes[scope_kind] = scope_for_kind
+
-- check
- if scopes[scope_kind] then
+ if scope_for_kind[scope_name] then
utils.error("add_%s(\"%s\") failed, %s have been defined!", scope_kind, scope_name, scope_name)
utils.error("please uses set_%s(\"%s\")!", scope_kind, scope_name)
utils.abort()
end
- -- init scope for kind
- local scope_for_kind = scopes[scope_kind] or {}
- scopes[scope_kind] = scope_for_kind
-
-- init scope for name
scope_for_kind[scope_name] = scope_for_kind[scope_name] or {}