eson/googletest
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

More Clang support improvements in Google Mock Doctor.

Browse Source
This commit is contained in:
vladlosev 2011-08-25 21:35:10 +00:00
parent 787146bdb7
commit eca38cd7ec
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/gmock_doctor.py
View File

@ -173,7 +173,7 @@ def _NeedToReturnReferenceDiagnoser(msg):
r'(.*\n)*?' + r'(.*\n)*?' +
_CLANG_NON_GMOCK_FILE_LINE_RE + _CLANG_NON_GMOCK_FILE_LINE_RE +
r'note: in instantiation of function template specialization ' r'note: in instantiation of function template specialization '
r'\'testing::internal::ReturnAction<(?P<type>).*>' r'\'testing::internal::ReturnAction<(?P<type>.*)>'
r'::operator Action<.*>\' requested here') r'::operator Action<.*>\' requested here')
diagnosis = """ diagnosis = """
You are using a Return() action in a function that returns a reference to You are using a Return() action in a function that returns a reference to
@ -192,11 +192,11 @@ def _NeedToReturnSomethingDiagnoser(msg):
r'|(error: control reaches end of non-void function)') r'|(error: control reaches end of non-void function)')
clang_regex1 = (_CLANG_FILE_LINE_RE + clang_regex1 = (_CLANG_FILE_LINE_RE +
r'error: cannot initialize return object ' r'error: cannot initialize return object '
r'of type \'Result\' \(aka \'(?P<return_type>).*\'\) ' r'of type \'Result\' \(aka \'(?P<return_type>.*)\'\) '
r'with an rvalue of type \'void\'') r'with an rvalue of type \'void\'')
clang_regex2 = (_CLANG_FILE_LINE_RE + clang_regex2 = (_CLANG_FILE_LINE_RE +
r'error: cannot initialize return object ' r'error: cannot initialize return object '
r'of type \'(?P<return_type>).*\' ' r'of type \'(?P<return_type>.*)\' '
r'with an rvalue of type \'void\'') r'with an rvalue of type \'void\'')
diagnosis = """ diagnosis = """
You are using an action that returns void, but it needs to return You are using an action that returns void, but it needs to return
@ -395,8 +395,8 @@ def _NeedToUseSymbolDiagnoser(msg):
gcc_regex = (_GCC_FILE_LINE_RE + r'error: \'(?P<symbol>.+)\' ' gcc_regex = (_GCC_FILE_LINE_RE + r'error: \'(?P<symbol>.+)\' '
r'(was not declared in this scope|has not been declared)') r'(was not declared in this scope|has not been declared)')
clang_regex = (_CLANG_FILE_LINE_RE + clang_regex = (_CLANG_FILE_LINE_RE +
r'error: (use of undeclared identifier|unknown type name) ' r'error: (use of undeclared identifier|unknown type name|'
r'\'(?P<symbol>[^\']+)\'') r'no template named) \'(?P<symbol>[^\']+)\'')
diagnosis = """ diagnosis = """
'%(symbol)s' is defined by Google Mock in the testing namespace. '%(symbol)s' is defined by Google Mock in the testing namespace.
Did you forget to write Did you forget to write