fix label_expected (test case?)

korny · korny · commit 4669b7086136 · 2013-06-23T18:16:47.000+02:00
diff --git a/lib/coderay/scanners/go.rb b/lib/coderay/scanners/go.rb
@@ -64,6 +64,7 @@ def scan_tokens encoder, options
           if match = scan(/ \s+ | \\\n /x)
             if in_preproc_line && match != "\\\n" && match.index(?\n)
               in_preproc_line = false
+              case_expected = false
               label_expected = label_expected_before_preproc_line
             end
             encoder.text_token match, :space
@@ -72,7 +73,6 @@ def scan_tokens encoder, options
             encoder.text_token match, :comment
           
           elsif match = scan(/ [-+*=<>?:;,!&^|()\[\]{}~%]+ | \/=? | \.(?!\d) /x)
-            label_expected = match =~ /[;\{\}]/
             if case_expected
               label_expected = true if match == ':'
               case_expected = false
@@ -83,6 +83,7 @@ def scan_tokens encoder, options
             kind = IDENT_KIND[match]
             if kind == :ident && label_expected && !in_preproc_line && scan(/:(?!:)/)
               kind = :label
+              label_expected = false
               match << matched
             else
               label_expected = false
