---

yaml
---
r: 114751
b: refs/heads/master
c: 14b111c
h: refs/heads/master
i:
  114749: 6660c42
  114747: c4ffa17
  114743: 228a72c
  114735: 1a4b9c2
  114719: 136de62
  114687: b5e6a13
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0d413866c7df63794790518e3fd5890969c206ad
+refs/heads/master: 14b111c158116f02c1c862397075e28ac12d65d6

trunk/scripts/checkpatch.pl

@@ -782,17 +782,17 @@ sub annotate_values {
 			}
 			$type = 'N';
 
-		} elsif ($cur =~ /^(if|while|typeof|__typeof__|for)\b/o) {
+		} elsif ($cur =~ /^(if|while|for)\b/o) {
 			print "COND($1)\n" if ($dbg_values > 1);
-			$av_pending = 'N';
+			$av_pending = 'E';
 			$type = 'N';
 
 		} elsif ($cur =~/^(case)/o) {
 			print "CASE($1)\n" if ($dbg_values > 1);
 			$av_pend_colon = 'C';
 			$type = 'N';
 
-		} elsif ($cur =~/^(return|else|goto)/o) {
+		} elsif ($cur =~/^(return|else|goto|typeof|__typeof__)\b/o) {
 			print "KEYWORD($1)\n" if ($dbg_values > 1);
 			$type = 'N';
 
@@ -1846,6 +1846,11 @@ sub process {
 				$check = 0;
 			}
 
+			# Ignore the current line if it is label.
+			if ($s =~ /^\s*$Ident\s*:/) {
+				$check = 0;
+			}
+
 			my (undef, $sindent) = line_stats("+" . $s);
 
 			##print "line<$line> prevline<$prevline> indent<$indent> sindent<$sindent> check<$check> continuation<$continuation> s<$s>\n";