aboutsummaryrefslogtreecommitdiffstats
path: root/googlemock/scripts/generator/cpp
diff options
context:
space:
mode:
authorGennadiy Civil <gennadiycivil@users.noreply.github.com>2018-08-08 12:19:04 -0700
committerGitHub <noreply@github.com>2018-08-08 12:19:04 -0700
commit11f5a2740aa8a55d620fba6957e53ad08721cf54 (patch)
tree04f982e6158e57f68529ca47e37ec377574647dd /googlemock/scripts/generator/cpp
parent008e54c1dd407b6edd680fccf78cd194365e0507 (diff)
parent66bd580b5bc054522f7fab13463a47aa156a2d4b (diff)
downloadgoogletest-11f5a2740aa8a55d620fba6957e53ad08721cf54.tar.gz
googletest-11f5a2740aa8a55d620fba6957e53ad08721cf54.tar.bz2
googletest-11f5a2740aa8a55d620fba6957e53ad08721cf54.zip
Merge branch 'master' into cross-testing-patch-1
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)