3 files changed, 62 insertions, 12 deletions

diff --git a/test/scanners/cpp/elvis.expected.raydebug b/test/scanners/cpp/elvis.expected.raydebug
index fdd1099..81743d0 100644
--- a/test/scanners/cpp/elvis.expected.raydebug
+++ b/test/scanners/cpp/elvis.expected.raydebug
@@ -1 +1,26 @@
-local_variable(this)operator(?)ident(is)operator(+)ident(no)operator(:)ident(label)
+ident(This)operator(?)ident(is)operator(+)ident(no)operator(:)ident(label)operator(;)
+
+comment(// This is only one label:)
+label(label:) reserved(switch) operator(()ident(TYPE)operator(()ident(v)operator(\)\)) operator({)
+  reserved(case) ident(T_CLASS)operator(:) reserved(case) ident(T_MODULE)operator(:)
+    ident(rb_str_append)operator(()ident(s)operator(,) ident(rb_inspect)operator(()ident(v)operator(\)\);)
+    reserved(break)operator(;)
+  reserved(default)operator(:)
+    ident(rb_str_append)operator(()ident(s)operator(,) ident(rb_any_to_s)operator(()ident(v)operator(\)\);)
+    reserved(break)operator(;)
+operator(})
+comment(// These are two labels.)
+ident(function)operator(()ident(call)operator(\);)
+label(label2:) label(label3:) ident(a) operator(=) ident(b) operator(+) ident(c)operator(;)
+
+comment(// Another label.)
+reserved(if) operator(()integer(1)operator(\)) operator({)
+  label(label4:) ident(a) operator(=) ident(b) operator(+) ident(c)operator(;)
+operator(})
+
+comment(// Not a label.)
+ident(test)operator(()
+  ident(a)operator(?)
+  ident(b)operator(:)
+  ident(c)
+operator(\))
\ No newline at end of file
diff --git a/test/scanners/cpp/elvis.in.cpp b/test/scanners/cpp/elvis.in.cpp
index e23f86e..9cdd574 100644
--- a/test/scanners/cpp/elvis.in.cpp
+++ b/test/scanners/cpp/elvis.in.cpp
@@ -1 +1,26 @@
-this?is+no:label
+This?is+no:label;
+
+// This is only one label:
+label: switch (TYPE(v)) {
+  case T_CLASS: case T_MODULE:
+    rb_str_append(s, rb_inspect(v));
+    break;
+  default:
+    rb_str_append(s, rb_any_to_s(v));
+    break;
+}
+// These are two labels.
+function(call);
+label2: label3: a = b + c;
+
+// Another label.
+if (1) {
+  label4: a = b + c;
+}
+
+// Not a label.
+test(
+  a?
+  b:
+  c
+)
\ No newline at end of file
diff --git a/test/scanners/cpp/eventmachine.expected.raydebug b/test/scanners/cpp/eventmachine.expected.raydebug
index 82004cd..8a3b79b 100644
--- a/test/scanners/cpp/eventmachine.expected.raydebug
+++ b/test/scanners/cpp/eventmachine.expected.raydebug
@@ -809,29 +809,29 @@ operator({)
 	directive(void) operator((*)ident(f)operator(\)(\);)
 
 	reserved(switch) operator(()ident(ev)operator(\)) operator({)
-		reserved(case) label(EM_TIMER_FIRED)operator(:)
+		reserved(case) ident(EM_TIMER_FIRED)operator(:)
 			ident(f) operator(=) ident(Timers) operator([)ident(data)operator(];)
 			reserved(if) operator(()ident(f)operator(\))
 				operator((*)ident(f)operator(\)(\);)
 			ident(Timers)operator(.)ident(erase) operator(()ident(sig)operator(\);)
 			reserved(break)operator(;)
 
-		reserved(case) label(EM_CONNECTION_READ)operator(:)
+		reserved(case) ident(EM_CONNECTION_READ)operator(:)
 			ident(e) operator(=) ident(EM)operator(::)ident(Eventables) operator([)ident(sig)operator(];)
 			ident(e)operator(->)ident(ReceiveData) operator(()ident(data)operator(,) ident(length)operator(\);)
 			reserved(break)operator(;)
 
-		reserved(case) label(EM_CONNECTION_COMPLETED)operator(:)
+		reserved(case) ident(EM_CONNECTION_COMPLETED)operator(:)
 			ident(e) operator(=) ident(EM)operator(::)ident(Eventables) operator([)ident(sig)operator(];)
 			ident(e)operator(->)ident(ConnectionCompleted)operator((\);)
 			reserved(break)operator(;)
 
-		reserved(case) label(EM_CONNECTION_ACCEPTED)operator(:)
+		reserved(case) ident(EM_CONNECTION_ACCEPTED)operator(:)
 			ident(e) operator(=) ident(EM)operator(::)ident(Eventables) operator([)ident(sig)operator(];)
 			ident(e)operator(->)ident(Accept) operator(()ident(data)operator(\);)
 			reserved(break)operator(;)
 
-		reserved(case) label(EM_CONNECTION_UNBOUND)operator(:)
+		reserved(case) ident(EM_CONNECTION_UNBOUND)operator(:)
 			ident(e) operator(=) ident(EM)operator(::)ident(Eventables) operator([)ident(sig)operator(];)
 			ident(e)operator(->)ident(Unbind)operator((\);)
 			ident(EM)operator(::)ident(Eventables)operator(.)ident(erase) operator(()ident(sig)operator(\);)
@@ -3537,7 +3537,7 @@ operator({)
 		reserved(throw) ident(std)operator(::)ident(runtime_error) operator(()string<delimiter(")content(invalid file descriptor)delimiter(")>operator(\);)
 	preprocessor(#endif)
 
-	operator({//) ident(Check) reserved(for) ident(duplicate) ident(descriptors)
+	operator({)comment(// Check for duplicate descriptors)
 		ident(size_t) ident(i)operator(;)
 		reserved(for) operator(()ident(i) operator(=) integer(0)operator(;) ident(i) operator(<) ident(Descriptors)operator(.)ident(size)operator((\);) ident(i)operator(++\)) operator({)
 			ident(EventableDescriptor) operator(*)ident(ed) operator(=) ident(Descriptors)operator([)ident(i)operator(];)
@@ -3791,7 +3791,7 @@ operator({)
 
 	reserved(return) ident(output_binding)operator(;)
 
-	label(fail)operator(:)
+	label(fail:)
 	reserved(if) operator(()ident(sd_accept) operator(!=) ident(INVALID_SOCKET)operator(\))
 		ident(closesocket) operator(()ident(sd_accept)operator(\);)
 	reserved(return) pre_constant(NULL)operator(;)
@@ -3852,7 +3852,7 @@ operator({)
 
 	reserved(return) ident(output_binding)operator(;)
 
-	label(fail)operator(:)
+	label(fail:)
 	reserved(if) operator(()ident(sd) operator(!=) ident(INVALID_SOCKET)operator(\))
 		ident(closesocket) operator(()ident(sd)operator(\);)
 	reserved(return) pre_constant(NULL)operator(;)
@@ -4114,7 +4114,7 @@ operator({)
 
 	reserved(return) ident(output_binding)operator(;)
 
-	label(fail)operator(:)
+	label(fail:)
 	reserved(if) operator(()ident(sd_accept) operator(!=) ident(INVALID_SOCKET)operator(\))
 		ident(closesocket) operator(()ident(sd_accept)operator(\);)
 	reserved(return) pre_constant(NULL)operator(;)
@@ -4488,7 +4488,7 @@ operator({)
 
 	reserved(return) ident(output_binding)operator(;)
 
-	label(fail)operator(:)
+	label(fail:)
 	reserved(if) operator(()ident(sd_accept) operator(!=) ident(INVALID_SOCKET)operator(\))
 		ident(closesocket) operator(()ident(sd_accept)operator(\);)
 	reserved(return) pre_constant(NULL)operator(;)