Support for namespace

tests/apis/namespace/basic/.gitignore

@@ -0,0 +1,8 @@
+# Xmake cache
+.xmake/
+build/
+
+# MacOS Cache
+.DS_Store
+
+

tests/apis/namespace/basic/src/bar.cpp

@@ -0,0 +1,5 @@
+#include "bar.h"
+
+int sub(int a, int b) {
+    return a - b;
+}

tests/apis/namespace/basic/src/bar.h

@@ -0,0 +1,9 @@
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int sub(int a, int b);
+
+#ifdef __cplusplus
+}
+#endif

tests/apis/namespace/basic/src/foo.cpp

@@ -0,0 +1,5 @@
+#include "foo.h"
+
+int add(int a, int b) {
+    return a + b;
+}

tests/apis/namespace/basic/src/foo.h

@@ -0,0 +1,9 @@
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int add(int a, int b);
+
+#ifdef __cplusplus
+}
+#endif

tests/apis/namespace/basic/src/main.cpp

@@ -0,0 +1,9 @@
+#include "foo.h"
+#include "bar.h"
+#include <iostream>
+
+int main(int argc, char** argv) {
+    std::cout << "add(1, 2) = " << add(1, 2) << std::endl;
+    std::cout << "sub(2, 1) = " << sub(2, 1) << std::endl;
+    return 0;
+}

tests/apis/namespace/basic/test.lua

@@ -0,0 +1,3 @@
+function main()
+    os.exec("xmake -vD")
+end

tests/apis/namespace/basic/xmake.lua

@@ -0,0 +1,19 @@
+add_rules("mode.debug", "mode.release")
+
+namespace("ns1", function ()
+    target("foo")
+        set_kind("static")
+        add_files("src/foo.cpp")
+end)
+
+namespace("ns2")
+    target("bar")
+        set_kind("static")
+        add_files("src/bar.cpp")
+namespace_end()
+
+target("test")
+    set_kind("binary")
+    add_deps("ns1::foo", "ns2::bar")
+    add_files("src/main.cpp")
+

tests/apis/namespace/nested/.gitignore

@@ -0,0 +1,8 @@
+# Xmake cache
+.xmake/
+build/
+
+# MacOS Cache
+.DS_Store
+
+

tests/apis/namespace/nested/src/bar.cpp

@@ -0,0 +1,5 @@
+#include "bar.h"
+
+int sub(int a, int b) {
+    return a - b;
+}

tests/apis/namespace/nested/src/bar.h

@@ -0,0 +1,9 @@
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int sub(int a, int b);
+
+#ifdef __cplusplus
+}
+#endif

tests/apis/namespace/nested/src/foo.cpp

@@ -0,0 +1,5 @@
+#include "foo.h"
+
+int add(int a, int b) {
+    return a + b;
+}

tests/apis/namespace/nested/src/foo.h

@@ -0,0 +1,9 @@
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int add(int a, int b);
+
+#ifdef __cplusplus
+}
+#endif

tests/apis/namespace/nested/src/main.cpp

@@ -0,0 +1,9 @@
+#include "foo.h"
+#include "bar.h"
+#include <iostream>
+
+int main(int argc, char** argv) {
+    std::cout << "add(1, 2) = " << add(1, 2) << std::endl;
+    std::cout << "sub(2, 1) = " << sub(2, 1) << std::endl;
+    return 0;
+}

tests/apis/namespace/nested/test.lua

@@ -0,0 +1,3 @@
+function main()
+    os.exec("xmake -vD")
+end

tests/apis/namespace/nested/xmake.lua

@@ -0,0 +1,19 @@
+add_rules("mode.debug", "mode.release")
+
+namespace("ns1", function ()
+    target("foo")
+        set_kind("static")
+        add_files("src/foo.cpp")
+
+    namespace("ns2")
+        target("bar")
+            set_kind("static")
+            add_files("src/bar.cpp")
+    namespace_end()
+end)
+
+target("test")
+    set_kind("binary")
+    add_deps("ns1::foo", "ns1::ns2::bar")
+    add_files("src/main.cpp")
+

xmake/core/base/interpreter.lua

@@ -680,6 +680,8 @@ function interpreter.new()
     instance:api_register(nil, "add_subdirs",  interpreter.api_builtin_add_subdirs)
     instance:api_register(nil, "add_subfiles", interpreter.api_builtin_add_subfiles)
     instance:api_register(nil, "set_xmakever", interpreter.api_builtin_set_xmakever)
+    instance:api_register(nil, "namespace",    interpreter.api_builtin_namespace)
+    instance:api_register(nil, "namespace_end",interpreter.api_builtin_namespace_end)
 
     -- register the interpreter interfaces
     instance:api_register(nil, "interp_save_scope",    interpreter.api_interp_save_scope)
@@ -952,6 +954,7 @@ function interpreter:api_register_scope(...)
         local scope_args = table.pack(...)
         local scope_name = scope_args[1]
         local scope_info = scope_args[2]
+        local namespace = self._NAMESPACE_STR
 
         -- check invalid scope name, @see https://github.com/xmake-io/xmake/issues/4547
         if scope_args.n > 0 and type(scope_name) ~= "string" then
@@ -1838,6 +1841,30 @@ function interpreter:api_builtin_add_subfiles(...)
     deprecated.add("includes(%s)", "add_subfiles(%s)", table.concat(files, ", "), table.concat(files, ", "))
 end
 
+-- the builtin api: namespace()
+function interpreter:api_builtin_namespace(name, callback)
+    local namespace = self._NAMESPACE
+    if namespace == nil then
+        namespace = {}
+        self._NAMESPACE = namespace
+    end
+    table.insert(namespace, name)
+    self._NAMESPACE_STR = table.concat(namespace, "::")
+    if callback and type(callback) == "function" then
+        callback()
+        self:api_builtin_namespace_end()
+    end
+end
+
+-- the builtin api: namespace_end()
+function interpreter:api_builtin_namespace_end()
+    local namespace = self._NAMESPACE
+    if namespace then
+        table.remove(namespace)
+        self._NAMESPACE_STR = table.concat(namespace, "::")
+    end
+end
+
 -- the interpreter api: interp_save_scope()
 -- save the current scope
 function interpreter:api_interp_save_scope()