diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-02-27 10:00:29 -0500 | 
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-27 10:00:29 -0500 | 
| commit | d4f77c1e3a340b37f5bed5e1e4de7d741f1d1199 (patch) | |
| tree | fd25c57276fa42ec365f1ca05b4853ab459697e4 /googlemock/scripts/generator | |
| parent | 3498a1ac52deb83f30b8170c78bfba9dc6227198 (diff) | |
| parent | ac34e6c950925df7165e626becd3f9d64dcd584b (diff) | |
| download | googletest-d4f77c1e3a340b37f5bed5e1e4de7d741f1d1199.tar.gz googletest-d4f77c1e3a340b37f5bed5e1e4de7d741f1d1199.tar.bz2 googletest-d4f77c1e3a340b37f5bed5e1e4de7d741f1d1199.zip | |
Merge branch 'master' into win-libcxx2
Diffstat (limited to 'googlemock/scripts/generator')
| -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 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) | 
