From d147e9202d3a4a5eb1275a3af1d2a902e8154be3 Mon Sep 17 00:00:00 2001
From: Sam Harwell <sam@tunnelvisionlabs.com>
Date: Wed, 1 May 2013 22:02:26 -0500
Subject: [PATCH] Use ->skip instead of ->channel(HIDDEN) to ensure reported
 token counts correspond to the number of parsed tokens in TestPerformance

---
 tool/test/org/antlr/v4/test/Java-LR.g4 | 6 +++---
 tool/test/org/antlr/v4/test/Java.g4    | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tool/test/org/antlr/v4/test/Java-LR.g4 b/tool/test/org/antlr/v4/test/Java-LR.g4
index 1a7b6c074..9d96878ea 100644
--- a/tool/test/org/antlr/v4/test/Java-LR.g4
+++ b/tool/test/org/antlr/v4/test/Java-LR.g4
@@ -944,13 +944,13 @@ JavaIDDigit
        '\u1040'..'\u1049'
    ;
 
-WS  :  (' '|'\r'|'\t'|'\u000C'|'\n')+ -> channel(HIDDEN)
+WS  :  (' '|'\r'|'\t'|'\u000C'|'\n')+ -> skip
     ;
 
 COMMENT
-    :   '/*' .*? '*/' -> channel(HIDDEN)
+    :   '/*' .*? '*/' -> skip
     ;
 
 LINE_COMMENT
-    : '//' ~('\n'|'\r')* '\r'? '\n' -> channel(HIDDEN)
+    : '//' ~('\n'|'\r')* '\r'? '\n' -> skip
     ;
diff --git a/tool/test/org/antlr/v4/test/Java.g4 b/tool/test/org/antlr/v4/test/Java.g4
index 175543ccc..cc1d6c4c9 100644
--- a/tool/test/org/antlr/v4/test/Java.g4
+++ b/tool/test/org/antlr/v4/test/Java.g4
@@ -1046,13 +1046,13 @@ JavaIDDigit
        '\u1040'..'\u1049'
    ;
 
-WS  :  (' '|'\r'|'\t'|'\u000C'|'\n')+ -> channel(HIDDEN)
+WS  :  (' '|'\r'|'\t'|'\u000C'|'\n')+ -> skip
     ;
 
 COMMENT
-    :   '/*' .*? '*/' -> channel(HIDDEN)
+    :   '/*' .*? '*/' -> skip
     ;
 
 LINE_COMMENT
-    : '//' ~('\n'|'\r')* '\r'? '\n' -> channel(HIDDEN)
+    : '//' ~('\n'|'\r')* '\r'? '\n' -> skip
     ;