Merge pull request #1656 from SiIky/master

Fix NULL check

Units/parser-cxx.r/enum-in-a-struct--with-q-extra.d/README

@@ -0,0 +1,6 @@
+S::T::E::alpha and S::T::E::beta are not included intentionally
+Taken from the comments of cxx_tag.c::
+
+	// If the scope kind is enumeration then we need to remove the
+	// last scope part. This is what old ctags did.
+

Units/parser-cxx.r/enum-in-a-struct--with-q-extra.d/args.ctags

@@ -0,0 +1,2 @@
+--sort=no
+--extra=+q

Units/parser-cxx.r/enum-in-a-struct--with-q-extra.d/expected.tags

@@ -0,0 +1,12 @@
+S	input.cc	/^namespace S {$/;"	n	file:
+T	input.cc	/^  struct T {$/;"	s	namespace:S	file:
+S::T	input.cc	/^  struct T {$/;"	s	namespace:S	file:
+E	input.cc	/^    enum E {$/;"	g	struct:S::T	file:
+S::T::E	input.cc	/^    enum E {$/;"	g	struct:S::T	file:
+alpha	input.cc	/^      alpha, beta,$/;"	e	enum:S::T::E	file:
+S::T::alpha	input.cc	/^      alpha, beta,$/;"	e	enum:S::T::E	file:
+beta	input.cc	/^      alpha, beta,$/;"	e	enum:S::T::E	file:
+S::T::beta	input.cc	/^      alpha, beta,$/;"	e	enum:S::T::E	file:
+elt	input.cc	/^    } elt;$/;"	m	struct:S::T	typeref:enum:S::T::E	file:
+S::T::elt	input.cc	/^    } elt;$/;"	m	struct:S::T	typeref:enum:S::T::E	file:
+s	input.cc	/^struct S::T s = { .elt = S::T::E::alpha };$/;"	v	typeref:struct:S::T

Units/parser-cxx.r/enum-in-a-struct--with-q-extra.d/input.cc

@@ -0,0 +1,9 @@
+namespace S {
+  struct T {
+    enum E {
+      alpha, beta,
+    } elt;
+  };
+}
+
+struct S::T s = { .elt = S::T::E::alpha };

parsers/cxx/cxx_token_chain.c

@@ -291,7 +291,7 @@ void cxxTokenChainJoinRangeInString(
 	while(t && (t != to))
 	{
 		t = t->pNext;
-		if(t)
+		if(!t)
 			return;
 
 		if(szSeparator)