summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorKelly Rauchenberger <fefferburbia@gmail.com>2017-02-03 10:35:31 -0500
committerKelly Rauchenberger <fefferburbia@gmail.com>2017-02-03 10:35:31 -0500
commita2cb19c3c8e7b16475c0ddf05e7a55751176b862 (patch)
treeabdd9f16465e386bc75e27c79c5617bba4635f65
parenta7645346293ed6a912c26d0c50b6f7943f1f3072 (diff)
downloadverbly-a2cb19c3c8e7b16475c0ddf05e7a55751176b862.tar.gz
verbly-a2cb19c3c8e7b16475c0ddf05e7a55751176b862.tar.bz2
verbly-a2cb19c3c8e7b16475c0ddf05e7a55751176b862.zip
Added enum inequality matches to field
-rw-r--r--generator/word.h1
-rw-r--r--lib/field.cpp20
-rw-r--r--lib/field.h5
3 files changed, 25 insertions, 1 deletions
diff --git a/generator/word.h b/generator/word.h index c6d7b20..a994ec3 100644 --- a/generator/word.h +++ b/generator/word.h
@@ -5,7 +5,6 @@
5#include "../lib/enums.h" 5#include "../lib/enums.h"
6 6
7namespace verbly { 7namespace verbly {
8
9 namespace generator { 8 namespace generator {
10 9
11 class notion; 10 class notion;
diff --git a/lib/field.cpp b/lib/field.cpp index 5b51ef4..ad6d958 100644 --- a/lib/field.cpp +++ b/lib/field.cpp
@@ -53,6 +53,26 @@ namespace verbly {
53 return filter(*this, filter::comparison::int_equals, static_cast<int>(value)); 53 return filter(*this, filter::comparison::int_equals, static_cast<int>(value));
54 } 54 }
55 55
56 filter field::operator!=(part_of_speech value) const
57 {
58 return filter(*this, filter::comparison::int_does_not_equal, static_cast<int>(value));
59 }
60
61 filter field::operator!=(positioning value) const
62 {
63 return filter(*this, filter::comparison::int_does_not_equal, static_cast<int>(value));
64 }
65
66 filter field::operator!=(inflection value) const
67 {
68 return filter(*this, filter::comparison::int_does_not_equal, static_cast<int>(value));
69 }
70
71 filter field::operator!=(part_type value) const
72 {
73 return filter(*this, filter::comparison::int_does_not_equal, static_cast<int>(value));
74 }
75
56 filter field::operator==(bool value) const 76 filter field::operator==(bool value) const
57 { 77 {
58 return filter(*this, filter::comparison::boolean_equals, value); 78 return filter(*this, filter::comparison::boolean_equals, value);
diff --git a/lib/field.h b/lib/field.h index b4bf02d..7451885 100644 --- a/lib/field.h +++ b/lib/field.h
@@ -288,6 +288,11 @@ namespace verbly {
288 filter operator==(inflection value) const; // Inflection category equality 288 filter operator==(inflection value) const; // Inflection category equality
289 filter operator==(part_type value) const; // Verb frame part type equality 289 filter operator==(part_type value) const; // Verb frame part type equality
290 290
291 filter operator!=(part_of_speech value) const; // Part of speech inequality
292 filter operator!=(positioning value) const; // Adjective positioning inequality
293 filter operator!=(inflection value) const; // Inflection category inequality
294 filter operator!=(part_type value) const; // Verb frame part type inequality
295
291 filter operator==(bool value) const; // Boolean equality 296 filter operator==(bool value) const; // Boolean equality
292 297
293 filter operator==(std::string value) const; // String equality 298 filter operator==(std::string value) const; // String equality