check-webkit-style: Angle Bracket Parsing in Templates

Tools/Scripts/webkitpy/style/checkers/cpp.py

 # -*- coding: utf-8 -*-
 #
 # Copyright (C) 2009, 2010, 2012 Google Inc. All rights reserved.
 # Copyright (C) 2009 Torch Mobile Inc.
 # Copyright (C) 2009 Apple Inc. All rights reserved.
 # Copyright (C) 2010 Chris Jerdonek (cjerdonek@webkit.org)
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
@@ skipping 1352 matching lines @@
               'Uncommented text after #endif is non-standard.  Use a comment.')
 
     if match(r'\s*class\s+(\w+\s*::\s*)+\w+\s*;', line):
         error(line_number, 'build/forward_decl', 5,
               'Inner-style forward declarations are invalid.  Remove this line.')
 
     if search(r'(\w+|[+-]?\d+(\.\d*)?)\s*(<|>)\?=?\s*(\w+|[+-]?\d+)(\.\d*)?', line):
         error(line_number, 'build/deprecated', 3,
               '>? and <? (max and min) operators are non-standard and deprecated.')
 
+    if search(r'\w+<.*<.*>\s+>', line):
+        error(line_number, 'readability/templatebrackets', 3,
+              'Use >> for ending template instead of > >.')
+
+    if search(r'\w+<\s+::\w+>', line):
+        error(line_number, 'readability/templatebrackets', 3,
+              'Use <:: for template start instead of < ::.')
+
     # Track class entry and exit, and attempt to find cases within the
     # class declaration that don't meet the C++ style
     # guidelines. Tracking is very dependent on the code matching Google
     # style guidelines, but it seems to perform well enough in testing
     # to be a worthwhile addition to the checks.
     classinfo_stack = class_state.classinfo_stack
     # Look for a class declaration
     class_decl_match = match(
         r'\s*(template\s*<[\w\s<>,:]*>\s*)?(class|struct)\s+(\w+(::\w+)*)', line)
     if class_decl_match:
@@ skipping 2609 matching lines @@
         'readability/fn_size',
         'readability/function',
         'readability/multiline_comment',
         'readability/multiline_string',
         'readability/parameter_name',
         'readability/naming',
         'readability/naming/underscores',
         'readability/null',
         'readability/pass_ptr',
         'readability/streams',
+        'readability/templatebrackets',
         'readability/todo',
         'readability/utf8',
         'readability/webkit_export',
         'runtime/arrays',
         'runtime/bitfields',
         'runtime/casting',
         'runtime/ctype_function',
         'runtime/explicit',
         'runtime/init',
         'runtime/int',
@@ skipping 65 matching lines @@
 
     def check(self, lines):
         _process_lines(self.file_path, self.file_extension, lines,
                        self.handle_style_error, self.min_confidence)
 
 
 # FIXME: Remove this function (requires refactoring unit tests).
 def process_file_data(filename, file_extension, lines, error, min_confidence, fs=None):
     checker = CppChecker(filename, file_extension, error, min_confidence, fs)
     checker.check(lines)