Added verb frames

In addition:
- Added prepositions.
- Rewrote a lot of the query interface. It now, for a lot of relationships, supports nested AND, OR, and NOT logic.
- Rewrote the token class. It is now a union-like class instead of being polymorphic, which means smart pointers are no longer necessary.
- Querying with regards to word derivation has been temporarily removed.
- Sentinel values are now supported for all word types.
- The VerbNet data retrieved from http://verbs.colorado.edu/~mpalmer/projects/verbnet/downloads.html was found to not be perfectly satisfactory in some regards, especially regarding adjective phrases. A patch file is now included in the repository describing the changes made to the VerbNet v3.2 download for the canonical verbly datafile.

1 files changed, 5 insertions, 8 deletions

@@ -3,26 +3,23 @@
 
 namespace verbly {
   
-  class adjective_query;
-  class verb_query;
-  class adverb_query;
-  
-  template <class T>
-  class query;
-  
   class word {
     protected:
-      const data& _data;
+      const data* _data;
       int _id;
+      bool _valid = false;
       
       std::list<std::list<std::string>> pronunciations;
       
+      word();
       word(const data& _data, int _id);
       
       friend class adjective_query;
       friend class verb_query;
       friend class noun_query;
       friend class adverb_query;
+      friend class frame_query;
+      friend class preposition_query;
     
     public:
       virtual std::string base_form() const = 0;