add check_msnippets

4 files changed, 142 insertions, 4 deletions

diff --git a/xmake/core/package/package.lua b/xmake/core/package/package.lua
index cfc60f696..b3d7fa35d 100644
--- a/xmake/core/package/package.lua
+++ b/xmake/core/package/package.lua
@@ -2234,6 +2234,34 @@ function _instance:check_cxxsnippets(snippets, opt)
     return sandbox_module.import("lib.detect.check_cxxsnippets", {anonymous = true})(snippets, opt)
 end
 
+-- check the given objc snippets?
+--
+-- @param snippets  the snippets
+-- @param opt       the argument options, e.g. {includes = "xxx.h", configs = {defines = ""}}
+--
+-- @return          true or false, errors
+--
+function _instance:check_msnippets(snippets, opt)
+    opt = opt or {}
+    opt.target = self
+    opt.configs = self:_generate_build_configs(opt.configs, {sourcekind = "mm"})
+    return sandbox_module.import("lib.detect.check_msnippets", {anonymous = true})(snippets, opt)
+end
+
+-- check the given objc++ snippets?
+--
+-- @param snippets  the snippets
+-- @param opt       the argument options, e.g. {includes = "xxx.h", configs = {defines = ""}}
+--
+-- @return          true or false, errors
+--
+function _instance:check_mxxsnippets(snippets, opt)
+    opt = opt or {}
+    opt.target = self
+    opt.configs = self:_generate_build_configs(opt.configs, {sourcekind = "mxx"})
+    return sandbox_module.import("lib.detect.check_mxxsnippets", {anonymous = true})(snippets, opt)
+end
+
 -- the current mode is belong to the given modes?
 function package._api_is_mode(interp, ...)
     return config.is_mode(...)
diff --git a/xmake/modules/lib/detect/check_cxsnippets.lua b/xmake/modules/lib/detect/check_cxsnippets.lua
index 32de0bee4..08055c3d8 100644
--- a/xmake/modules/lib/detect/check_cxsnippets.lua
+++ b/xmake/modules/lib/detect/check_cxsnippets.lua
@@ -149,7 +149,7 @@ end
 -- @param snippets  the snippets
 -- @param opt       the argument options
 --                  e.g.
---                  { verbose = false, target = [target|option], sourcekind = "[cc|cxx]"
+--                  { verbose = false, target = [target|option], sourcekind = "[cc|cxx|mm|mxx]"
 --                  , types = {"wchar_t", "char*"}, includes = "stdio.h", funcs = {"sigsetjmp", "sigsetjmp((void*)0, 0)"}
 --                  , configs = {defines = "xx", cxflags = ""}
 --                  , tryrun = true, output = true}
@@ -219,8 +219,9 @@ function main(snippets, opt)
 
     -- get c/c++ extension
     local extension = ".c"
-    if opt.sourcekind then
-        extension = table.wrap(language.sourcekinds()[opt.sourcekind])[1] or ".c"
+    local sourcekind = opt.sourcekind
+    if sourcekind then
+        extension = table.wrap(language.sourcekinds()[sourcekind])[1] or ".c"
     end
 
     -- make the source file
@@ -271,7 +272,16 @@ function main(snippets, opt)
 
     -- trace
     if opt.verbose or option.get("verbose") or option.get("diagnosis") then
-        local kind = opt.sourcekind == "cc" and "c" or "c++"
+        local kind = "c"
+        if sourcekind == "cxx" then
+            kind = "c++"
+        elseif sourcekind == "mxx" then
+            kind = "objc++"
+        elseif sourcekind == "cc" then
+            kind = "c"
+        elseif sourcekind == "mm" then
+            kind = "objc"
+        end
         if #includes > 0 then
             cprint("${dim}> checking for %s includes(%s)", kind, table.concat(includes, ", "))
         end
diff --git a/xmake/modules/lib/detect/check_msnippets.lua b/xmake/modules/lib/detect/check_msnippets.lua
new file mode 100644
index 000000000..ab0aa6f7b
--- /dev/null
+++ b/xmake/modules/lib/detect/check_msnippets.lua
@@ -0,0 +1,50 @@
+--!A cross-platform build utility based on Lua
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+-- Copyright (C) 2015-present, TBOOX Open Source Group.
+--
+-- @author      ruki
+-- @file        check_msnippets.lua
+--
+
+-- imports
+import("lib.detect.check_cxsnippets")
+
+-- check the given c snippets?
+--
+-- @param snippets  the snippets
+-- @param opt       the argument options
+--                  e.g.
+--                  { verbose = false, target = [target|option]
+--                  , types = {"wchar_t", "char*"}, includes = "stdio.h", funcs = {"sigsetjmp", "sigsetjmp((void*)0, 0)"}
+--                  , configs = {defines = "xx", mxflags = ""}}
+--
+-- funcs:
+--      sigsetjmp
+--      sigsetjmp((void*)0, 0)
+--      sigsetjmp{sigsetjmp((void*)0, 0);}
+--      sigsetjmp{int a = 0; sigsetjmp((void*)a, a);}
+--
+-- @return          true or false
+--
+-- @code
+-- local ok = check_msnippets("void test() {}")
+-- local ok = check_msnippets({"void test(){}", "#define TEST 1"}, {types = "wchar_t", includes = "stdio.h"})
+-- local ok = check_msnippets({snippet_name = "void test(){}", "#define TEST 1"}, {types = "wchar_t", includes = "stdio.h"})
+-- @endcode
+--
+function main(snippets, opt)
+    return check_cxsnippets(snippets, table.join(table.wrap(opt), {sourcekind = "mm"}))
+end
+
diff --git a/xmake/modules/lib/detect/check_mxxsnippets.lua b/xmake/modules/lib/detect/check_mxxsnippets.lua
new file mode 100644
index 000000000..8e0581a13
--- /dev/null
+++ b/xmake/modules/lib/detect/check_mxxsnippets.lua
@@ -0,0 +1,50 @@
+--!A cross-platform build utility based on Lua
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+-- Copyright (C) 2015-present, TBOOX Open Source Group.
+--
+-- @author      ruki
+-- @file        check_mxxsnippets.lua
+--
+
+-- imports
+import("lib.detect.check_cxsnippets")
+
+-- check the given c++ snippets?
+--
+-- @param snippets  the snippets
+-- @param opt       the argument options
+--                  e.g.
+--                  { verbose = false, target = [target|option]
+--                  , types = {"wchar_t", "char*"}, includes = "stdio.h", funcs = {"sigsetjmp", "sigsetjmp((void*)0, 0)"}
+--                  , configs = {defines = "xx", mxflags = ""}}
+--
+-- funcs:
+--      sigsetjmp
+--      sigsetjmp((void*)0, 0)
+--      sigsetjmp{sigsetjmp((void*)0, 0);}
+--      sigsetjmp{int a = 0; sigsetjmp((void*)a, a);}
+--
+-- @return          true or false
+--
+-- @code
+-- local ok = check_mxxsnippets("void test() {}")
+-- local ok = check_mxxsnippets({"void test(){}", "#define TEST 1"}, {types = "wchar_t", includes = "stdio.h"})
+-- local ok = check_mxxsnippets({snippet_name = "void test(){}", "#define TEST 1"}, {types = "wchar_t", includes = "stdio.h"})
+-- @endcode
+--
+function main(snippets, opt)
+    return check_cxsnippets(snippets, table.join(table.wrap(opt), {sourcekind = "mxx"}))
+end
+