support for c++17 style namespace declaration

Author: SatyaRanjanDas-tomtom

CMakeLists.txt

@@ -125,6 +125,7 @@ set(TEST_SNIPPET_EMBEDDED_TESTS
 	${CMAKE_CURRENT_LIST_DIR}/test/unit/expr-tests.cpp
 	${CMAKE_CURRENT_LIST_DIR}/test/unit/attribute-specifier-sequence.cpp
 	${CMAKE_CURRENT_LIST_DIR}/test/unit/error-handler-test.cpp
+	${CMAKE_CURRENT_LIST_DIR}/test/unit/namespace-test.cpp
 )
 
 add_executable(cppparserunittest

src/parser.y

@@ -282,7 +282,7 @@ extern int yylex();
 
 %type  <str>                strlit
 %type  <str>                optapidecor apidecor apidecortokensq
-%type  <str>                identifier numbertype typeidentifier varidentifier optname id name operfuncname funcname
+%type  <str>                identifier optidentifier numbertype typeidentifier varidentifier optname id name operfuncname funcname
 %type  <str>                templidentifier templqualifiedid
 %type  <str>                doccommentstr
 %type  <str>                rshift
@@ -727,6 +727,9 @@ id                : tknID  [ZZLOG; $$ = $1; ] {}
 
 optname           :         [ZZLOG;] { $$ = makeCppToken(nullptr, nullptr); }
                   | name    [ZZLOG;] { $$ = $1; }
+
+optidentifier     :             [ZZLOG;] { $$ = makeCppToken(nullptr, nullptr); }
+                  | identifier  [ZZLOG;] { $$ = $1; }
                   ;
 
 enumitem          : name            [ZZLOG;]   { $$ = new CppEnumItem($1);     }
@@ -1652,7 +1655,7 @@ classdefn         : classspecifier optapidecor optattribspecifiers identifier op
                   }
                   ;
 
-namespacedefn     : tknNamespace optname '{'
+namespacedefn     : tknNamespace optidentifier '{'
                   [
                     ZZVALID;
                     gCompoundStack.push(classNameFromIdentifier($2));

test/unit/namespace-test.cpp

@@ -0,0 +1,45 @@
+#include <catch/catch.hpp>
+
+#include "cppparser.h"
+
+#include "embedded-snippet-test-base.h"
+
+class NamespaceTest : public EmbeddedSnippetTestBase
+{
+protected:
+  NamespaceTest()
+    : EmbeddedSnippetTestBase(__FILE__)
+  {
+  }
+};
+
+#if TEST_CASE_SNIPPET_STARTS_FROM_NEXT_LINE
+#  if __cplusplus > 201703L
+namespace my::ns1 {
+auto p = new char*[5];
+}
+#  endif
+#endif
+
+TEST_CASE_METHOD(NamespaceTest, " C++17 style nested namespace")
+{
+  auto testSnippet = getTestSnippetParseStream(__LINE__ - 5);
+
+  CppParser  parser;
+  const auto ast = parser.parseStream(testSnippet.data(), testSnippet.size());
+  REQUIRE(ast != nullptr);
+
+  const auto& members = ast->members();
+  REQUIRE(members.size() == 3);
+
+  CppCompoundEPtr ns = members[1];
+  REQUIRE(ns);
+  CHECK(ns->name() == "my::ns1");
+  const auto& nsMembers = ns->members();
+  REQUIRE(nsMembers.size() == 1);
+
+  CppVarEPtr var = nsMembers[0];
+  REQUIRE(var);
+
+  CHECK(var->assignValue() != nullptr);
+}