Upgrade gtest to r267 and gmock to r173.

testing/gmock/scripts/generator/cpp/gmock_class.py

 #!/usr/bin/env python
 #
-# Copyright 2008 Google Inc.
+# Copyright 2008 Google Inc.  All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #      http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ skipping 52 matching lines @@
           return_type += '*'
         if node.return_type.reference:
           return_type += '&'
       prefix = 'MOCK_%sMETHOD%d' % (const, len(node.parameters))
       args = ''
       if node.parameters:
         # Get the full text of the parameters from the start
         # of the first parameter to the end of the last parameter.
         start = node.parameters[0].start
         end = node.parameters[-1].end
-        args = re.sub('  +', ' ', source[start:end].replace('\n', ''))
+        # Remove // comments.
+        args_strings = re.sub(r'//.*', '', source[start:end])
+        # Condense multiple spaces and eliminate newlines putting the
+        # parameters together on a single line.  Ensure there is a
+        # space in an argument which is split by a newline without
+        # intervening whitespace, e.g.: int\nBar
+        args = re.sub('  +', ' ', args_strings.replace('\n', ' '))
 
       # Create the prototype.
       indent = ' ' * _INDENT
       line = ('%s%s(%s,\n%s%s(%s));' %
               (indent, prefix, node.name, indent*3, return_type, args))
       output_lines.append(line)
 
 
 def _GenerateMocks(filename, source, ast_list, desired_class_names):
   processed_class_names = sets.Set()
@@ skipping 26 matching lines @@
         # Only close the class if there really is a class.
         lines.append('};')
         lines.append('')  # Add an extra newline.
 
       # Close the namespace.
       if class_node.namespace:
         for i in range(len(class_node.namespace)-1, -1, -1):
           lines.append('}  // namespace %s' % class_node.namespace[i])
         lines.append('')  # Add an extra newline.
 
-  sys.stdout.write('\n'.join(lines))
-
   if desired_class_names:
     missing_class_name_list = list(desired_class_names - processed_class_names)
     if missing_class_name_list:
       missing_class_name_list.sort()
       sys.stderr.write('Class(es) not found in %s: %s\n' %
                        (filename, ', '.join(missing_class_name_list)))
   elif not processed_class_names:
-      sys.stderr.write('No class found in %s\n' % filename)
+    sys.stderr.write('No class found in %s\n' % filename)
+
+  return lines
 
 
 def main(argv=sys.argv):
   if len(argv) < 2:
     sys.stderr.write('Google Mock Class Generator v%s\n\n' %
                      '.'.join(map(str, _VERSION)))
     sys.stderr.write(__doc__)
     return 1
 
   global _INDENT
@@ skipping 14 matching lines @@
 
   builder = ast.BuilderFromSource(source, filename)
   try:
     entire_ast = filter(None, builder.Generate())
   except KeyboardInterrupt:
     return
   except:
     # An error message was already printed since we couldn't parse.
     pass
   else:
-    _GenerateMocks(filename, source, entire_ast, desired_class_names)
+    lines = _GenerateMocks(filename, source, entire_ast, desired_class_names)
+    sys.stdout.write('\n'.join(lines))
 
 
 if __name__ == '__main__':
   main(sys.argv)