diff options
| author | Kelly Rauchenberger <fefferburbia@gmail.com> | 2016-03-17 01:27:54 -0400 |
|---|---|---|
| committer | Kelly Rauchenberger <fefferburbia@gmail.com> | 2016-03-17 01:27:54 -0400 |
| commit | 365dda7937dae0b6edef1f498473c57c715eec1d (patch) | |
| tree | 3865cf89a0f623c7701fd08cd96e46f18b5e1ca3 | |
| parent | dc210ee6eba3b1d173808bd858113f6abd90bff1 (diff) | |
| download | verbly-365dda7937dae0b6edef1f498473c57c715eec1d.tar.gz verbly-365dda7937dae0b6edef1f498473c57c715eec1d.tar.bz2 verbly-365dda7937dae0b6edef1f498473c57c715eec1d.zip | |
Renamed some class members that shared names with classes
| -rw-r--r-- | lib/token.cpp | 4 | ||||
| -rw-r--r-- | lib/token.h | 7 |
2 files changed, 6 insertions, 5 deletions
| diff --git a/lib/token.cpp b/lib/token.cpp index aa8f50e..facab8a 100644 --- a/lib/token.cpp +++ b/lib/token.cpp | |||
| @@ -12,12 +12,12 @@ namespace verbly { | |||
| 12 | return _type; | 12 | return _type; |
| 13 | } | 13 | } |
| 14 | 14 | ||
| 15 | verb_token::verb_token(const class verb& _verb) : token(token::type::verb), _verb(&_verb) | 15 | verb_token::verb_token(const verb& _verb) : token(token::type::verb), _verb(&_verb) |
| 16 | { | 16 | { |
| 17 | 17 | ||
| 18 | } | 18 | } |
| 19 | 19 | ||
| 20 | const class verb& verb_token::verb() const | 20 | const verb& verb_token::get_verb() const |
| 21 | { | 21 | { |
| 22 | return *_verb; | 22 | return *_verb; |
| 23 | } | 23 | } |
| diff --git a/lib/token.h b/lib/token.h index 44d99cb..b22032b 100644 --- a/lib/token.h +++ b/lib/token.h | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | #include <string> | 4 | #include <string> |
| 5 | #include <list> | 5 | #include <list> |
| 6 | #include <sstream> | 6 | #include <sstream> |
| 7 | #include <algorithm> | ||
| 7 | 8 | ||
| 8 | namespace verbly { | 9 | namespace verbly { |
| 9 | 10 | ||
| @@ -61,9 +62,9 @@ namespace verbly { | |||
| 61 | inflection _inflection = inflection::infinitive; | 62 | inflection _inflection = inflection::infinitive; |
| 62 | 63 | ||
| 63 | public: | 64 | public: |
| 64 | verb_token(const class verb& _verb); | 65 | verb_token(const verb& _verb); |
| 65 | 66 | ||
| 66 | const class verb& verb() const; | 67 | const verb& get_verb() const; |
| 67 | 68 | ||
| 68 | verb_token& inflect(inflection infl); | 69 | verb_token& inflect(inflection infl); |
| 69 | 70 | ||
| @@ -260,7 +261,7 @@ namespace verbly { | |||
| 260 | return m_theme; | 261 | return m_theme; |
| 261 | } | 262 | } |
| 262 | 263 | ||
| 263 | fillin_type fillin_type() const | 264 | fillin_type get_fillin_type() const |
| 264 | { | 265 | { |
| 265 | return m_fillin_type; | 266 | return m_fillin_type; |
| 266 | } | 267 | } |