diff options
Diffstat (limited to 'googlemock')
-rw-r--r-- | googlemock/docs/pump_manual.md | 8 | ||||
-rw-r--r-- | googlemock/include/gmock/gmock-matchers.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/googlemock/docs/pump_manual.md b/googlemock/docs/pump_manual.md index 60ff06c3..cdf7c57d 100644 --- a/googlemock/docs/pump_manual.md +++ b/googlemock/docs/pump_manual.md @@ -7,10 +7,10 @@ macros that vary only (or almost only) in the number of arguments they take. It's a lot of repetitive, mechanical, and error-prone work. Our experience is that it's tedious to write custom scripts, which tend to -reflect the structure of the generated code poorly and are often hard to -read and edit. For example, a small change needed in the generated code -may require some non-intuitive, non-trivial changes in the script. This is -especially painful when experimenting with the code. +reflect the structure of the generated code poorly and are often hard to read +and edit. For example, a small change needed in the generated code may require +some non-intuitive, non-trivial changes in the script. This is especially +painful when experimenting with the code. This script may be useful for generating meta code, for example a series of macros of FOO1, FOO2, etc. Nevertheless, please make it your last resort diff --git a/googlemock/include/gmock/gmock-matchers.h b/googlemock/include/gmock/gmock-matchers.h index b8ec24dd..e71570bc 100644 --- a/googlemock/include/gmock/gmock-matchers.h +++ b/googlemock/include/gmock/gmock-matchers.h @@ -1323,7 +1323,7 @@ class PredicateFormatterFromMatcher { << "Expected: "; matcher.DescribeTo(&ss); - // Rerun the matcher to "PrintAndExain" the failure. + // Rerun the matcher to "PrintAndExplain" the failure. StringMatchResultListener listener; if (MatchPrintAndExplain(x, matcher, &listener)) { ss << "\n The matcher failed on the initial attempt; but passed when " |