Started structural rewrite

The new object structure was designed to build on the existing WordNet
structure, while also adding in all of the data that we get from other sources.
More information about this can be found on the project wiki.

The generator has already been completely rewritten to generate a
datafile that uses the new structure. In addition, a number of indexes
are created, which does double the size of the datafile, but also allows
for much faster lookups. Finally, the new generator is written modularly
and is a lot more readable than the old one.

The verbly interface to the new object structure has mostly been
completed, but has not been tested fully. There is a completely new
search API which utilizes a lot of operator overloading; documentation
on how to use it should go up at some point.

Token processing and verb frames are currently unimplemented. Source for
these have been left in the repository for now.

1 files changed, 143 insertions, 0 deletions

@@ -0,0 +1,143 @@
+#ifndef FILTER_H_932BA9C6
+#define FILTER_H_932BA9C6
+
+#include <list>
+#include <string>
+#include <memory>
+#include "field.h"
+#include "enums.h"
+
+namespace verbly {
+  
+  class filter {
+  public:
+    enum class type {
+      empty,
+      singleton,
+      group
+    };
+    
+    enum class comparison {
+      int_equals,
+      int_does_not_equal,
+      int_is_at_least,
+      int_is_greater_than,
+      int_is_at_most,
+      int_is_less_than,
+      boolean_equals,
+      string_equals,
+      string_does_not_equal,
+      string_is_like,
+      string_is_not_like,
+      is_null,
+      is_not_null,
+      matches,
+      does_not_match,
+      hierarchally_matches,
+      does_not_hierarchally_match
+    };
+    
+    // Copy and move constructors
+    
+    filter(const filter& other);
+    filter(filter&& other);
+    
+    // Assignment
+    
+    filter& operator=(filter other);
+    
+    // Swap
+    
+    friend void swap(filter& first, filter& second);
+    
+    // Destructor
+    
+    ~filter();
+    
+    // Accessors
+    
+    type getType() const
+    {
+      return type_;
+    }
+    
+    // Empty
+    
+    filter();
+    
+    // Singleton
+    
+    filter(field filterField, comparison filterType, int filterValue);
+    filter(field filterField, comparison filterType, std::string filterValue);
+    filter(field filterField, comparison filterType, bool filterValue);
+    filter(field filterField, comparison filterType);
+    filter(field joinOn, comparison filterType, filter joinCondition);
+    
+    field getField() const;
+    
+    comparison getComparison() const;
+    
+    filter getJoinCondition() const;
+    
+    std::string getStringArgument() const;
+    
+    int getIntegerArgument() const;
+    
+    bool getBooleanArgument() const;
+    
+    // Group
+    
+    explicit filter(bool orlogic);
+    
+    bool getOrlogic() const;
+    
+    filter operator+(filter condition) const;
+    
+    filter& operator+=(filter condition);
+    
+    using const_iterator = std::list<filter>::const_iterator;
+    
+    const_iterator begin() const;
+    
+    const_iterator end() const;
+    
+    // Negation
+    
+    filter operator!() const;
+    
+    // Groupifying
+    
+    filter operator&&(filter condition) const;
+    filter operator||(filter condition) const;
+    
+    filter& operator&=(filter condition);
+    filter& operator|=(filter condition);
+    
+    // Utility
+    
+    filter normalize(object context) const;
+    
+  private:
+    union {
+      struct {
+        field filterField;
+        comparison filterType;
+        union {
+          std::unique_ptr<filter> join;
+          std::string stringValue;
+          int intValue;
+          bool boolValue;
+        };
+      } singleton_;
+      struct {
+        std::list<filter> children;
+        bool orlogic;
+      } group_;
+    };
+    type type_ = type::empty;
+    
+  };
+  
+};
+
+#endif /* end of include guard: FILTER_H_932BA9C6 */