diff options
author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-08-16 11:13:12 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-16 11:13:12 -0400 |
commit | 21e518557ad7634bc4b1fd57effa7e49a1405bb5 (patch) | |
tree | 8484ccd28cc1bb4aa27c3b47b9a56cf9ee2ce66c /googlemock/scripts/generator/cpp | |
parent | 3e2cb75446e0f56f226f0fb259e032bb4d014002 (diff) | |
parent | 490554aa0f3618e1e5dd217f11fe0c3f188ed615 (diff) | |
download | googletest-21e518557ad7634bc4b1fd57effa7e49a1405bb5.tar.gz googletest-21e518557ad7634bc4b1fd57effa7e49a1405bb5.tar.bz2 googletest-21e518557ad7634bc4b1fd57effa7e49a1405bb5.zip |
Merge branch 'master' into josh/fix_scoped_class2
Diffstat (limited to 'googlemock/scripts/generator/cpp')
-rwxr-xr-x | googlemock/scripts/generator/cpp/ast.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/googlemock/scripts/generator/cpp/ast.py b/googlemock/scripts/generator/cpp/ast.py index 95074488..f14728b4 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) |