diff options
Diffstat (limited to 'generator/word.cpp')
-rw-r--r-- | generator/word.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/generator/word.cpp b/generator/word.cpp index b3fc490..360cd6a 100644 --- a/generator/word.cpp +++ b/generator/word.cpp | |||
@@ -1,10 +1,8 @@ | |||
1 | #include "word.h" | 1 | #include "word.h" |
2 | #include <list> | 2 | #include <list> |
3 | #include <string> | 3 | #include <string> |
4 | #include "database.h" | ||
5 | #include "notion.h" | 4 | #include "notion.h" |
6 | #include "lemma.h" | 5 | #include "lemma.h" |
7 | #include "field.h" | ||
8 | #include "group.h" | 6 | #include "group.h" |
9 | 7 | ||
10 | namespace verbly { | 8 | namespace verbly { |
@@ -43,9 +41,9 @@ namespace verbly { | |||
43 | verbGroup_ = &verbGroup; | 41 | verbGroup_ = &verbGroup; |
44 | } | 42 | } |
45 | 43 | ||
46 | database& operator<<(database& db, const word& arg) | 44 | hatkirby::database& operator<<(hatkirby::database& db, const word& arg) |
47 | { | 45 | { |
48 | std::list<field> fields; | 46 | std::list<hatkirby::column> fields; |
49 | 47 | ||
50 | fields.emplace_back("word_id", arg.getId()); | 48 | fields.emplace_back("word_id", arg.getId()); |
51 | fields.emplace_back("notion_id", arg.getNotion().getId()); | 49 | fields.emplace_back("notion_id", arg.getNotion().getId()); |
@@ -59,7 +57,8 @@ namespace verbly { | |||
59 | if ((arg.getNotion().getPartOfSpeech() == part_of_speech::adjective) | 57 | if ((arg.getNotion().getPartOfSpeech() == part_of_speech::adjective) |
60 | && (arg.getAdjectivePosition() != positioning::undefined)) | 58 | && (arg.getAdjectivePosition() != positioning::undefined)) |
61 | { | 59 | { |
62 | fields.emplace_back("position", static_cast<int>(arg.getAdjectivePosition())); | 60 | fields.emplace_back("position", |
61 | static_cast<int>(arg.getAdjectivePosition())); | ||
63 | } | 62 | } |
64 | 63 | ||
65 | if ((arg.getNotion().getPartOfSpeech() == part_of_speech::verb) | 64 | if ((arg.getNotion().getPartOfSpeech() == part_of_speech::verb) |