PPAPI generator: Ignore more date-only changes

ppapi/generators/idl_outfile.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """ Output file objects for generator. """
 
 import difflib
 import os
 import time
@@ skipping 36 matching lines @@
 
     for index in range(len(oldlines)):
       oldline = oldlines[index]
       curline = curlines[index]
 
       if oldline == curline: continue
 
       curwords = curline.split()
       oldwords = oldline.split()
 
+      # It wasn't a perfect match. Check for changes we should ignore.
       # Unmatched lines must be the same length
       if len(curwords) != len(oldwords):
         return False
 
       # If it's not a comment then it's a mismatch
       if curwords[0] not in ['*', '/*', '//']:
         return False
 
       # Ignore changes to the Copyright year which is autogenerated
       # /* Copyright (c) 2011 The Chromium Authors. All rights reserved.
       if len(curwords) > 4 and curwords[1] == 'Copyright':
         if curwords[4:] == oldwords[4:]: continue
 
-      # Ignore changes to auto generation timestamp when line unwrapped
+      # Ignore changes to auto generation timestamp.
       # // From FILENAME.idl modified DAY MON DATE TIME YEAR.
       # /* From FILENAME.idl modified DAY MON DATE TIME YEAR. */
-      if len(curwords) > 8 and curwords[1] == 'From':
+      # The line may be wrapped, so first deal with the first "From" line.
+      if curwords[1] == 'From':
         if curwords[0:4] == oldwords[0:4]: continue
 
       # Ignore changes to auto generation timestamp when line is wrapped
-      # * modified DAY MON DATE TIME YEAR.
-      if len(curwords) > 6 and curwords[1] == 'modified':
-        continue
+      if index > 0:
+        two_line_oldwords = oldlines[index - 1].split() + oldwords[1:]
+        two_line_curwords = curlines[index - 1].split() + curwords[1:]
+        if len(two_line_curwords) > 8 and two_line_curwords[1] == 'From':
+          if two_line_curwords[0:4] == two_line_oldwords[0:4]: continue
 
       return False
     return True
 
   # Return the file name
   def Filename(self):
     return self.filename
 
   # Append to the output if the file is still open
   def Write(self, string):
@@ skipping 106 matching lines @@
   errors += TestFile(filename, stringlist + ['X'], force=False, update=True)
 
   # Clean up file
   os.remove(filename)
   if not errors: InfoOut.Log('All tests pass.')
   return errors
 
 
 if __name__ == '__main__':
   sys.exit(main())