summary refs log tree commit diff stats
path: root/lib
diff options
context:
space:
mode:
authorKelly Rauchenberger <fefferburbia@gmail.com>2017-02-03 17:02:58 -0500
committerKelly Rauchenberger <fefferburbia@gmail.com>2017-02-03 17:02:58 -0500
commitbea3673ae1b3d19585dec56e96dbcd8a56b96e6d (patch)
treec8ab07b8c69f90c053d6b60620b679216df011fc /lib
parente3d5d30956434732fa99d390f927906742bf7d85 (diff)
downloadverbly-bea3673ae1b3d19585dec56e96dbcd8a56b96e6d.tar.gz
verbly-bea3673ae1b3d19585dec56e96dbcd8a56b96e6d.tar.bz2
verbly-bea3673ae1b3d19585dec56e96dbcd8a56b96e6d.zip
Renamed object join fields to prevent conflicts with class names
This was not a problem with clang but it caused compilation errors with gcc.
Diffstat (limited to 'lib')
-rw-r--r--lib/filter.cpp24
-rw-r--r--lib/form.cpp10
-rw-r--r--lib/form.h6
-rw-r--r--lib/frame.cpp6
-rw-r--r--lib/frame.h8
-rw-r--r--lib/lemma.cpp6
-rw-r--r--lib/lemma.h6
-rw-r--r--lib/notion.cpp4
-rw-r--r--lib/notion.h4
-rw-r--r--lib/part.cpp4
-rw-r--r--lib/part.h4
-rw-r--r--lib/pronunciation.cpp2
-rw-r--r--lib/pronunciation.h2
-rw-r--r--lib/word.cpp6
-rw-r--r--lib/word.h12
15 files changed, 52 insertions, 52 deletions
diff --git a/lib/filter.cpp b/lib/filter.cpp index ab46df2..ecff8ac 100644 --- a/lib/filter.cpp +++ b/lib/filter.cpp
@@ -1115,7 +1115,7 @@ namespace verbly {
1115 case object::form: 1115 case object::form:
1116 case object::pronunciation: 1116 case object::pronunciation:
1117 { 1117 {
1118 return (verbly::notion::word %= *this); 1118 return (verbly::notion::words %= *this);
1119 } 1119 }
1120 } 1120 }
1121 } 1121 }
@@ -1126,7 +1126,7 @@ namespace verbly {
1126 { 1126 {
1127 case object::notion: 1127 case object::notion:
1128 { 1128 {
1129 return (verbly::word::notion %= *this); 1129 return (verbly::word::notions %= *this);
1130 } 1130 }
1131 1131
1132 case object::undefined: 1132 case object::undefined:
@@ -1138,14 +1138,14 @@ namespace verbly {
1138 case object::frame: 1138 case object::frame:
1139 case object::part: 1139 case object::part:
1140 { 1140 {
1141 return (verbly::word::frame %= *this); 1141 return (verbly::word::frames %= *this);
1142 } 1142 }
1143 1143
1144 case object::lemma: 1144 case object::lemma:
1145 case object::form: 1145 case object::form:
1146 case object::pronunciation: 1146 case object::pronunciation:
1147 { 1147 {
1148 return (verbly::word::lemma %= *this); 1148 return (verbly::word::lemmas %= *this);
1149 } 1149 }
1150 } 1150 }
1151 1151
@@ -1165,12 +1165,12 @@ namespace verbly {
1165 case object::form: 1165 case object::form:
1166 case object::pronunciation: 1166 case object::pronunciation:
1167 { 1167 {
1168 return (verbly::frame::word %= *this); 1168 return (verbly::frame::words %= *this);
1169 } 1169 }
1170 1170
1171 case object::part: 1171 case object::part:
1172 { 1172 {
1173 return (verbly::frame::part() %= *this); 1173 return (verbly::frame::parts() %= *this);
1174 } 1174 }
1175 } 1175 }
1176 } 1176 }
@@ -1192,7 +1192,7 @@ namespace verbly {
1192 case object::form: 1192 case object::form:
1193 case object::pronunciation: 1193 case object::pronunciation:
1194 { 1194 {
1195 return (verbly::part::frame %= *this); 1195 return (verbly::part::frames %= *this);
1196 } 1196 }
1197 } 1197 }
1198 } 1198 }
@@ -1206,7 +1206,7 @@ namespace verbly {
1206 case object::frame: 1206 case object::frame:
1207 case object::part: 1207 case object::part:
1208 { 1208 {
1209 return verbly::lemma::word %= *this; 1209 return verbly::lemma::words %= *this;
1210 } 1210 }
1211 1211
1212 case object::undefined: 1212 case object::undefined:
@@ -1218,7 +1218,7 @@ namespace verbly {
1218 case object::form: 1218 case object::form:
1219 case object::pronunciation: 1219 case object::pronunciation:
1220 { 1220 {
1221 return (verbly::lemma::form(inflection::base) %= *this); 1221 return (verbly::lemma::forms(inflection::base) %= *this);
1222 } 1222 }
1223 } 1223 }
1224 } 1224 }
@@ -1233,7 +1233,7 @@ namespace verbly {
1233 case object::part: 1233 case object::part:
1234 case object::lemma: 1234 case object::lemma:
1235 { 1235 {
1236 return verbly::form::lemma %= *this; 1236 return verbly::form::lemmas %= *this;
1237 } 1237 }
1238 1238
1239 case object::undefined: 1239 case object::undefined:
@@ -1244,7 +1244,7 @@ namespace verbly {
1244 1244
1245 case object::pronunciation: 1245 case object::pronunciation:
1246 { 1246 {
1247 return (verbly::form::pronunciation %= *this); 1247 return (verbly::form::pronunciations %= *this);
1248 } 1248 }
1249 } 1249 }
1250 } 1250 }
@@ -1260,7 +1260,7 @@ namespace verbly {
1260 case object::lemma: 1260 case object::lemma:
1261 case object::form: 1261 case object::form:
1262 { 1262 {
1263 return verbly::pronunciation::form %= *this; 1263 return verbly::pronunciation::forms %= *this;
1264 } 1264 }
1265 1265
1266 case object::undefined: 1266 case object::undefined:
diff --git a/lib/form.cpp b/lib/form.cpp index 4811f14..fe7d104 100644 --- a/lib/form.cpp +++ b/lib/form.cpp
@@ -16,8 +16,8 @@ namespace verbly {
16 const field form::complexity = field::integerField(object::form, "complexity"); 16 const field form::complexity = field::integerField(object::form, "complexity");
17 const field form::proper = field::booleanField(object::form, "proper"); 17 const field form::proper = field::booleanField(object::form, "proper");
18 18
19 const field form::lemma = field::joinField(object::form, "form_id", object::lemma); 19 const field form::lemmas = field::joinField(object::form, "form_id", object::lemma);
20 const field form::pronunciation = field::joinThrough(object::form, "form_id", object::pronunciation, "forms_pronunciations", "pronunciation_id"); 20 const field form::pronunciations = field::joinThrough(object::form, "form_id", object::pronunciation, "forms_pronunciations", "pronunciation_id");
21 21
22 form::form(const database& db, sqlite3_stmt* row) : db_(&db), valid_(true) 22 form::form(const database& db, sqlite3_stmt* row) : db_(&db), valid_(true)
23 { 23 {
@@ -36,7 +36,7 @@ namespace verbly {
36 36
37 if (!initializedPronunciations_) 37 if (!initializedPronunciations_)
38 { 38 {
39 pronunciations_ = db_->pronunciations(pronunciation::form %= *this, verbly::pronunciation::id, -1).all(); 39 pronunciations_ = db_->pronunciations(pronunciation::forms %= *this, pronunciation::id, -1).all();
40 initializedPronunciations_ = true; 40 initializedPronunciations_ = true;
41 } 41 }
42 42
@@ -50,10 +50,10 @@ namespace verbly {
50 throw std::domain_error("Bad access to uninitialized form"); 50 throw std::domain_error("Bad access to uninitialized form");
51 } 51 }
52 52
53 const std::vector<verbly::pronunciation>& pronunciations = getPronunciations(); 53 const std::vector<pronunciation>& pronunciations = getPronunciations();
54 if (!pronunciations.empty()) 54 if (!pronunciations.empty())
55 { 55 {
56 return std::any_of(std::begin(pronunciations), std::end(pronunciations), [] (const verbly::pronunciation& p) { 56 return std::any_of(std::begin(pronunciations), std::end(pronunciations), [] (const pronunciation& p) {
57 return p.getPhonemes().front().find_first_of("012") != std::string::npos; 57 return p.getPhonemes().front().find_first_of("012") != std::string::npos;
58 }); 58 });
59 } else { 59 } else {
diff --git a/lib/form.h b/lib/form.h index cf64117..a05d015 100644 --- a/lib/form.h +++ b/lib/form.h
@@ -104,9 +104,9 @@ namespace verbly {
104 104
105 // Relationships to other objects 105 // Relationships to other objects
106 106
107 static const field lemma; 107 static const field lemmas;
108 108
109 static const field pronunciation; 109 static const field pronunciations;
110 110
111 private: 111 private:
112 bool valid_ = false; 112 bool valid_ = false;
@@ -119,7 +119,7 @@ namespace verbly {
119 const database* db_; 119 const database* db_;
120 120
121 mutable bool initializedPronunciations_ = false; 121 mutable bool initializedPronunciations_ = false;
122 mutable std::vector<class pronunciation> pronunciations_; 122 mutable std::vector<pronunciation> pronunciations_;
123 123
124 }; 124 };
125 125
diff --git a/lib/frame.cpp b/lib/frame.cpp index a73fbda..b5ba914 100644 --- a/lib/frame.cpp +++ b/lib/frame.cpp
@@ -12,14 +12,14 @@ namespace verbly {
12 const field frame::id = field::integerField(object::frame, "frame_id"); 12 const field frame::id = field::integerField(object::frame, "frame_id");
13 const field frame::length = field::integerField(object::frame, "length"); 13 const field frame::length = field::integerField(object::frame, "length");
14 14
15 const field frame::word = field::joinField(object::frame, "group_id", object::word); 15 const field frame::words = field::joinField(object::frame, "group_id", object::word);
16 16
17 field frame::part() 17 field frame::parts()
18 { 18 {
19 return field::joinField(object::frame, "frame_id", object::part); 19 return field::joinField(object::frame, "frame_id", object::part);
20 } 20 }
21 21
22 field frame::part(int index) 22 field frame::parts(int index)
23 { 23 {
24 return field::joinWhere(object::frame, "frame_id", object::part, part::index, index); 24 return field::joinWhere(object::frame, "frame_id", object::part, part::index, index);
25 } 25 }
diff --git a/lib/frame.h b/lib/frame.h index 36e179e..e049584 100644 --- a/lib/frame.h +++ b/lib/frame.h
@@ -85,10 +85,10 @@ namespace verbly {
85 85
86 // Relationships to other objects 86 // Relationships to other objects
87 87
88 static const field word; 88 static const field words;
89 89
90 static field part(); 90 static field parts();
91 static field part(int index); 91 static field parts(int index);
92 92
93 private: 93 private:
94 bool valid_ = false; 94 bool valid_ = false;
@@ -96,7 +96,7 @@ namespace verbly {
96 int id_; 96 int id_;
97 int groupId_; 97 int groupId_;
98 int length_; 98 int length_;
99 std::vector<class part> parts_; 99 std::vector<part> parts_;
100 100
101 const database* db_; 101 const database* db_;
102 102
diff --git a/lib/lemma.cpp b/lib/lemma.cpp index 0c6e99e..ea7b0ea 100644 --- a/lib/lemma.cpp +++ b/lib/lemma.cpp
@@ -12,9 +12,9 @@ namespace verbly {
12 const field lemma::id = field::integerField(object::lemma, "lemma_id"); 12 const field lemma::id = field::integerField(object::lemma, "lemma_id");
13 const field lemma::inflectionCategory = field::integerField(object::lemma, "category"); 13 const field lemma::inflectionCategory = field::integerField(object::lemma, "category");
14 14
15 const field lemma::word = field::joinField(object::lemma, "lemma_id", object::word); 15 const field lemma::words = field::joinField(object::lemma, "lemma_id", object::word);
16 16
17 field lemma::form(inflection category) 17 field lemma::forms(inflection category)
18 { 18 {
19 return field::joinWhere(object::lemma, "form_id", object::form, inflectionCategory, static_cast<int>(category)); 19 return field::joinWhere(object::lemma, "form_id", object::form, inflectionCategory, static_cast<int>(category));
20 } 20 }
@@ -61,7 +61,7 @@ namespace verbly {
61 61
62 void lemma::initializeForm(inflection infl) const 62 void lemma::initializeForm(inflection infl) const
63 { 63 {
64 forms_[infl] = db_->forms(form::lemma %= ((inflectionCategory == infl) && *this), verbly::form::id, -1).all(); 64 forms_[infl] = db_->forms(form::lemmas %= ((inflectionCategory == infl) && *this), verbly::form::id, -1).all();
65 } 65 }
66 66
67}; 67};
diff --git a/lib/lemma.h b/lib/lemma.h index 56cfc56..bba5572 100644 --- a/lib/lemma.h +++ b/lib/lemma.h
@@ -72,9 +72,9 @@ namespace verbly {
72 72
73 // Relationships to other objects 73 // Relationships to other objects
74 74
75 static const field word; 75 static const field words;
76 76
77 static field form(inflection category); 77 static field forms(inflection category);
78 78
79 private: 79 private:
80 80
@@ -84,7 +84,7 @@ namespace verbly {
84 84
85 int id_; 85 int id_;
86 86
87 mutable std::map<inflection, std::vector<class form>> forms_; 87 mutable std::map<inflection, std::vector<form>> forms_;
88 88
89 const database* db_; 89 const database* db_;
90 90
diff --git a/lib/notion.cpp b/lib/notion.cpp index c8a8b47..e8cc616 100644 --- a/lib/notion.cpp +++ b/lib/notion.cpp
@@ -13,7 +13,7 @@ namespace verbly {
13 const field notion::wnid = field::integerField(object::notion, "wnid", true); 13 const field notion::wnid = field::integerField(object::notion, "wnid", true);
14 const field notion::numOfImages = field::integerField(object::notion, "images", true); 14 const field notion::numOfImages = field::integerField(object::notion, "images", true);
15 15
16 const field notion::word = field::joinField(object::notion, "word_id", object::word); 16 const field notion::words = field::joinField(object::notion, "word_id", object::word);
17 17
18 const field notion::hypernyms = field::selfJoin(object::notion, "notion_id", "hypernymy", "hyponym_id", "hypernym_id"); 18 const field notion::hypernyms = field::selfJoin(object::notion, "notion_id", "hypernymy", "hyponym_id", "hypernym_id");
19 const field notion::hyponyms = field::selfJoin(object::notion, "notion_id", "hypernymy", "hypernym_id", "hyponym_id"); 19 const field notion::hyponyms = field::selfJoin(object::notion, "notion_id", "hypernymy", "hypernym_id", "hyponym_id");
@@ -53,7 +53,7 @@ namespace verbly {
53 const field notion::causes = field::selfJoin(object::notion, "notion_id", "causality", "effect_id", "cause_id"); 53 const field notion::causes = field::selfJoin(object::notion, "notion_id", "causality", "effect_id", "cause_id");
54 const field notion::effects = field::selfJoin(object::notion, "notion_id", "causality", "cause_id", "effect_id"); 54 const field notion::effects = field::selfJoin(object::notion, "notion_id", "causality", "cause_id", "effect_id");
55 55
56 const notion::preposition_group_field notion::prepositionGroup = {}; 56 const notion::preposition_group_field notion::prepositionGroups = {};
57 57
58 const field notion::preposition_group_field::isA = field::joinField(object::notion, "notion_id", "is_a"); 58 const field notion::preposition_group_field::isA = field::joinField(object::notion, "notion_id", "is_a");
59 const field notion::preposition_group_field::groupNameField = field::stringField("is_a", "groupname"); 59 const field notion::preposition_group_field::groupNameField = field::stringField("is_a", "groupname");
diff --git a/lib/notion.h b/lib/notion.h index a180d73..4fd3396 100644 --- a/lib/notion.h +++ b/lib/notion.h
@@ -124,7 +124,7 @@ namespace verbly {
124 124
125 // Relationships with other objects 125 // Relationships with other objects
126 126
127 static const field word; 127 static const field words;
128 128
129 // Relationships with self 129 // Relationships with self
130 130
@@ -179,7 +179,7 @@ namespace verbly {
179 static const field groupNameField; 179 static const field groupNameField;
180 }; 180 };
181 181
182 static const preposition_group_field prepositionGroup; 182 static const preposition_group_field prepositionGroups;
183 183
184 private: 184 private:
185 bool valid_ = false; 185 bool valid_ = false;
diff --git a/lib/part.cpp b/lib/part.cpp index 1fbb24d..cbd951b 100644 --- a/lib/part.cpp +++ b/lib/part.cpp
@@ -15,12 +15,12 @@ namespace verbly {
15 15
16 const field part::role = field::stringField(object::part, "role", true); 16 const field part::role = field::stringField(object::part, "role", true);
17 17
18 const field part::frame = field::joinField(object::part, "frame_id", object::frame); 18 const field part::frames = field::joinField(object::part, "frame_id", object::frame);
19 19
20 const field part::synrestr_field::synrestrJoin = field::joinField(object::part, "part_id", "synrestrs"); 20 const field part::synrestr_field::synrestrJoin = field::joinField(object::part, "part_id", "synrestrs");
21 const field part::synrestr_field::synrestrField = field::stringField("synrestrs", "synrestr"); 21 const field part::synrestr_field::synrestrField = field::stringField("synrestrs", "synrestr");
22 22
23 const part::synrestr_field part::synrestr = {}; 23 const part::synrestr_field part::synrestrs = {};
24 24
25 part part::createNounPhrase(std::string role, selrestr selrestrs, std::set<std::string> synrestrs) 25 part part::createNounPhrase(std::string role, selrestr selrestrs, std::set<std::string> synrestrs)
26 { 26 {
diff --git a/lib/part.h b/lib/part.h index 9a01312..7180f57 100644 --- a/lib/part.h +++ b/lib/part.h
@@ -108,7 +108,7 @@ namespace verbly {
108 108
109 // Relationships to other objects 109 // Relationships to other objects
110 110
111 static const field frame; 111 static const field frames;
112 112
113 // Noun synrestr relationship 113 // Noun synrestr relationship
114 114
@@ -123,7 +123,7 @@ namespace verbly {
123 static const field synrestrField; 123 static const field synrestrField;
124 }; 124 };
125 125
126 static const synrestr_field synrestr; 126 static const synrestr_field synrestrs;
127 127
128 private: 128 private:
129 129
diff --git a/lib/pronunciation.cpp b/lib/pronunciation.cpp index e937ba6..3ddb1c5 100644 --- a/lib/pronunciation.cpp +++ b/lib/pronunciation.cpp
@@ -15,7 +15,7 @@ namespace verbly {
15 const field pronunciation::numOfSyllables = field::integerField(object::pronunciation, "syllables"); 15 const field pronunciation::numOfSyllables = field::integerField(object::pronunciation, "syllables");
16 const field pronunciation::stress = field::stringField(object::pronunciation, "stress"); 16 const field pronunciation::stress = field::stringField(object::pronunciation, "stress");
17 17
18 const field pronunciation::form = field::joinThrough(object::pronunciation, "pronunciation_id", object::form, "forms_pronunciations", "form_id"); 18 const field pronunciation::forms = field::joinThrough(object::pronunciation, "pronunciation_id", object::form, "forms_pronunciations", "form_id");
19 19
20 const field pronunciation::prerhyme = field::stringField(object::pronunciation, "prerhyme", true); 20 const field pronunciation::prerhyme = field::stringField(object::pronunciation, "prerhyme", true);
21 const field pronunciation::rhyme = field::stringField(object::pronunciation, "rhyme", true); 21 const field pronunciation::rhyme = field::stringField(object::pronunciation, "rhyme", true);
diff --git a/lib/pronunciation.h b/lib/pronunciation.h index c7a1d4d..e171fe8 100644 --- a/lib/pronunciation.h +++ b/lib/pronunciation.h
@@ -138,7 +138,7 @@ namespace verbly {
138 138
139 // Relationships to other objects 139 // Relationships to other objects
140 140
141 static const field form; 141 static const field forms;
142 142
143 private: 143 private:
144 bool valid_ = false; 144 bool valid_ = false;
diff --git a/lib/word.cpp b/lib/word.cpp index 90eab1d..d75159c 100644 --- a/lib/word.cpp +++ b/lib/word.cpp
@@ -15,9 +15,9 @@ namespace verbly {
15 const field word::tagCount = field::integerField(object::word, "tag_count", true); 15 const field word::tagCount = field::integerField(object::word, "tag_count", true);
16 const field word::adjectivePosition = field::integerField(object::word, "position", true); 16 const field word::adjectivePosition = field::integerField(object::word, "position", true);
17 17
18 const field word::notion = field::joinField(object::word, "notion_id", object::notion); 18 const field word::notions = field::joinField(object::word, "notion_id", object::notion);
19 const field word::lemma = field::joinField(object::word, "lemma_id", object::lemma); 19 const field word::lemmas = field::joinField(object::word, "lemma_id", object::lemma);
20 const field word::frame = field::joinField(object::word, "group_id", object::frame, true); 20 const field word::frames = field::joinField(object::word, "group_id", object::frame, true);
21 21
22 const field word::antonyms = field::selfJoin(object::word, "word_id", "antonymy", "antonym_2_id", "antonym_1_id"); 22 const field word::antonyms = field::selfJoin(object::word, "word_id", "antonymy", "antonym_2_id", "antonym_1_id");
23 23
diff --git a/lib/word.h b/lib/word.h index 8a333a4..864cee1 100644 --- a/lib/word.h +++ b/lib/word.h
@@ -126,9 +126,9 @@ namespace verbly {
126 126
127 // Relationships with other objects 127 // Relationships with other objects
128 128
129 static const field notion; 129 static const field notions;
130 static const field lemma; 130 static const field lemmas;
131 static const field frame; 131 static const field frames;
132 132
133 // Relationships with self 133 // Relationships with self
134 134
@@ -169,11 +169,11 @@ namespace verbly {
169 169
170 const database* db_; 170 const database* db_;
171 171
172 mutable class notion notion_; 172 mutable notion notion_;
173 mutable class lemma lemma_; 173 mutable lemma lemma_;
174 174
175 mutable bool initializedFrames_ = false; 175 mutable bool initializedFrames_ = false;
176 mutable std::vector<class frame> frames_; 176 mutable std::vector<frame> frames_;
177 177
178 }; 178 };
179 179