aboutsummaryrefslogtreecommitdiffstats
path: root/googlemock/scripts/generator/cpp
diff options
context:
space:
mode:
authorBernhard Bauer <sheepmaster@gmail.com>2018-03-12 18:15:35 +0000
committerGitHub <noreply@github.com>2018-03-12 18:15:35 +0000
commitfc437ef4b2c0a0302a6b0771c334ca51dc1ccf7d (patch)
tree0718a372bf66172bf4d3415eca6eb5d1f96b41fa /googlemock/scripts/generator/cpp
parent7b70413e0ca57b3e48d7655f342122f159f52b31 (diff)
parentabc6e943e0878af67b91fa8a646edf717195c80c (diff)
downloadgoogletest-fc437ef4b2c0a0302a6b0771c334ca51dc1ccf7d.tar.gz
googletest-fc437ef4b2c0a0302a6b0771c334ca51dc1ccf7d.tar.bz2
googletest-fc437ef4b2c0a0302a6b0771c334ca51dc1ccf7d.zip
Merge branch 'master' into upstream_188748737
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)