From a2cb19c3c8e7b16475c0ddf05e7a55751176b862 Mon Sep 17 00:00:00 2001 From: Kelly Rauchenberger Date: Fri, 3 Feb 2017 10:35:31 -0500 Subject: Added enum inequality matches to field --- generator/word.h | 1 - lib/field.cpp | 20 ++++++++++++++++++++ lib/field.h | 5 +++++ 3 files changed, 25 insertions(+), 1 deletion(-) 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 @@ #include "../lib/enums.h" namespace verbly { - namespace generator { 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 { return filter(*this, filter::comparison::int_equals, static_cast(value)); } + filter field::operator!=(part_of_speech value) const + { + return filter(*this, filter::comparison::int_does_not_equal, static_cast(value)); + } + + filter field::operator!=(positioning value) const + { + return filter(*this, filter::comparison::int_does_not_equal, static_cast(value)); + } + + filter field::operator!=(inflection value) const + { + return filter(*this, filter::comparison::int_does_not_equal, static_cast(value)); + } + + filter field::operator!=(part_type value) const + { + return filter(*this, filter::comparison::int_does_not_equal, static_cast(value)); + } + filter field::operator==(bool value) const { 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 { filter operator==(inflection value) const; // Inflection category equality filter operator==(part_type value) const; // Verb frame part type equality + filter operator!=(part_of_speech value) const; // Part of speech inequality + filter operator!=(positioning value) const; // Adjective positioning inequality + filter operator!=(inflection value) const; // Inflection category inequality + filter operator!=(part_type value) const; // Verb frame part type inequality + filter operator==(bool value) const; // Boolean equality filter operator==(std::string value) const; // String equality -- cgit 1.4.1