aboutsummaryrefslogtreecommitdiffstats
path: root/googlemock/scripts/generator/cpp
diff options
context:
space:
mode:
authorTanzinul Islam <t_17_7@hotmail.com>2018-03-05 09:02:59 +0000
committerTanzinul Islam <t_17_7@hotmail.com>2018-03-05 09:02:59 +0000
commit6d089311ca2a6fd83dff9ed68c1d3eb00c1443d0 (patch)
treec6f8f6067f957eb6d49656278f79c93353bb039c /googlemock/scripts/generator/cpp
parent555e6e79485151cf8c8ada55d57d9ed872591dc5 (diff)
parenta7a7f51d355081a7f1e8ab295d5df5f9bb4612c8 (diff)
downloadgoogletest-6d089311ca2a6fd83dff9ed68c1d3eb00c1443d0.tar.gz
googletest-6d089311ca2a6fd83dff9ed68c1d3eb00c1443d0.tar.bz2
googletest-6d089311ca2a6fd83dff9ed68c1d3eb00c1443d0.zip
Merge branch 'fix_death_test_child_mingw_wer_issue1116' of https://github.com/tanzislam/googletest into fix_death_test_child_mingw_wer_issue1116
Diffstat (limited to 'googlemock/scripts/generator/cpp')
-rwxr-xr-xgooglemock/scripts/generator/cpp/ast.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/googlemock/scripts/generator/cpp/ast.py b/googlemock/scripts/generator/cpp/ast.py
index 11cbe912..cce32724 100755
--- a/googlemock/scripts/generator/cpp/ast.py
+++ b/googlemock/scripts/generator/cpp/ast.py
@@ -338,7 +338,7 @@ class Class(_GenericDeclaration):
# TODO(nnorwitz): handle namespaces, etc.
if self.bases:
for token_list in self.bases:
- # TODO(nnorwitz): bases are tokens, do name comparision.
+ # TODO(nnorwitz): bases are tokens, do name comparison.
for token in token_list:
if token.name == node.name:
return True
@@ -381,7 +381,7 @@ class Function(_GenericDeclaration):
def Requires(self, node):
if self.parameters:
- # TODO(nnorwitz): parameters are tokens, do name comparision.
+ # TODO(nnorwitz): parameters are tokens, do name comparison.
for p in self.parameters:
if p.name == node.name:
return True
@@ -858,7 +858,7 @@ class AstBuilder(object):
last_token = self._GetNextToken()
return tokens, last_token
- # TODO(nnorwitz): remove _IgnoreUpTo() it shouldn't be necesary.
+ # TODO(nnorwitz): remove _IgnoreUpTo() it shouldn't be necessary.
def _IgnoreUpTo(self, token_type, token):
unused_tokens = self._GetTokensUpTo(token_type, token)